Did a majority of the tests, still need to change methods to static to
be accessed by the test classes.