Don't ignore `grid_shape` kwarg

This closes issue #235 "`grid_shape` argument is ignored". It also changes some `grid_shape` arguments used in the test suite that were missed in PR #232.