Add tests for ifExpression
Cosmetic changes