Minor test refactoring