fix tests.
enhance lexer.