BISERVER-8170 - Fixing tests related to import

BISERVER-8170 - Fixing tests related to import