Test refactoring cleanup