more lexer test and improvements