tidy up on survey test to make it a good template