adjusted tests for refactorings