Updated IfExpression, WhileExpression and StatementExpression rules and unit tests

Signed-off-by: Grégory PLANCHAT <g.planchat@gmail.com>