Support for complex expressions in aggregate nodes
Added new test