More test refactoring.