I cleaned up the tests a bit