Cleaned up some of the test methods to make tests more readable.