DK-260: Revert change to TestMetadataProviders.