Small test refactoring