Fix first bad mock with strings instead of dicts
Fix second bad mock of data_sources
Merge pull request #65 from bis12/fix-tests-after-ds-enumeration-fix

Fix tests after ds enumeration fix