Refactoring tests
Merge branch 'master' of github.com:hotels-tech/khronus