Sorted metrics

Do we need to make this a list? It will make the assertions in the MetricsAggregatorControllerTest much more difficult