modified base importer logic
fix: tests