minor test refactor