Cleanup tests a bit