Fixed a couple issues in lexer and lexertests, lexer not allowing proper format of if statement