Made minor adjustments to break up some of the tests.