Cleaning up tests a bit.