Adding aggregator and necessary test