Add some missing edge cases because...

...tests.