Fixing Integration test. Made minor changes in lieu of upcoming planner changes, which can have a dramatic effect on how our plan is built