LPS-34510 - Allow for elseif commands in macros
LPS-34510 - Add unit tests for elseif commands
LPS-32783 Fixing regression caused by source format