Fixed (#841)

This is a fix for #841 and supporting test.
Agreed. It would make the tests more transparent. I think I'll go the a single large Theory with InlineData...