Here's a new version of the tests incorporating your suggestions. In
addition I reworked all of the long lines so they are now under 80
characters.