Cleaning up the tests to make them a little more efficient