merged changes to datasources
Added tests