Fixes to clean up after survey tests
Merge pull request #24 from alxdarksage/develop

Fixes to clean up after survey tests