Fix failing NaryExpression tests