Add non-standard units to check metrics.

This should add units to all metrics which are currently reporting a nil or unknown unit type.