clean up patch/unpatch tests