Coverage test cleanups