ENH: Better test coverage

Not ready for review/merge yet.
And then this should be reversed. Or use `*self.shape[:3]`