more test cleanups