simplify planner controller, minor changes to testdata.txt instructions