Did some test refactoring.