some minor test refactoring