Changing importer dependencies
Adding importer controller factory
Adding/Fixing tests