clean up survey test to make it a good template