More test refactorings