Dileep/Melanie | Fixing functional test and extracted survey response form for create/edit