modified some test util classes to clean up after themselves without large redesign - disposing of obvious geometry

modified mapGeometryThroughUnfolding methods to cleanup all the intermediate geometry that is generated by the labels as they are unfolded...