add tests with more than one AggregateFunctionExp in AggregateSource
more general fix