Fixed ConditionalExpression to allow non binary expressions.
Added unit tests