Refactoring tests
Merge branch 'development' of https://github.com/yoshdog/challenge-me into development