Make lexer tests pass