Cleaned up the tests