refactored testing code to work with new planner changes