Refactoring
Adding update test for surveys
Merge pull request #192 from alxdarksage/refactoring

Refactoring