Copy this test to something-something-something-3d, reinstate the old one. The old test is a guarantee that 2d matrix behaviour doesn't change with the introduction of this patch, and shouldn't be refactored in the same CL as this.