Updated CompositeMetadataTest in review