More test cleanups