ENH: Better test coverage

Not ready for review/merge yet.
Eventually it shows up as the "proper" shape, though.

To be honest, the reshaping code seemed rather complicated and difficult to follow, so I hesitate to change it further (beyond just making it work so the tests passed).