Some more tweaks to first-order planning and adding tests for first-order planning.