minor test refactors