Fix broken tests after changing default aggregation from LAST to AVG