Test class refactorings