Fixing average aggregation
Fixing broken extraTest2