ticket:13 tests refactoring