one more tests refactoring