Fix lexer
Improve lex testing
Get correct token name
more lexer testing