OwnerAndNameCompositeId used in Corpus - tests corrected.