Revert "Fixed failing importer test & importer now working without known bugs"

This reverts commit ff401bf0eb85d80d8a860124acf05f8f3ecd08d7.
Revert "Revert "Fixed failing importer test & importer now working without known bugs""

This reverts commit 87a400b9b4cd0617d4f9799237348fa763ebe04c.