ENG-4959: undo the changes to the plannertest in this branch. Will create a new branch and add more queries.