Slight test refactoring