Re-adding METRICS dictionary until unit tests are updated