Added aggregation tests