Added tests for else if support