Fix tests to use DataType instead of Metric.DataType