Improve code coverage in tests.

And also, remove some dead code and improve the presentation,
especially vertical alignment of similar constructs.
The final step before release: today's date in Changes file.
A forgotten change about a forgotten RT ticket.