Improve e2e tests for surveys