Add some more test cleanups.