* fixed aggregator factories to return correct aggregators