cleaned up the structure of the tests a bit