Expanded unit test suite, and fixed an argument bug in planner