Change test to a planner only test
Merge branch '4.4'