Minor test cleanups.