Updates to CollectionExternalReferenceResolverTest
Fixes for FinalImportProcessingHandlerTest