Lexer fixed, all tests ok