Added forgotten test cleanups.