Fix broken test
Merge branch 'fix-for-nil-aggregations'