More test refactoring.
More refactoring.