Fixed Lexer and Added Lexer Unit Test