aggregator cd
fixed tests