Merge pull request #22 from SartoriusEarth/develop

Added remaining tests.
Getting all the tests to pass
Merge pull request #23 from alxdarksage/develop

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

Fixes to clean up after survey tests
Moving more stuff from *ApiCaller tests to the integration tests
Merge pull request #25 from alxdarksage/develop

Moving more stuff from *ApiCaller tests to the integration tests
Cleanup.
Merge pull request #26 from alxdarksage/develop

Cleanup.
cleanup
merged Alxs cleanup.