That needs to be tested for either axis, and for the axis=None case...