Add lexer tests and fixes