build test cleanups