More test refactorings.