Cleans up tests a bit.