test cleanups and updates