Little test refactoring