Ramp up test coverage

Step up the amount of test coverage this application has and refine the helpers to be leveraged better throughout the application.