Small test refactorings.