Refactoring for import descriptor, adding tests