Make lexer tests pass (albeit naively for now)