Refactored some test methods, maybe helped with coverage