ENH: Better test coverage

Not ready for review/merge yet.
That should work in most use-cases, but I'm sure there are cases where you want to be able to control both. Why remove that possibility?