Add MetricService for easier mocking of metric methods
Use metricService, update tests