Revert "modified script to do 2D tests with odd/even x/y sides"

This reverts commit 42c1cffb095c1807b4fb80f1b629b459eec0fe47.