Rearrange how plans are formatted a little to make toString() shorter and rules test output a bit more verbose.
Update test expected results.