Did some minor test refactoring