ticket:3 tests refactored