ENH: Better test coverage

Not ready for review/merge yet.
Well, now there are no more loops to jump through, I made the code clearer during the reshape. I'd rather leave checking for cases like this if they are degenerate to a new PR, since I don't feel comfortable knowing all the use/corner cases.