Fixes to clean up after survey tests