Merged change for aggregation tests