minor test refactoring