ENH: Better test coverage

Not ready for review/merge yet.
Ah, in that case I agree :)