Added tests for If Statements
Refactored some expression parsing methods