Minor test refactoring.