Pass grid_shape kwarg where appropriate

closes issue #235
Regression test for issue #235
Fix `grid_shape`s that were missed in PR #232's changes.