More work on the lexer, made a test