Tweak the MetricRegistry in a few tests