Add tests to aggregator