ENH: Better test coverage

Not ready for review/merge yet.
else ... a load of brackets :)  Isn't `len(shape)` always larger than 0?