Cleanup the tests a bit.