Cleanup tests a little.