Some test refactorings