cleaning up the tests a bit