do some test cleanups