refactoring more tests