Added: if - elseif - else support + tests
Fixed: TokenIterator EOF error is now correct + tests