Added tests for short circuting operations and for if else statements.