Fix for import descriptor, adding tests