Fix importer to use data source
Data Source factory
Fix tests to use data source