remove survey
added more tests for survey service