minor test cleanups