Make the test helpers assume slightly more so tests are less verbose, add another test, fix a bug thus found.
And a bit more testing