Add more tests for resolving token in ast for new planner