incomplete test refactoring