XD-757: Add aggregator module and tests