Make tests pass using Lexer