fix importer test utils and tests themselves