More test refactoring #12