Test refactorings