ENH: Better test coverage

Not ready for review/merge yet.
@almarklein something like this. This was failing without my lines of code.