test refactoring complete