Github push test
Make test pass
Refactoring