Converted a few 2D tests to operate in trivial 3D.