Minor test cleanups