Cleaned up the tests a bit