This doesn't change the behaviour of either of the tests in any
significant way.

Future commits are going to be adding a lot more cases to this
parametrize-style test.