Add aggregator tests