Updated test case so that the output of each "dump" is checked against toroidal surfa...