Cleanup tests a little bit