EAGLESIX-2696 Improved CondExpression and the test cases.