Cleaned up some of the tests