Merge "Add DataSourceTests to test mapping" into main