Refactorings for test names and such based on JoEllen's feedback