Clean up tests.
Still more test cleanups.