ticket:1 test refactoring