Tried cleaning up the tests