Small unfinished test_lexer fixes.