refactors gef importer and tests