Changes to implement and test CollectionExternalReferenceResolver