Add new things to testing.
Moved planner outside of evaluation loop.