Misc cleanup of tests.