Added unit tests for if-else parsing, as well as fixed parsing of
block statements