Fixed up the test that Netbeans screwed up. Fixed up some problems with the Lexer