Fix #544 Issue with tests
Added initial support for SkipVariantInit - elseif or else blocks
Avoid tmp vars for #544 isssue in elseif conditions