Some test cleanups