Cleaned up the tests some