Update unit tests to be aware of MetricData return value.