cleanup tests a bit