Add work-arounds for probs with metrics, tests