[BISERVER-10202/10203] Fix unit test failures related to MetadataImportH...

...andler