test refactorings