Added test for non-AggregateNode aggregates
Support for method call aggregates