ENH: Better test coverage

Not ready for review/merge yet.
@almarklein this way works and is much simpler :)