Update MetadataConverter and fix old tests