This branch improves the homonym previous one to add more coherence and better usage for integration test
