SurveyTest Fix

Fixes contain the Survey test failures for all Functions.