Nearly done refactoring test method structures