Slightly more test refactoring.