ticket:10 tests refactoring