Modify conditional expressions and Add tests about NaN