ENH: Better test coverage

Not ready for review/merge yet.
I think I'd prefer that, thank you :)