Minor test refactorings