diff --git a/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx b/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx
index 3b9ba4ad7a..1b9877676b 100644
--- a/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx
+++ b/src/ShapeAnalysis/ShapeAnalysis_Surface.cxx
@@ -875,21 +875,53 @@ gp_Pnt2d ShapeAnalysis_Surface::NextValueOfUV(const gp_Pnt2d &p2dPrev,
   case GeomAbs_SurfaceOfRevolution :
   case GeomAbs_OffsetSurface :
 
-//    if ( ! mySurf->Continuity() == GeomAbs_C0 ) //: S4030: fix on BUC40132 8355 & PRO7978 1987: SI because of bad data
     {
+      if (surftype == GeomAbs_BSplineSurface)
+      {
+        Handle(Geom_BSplineSurface) aBSpline =  SurfAdapt.BSpline();
+
+        //Check near to knot position ~ near to C0 points on U isoline.
+        if ( SurfAdapt.UContinuity() == GeomAbs_C0 )
+        {
+          Standard_Integer aMinIndex = aBSpline->FirstUKnotIndex();
+          Standard_Integer aMaxIndex = aBSpline->LastUKnotIndex();
+          for (Standard_Integer anIdx = aMinIndex; anIdx <= aMaxIndex; ++anIdx)
+          {
+            Standard_Real aKnot = aBSpline->UKnot(anIdx);
+            if (Abs (aKnot - p2dPrev.X()) < Precision::Confusion())
+              return ValueOfUV ( P3D, preci );
+          }
+        }
+
+        //Check near to knot position ~ near to C0 points on U isoline.
+        if ( SurfAdapt.VContinuity() == GeomAbs_C0 )
+        {
+          Standard_Integer aMinIndex = aBSpline->FirstVKnotIndex();
+          Standard_Integer aMaxIndex = aBSpline->LastVKnotIndex();
+          for (Standard_Integer anIdx = aMinIndex; anIdx <= aMaxIndex; ++anIdx)
+          {
+            Standard_Real aKnot = aBSpline->VKnot(anIdx);
+            if (Abs (aKnot - p2dPrev.Y()) < Precision::Confusion())
+              return ValueOfUV ( P3D, preci );
+          }
+        }
+      }
+
       gp_Pnt2d sol;
       Standard_Boolean res = SurfaceNewton(p2dPrev,P3D,preci,sol);
-      if ( res ) {
-	Standard_Real gap = P3D.Distance ( Value(sol) );
-	if ( res ==2 || //:q6 abv 19 Mar 99: protect against strange attractors
-	     (maxpreci > 0. && gap - maxpreci > Precision::Confusion()) ) { //:q1: check with maxpreci
-	  Standard_Real U = sol.X(), V = sol.Y();
-	  myGap = UVFromIso ( P3D, preci, U, V );
-//	  gp_Pnt2d p = ValueOfUV ( P3D, preci );
-	  if ( gap >= myGap ) return gp_Pnt2d ( U, V );
-	}
-	myGap = gap;
-	return sol;
+      if ( res )
+      {
+        Standard_Real gap = P3D.Distance ( Value(sol) );
+        if ( res == 2 || //:q6 abv 19 Mar 99: protect against strange attractors
+          ( maxpreci > 0. && gap - maxpreci > Precision::Confusion()) ) 
+        { //:q1: check with maxpreci
+          Standard_Real U = sol.X(), V = sol.Y();
+          myGap = UVFromIso ( P3D, preci, U, V );
+          //	  gp_Pnt2d p = ValueOfUV ( P3D, preci );
+          if ( gap >= myGap ) return gp_Pnt2d ( U, V );
+        }
+        myGap = gap;
+        return sol;
       }
     }
     break;
diff --git a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cdl b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cdl
index ceb1bd01d6..914cc67808 100644
--- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cdl
+++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cdl
@@ -210,6 +210,18 @@ is
     	    	    	   pout      : out Array1OfReal from TColStd)
     returns Boolean is private;
 
+    getLine(me ;  points    : Array1OfPnt from TColgp;
+            params    : Array1OfReal from TColStd;
+            points2d: out Array1OfPnt2d from TColgp;
+            theTol : Real;
+            IsRecompute: in out Boolean) returns Curve from Geom2d is protected;
+    ---Purpose: Try to approximate 3D curve by Geom2d_Line 
+    --         or Geom2d_BsplineCurve with degree 1 with specified tolerance.
+    --         points - points obtained from 3d curve.
+    --         params - parameters corresponding points on 3d curves
+    --         points2d - 2d points lies on line in parametric space
+    --         theTol - tolerance used for compare initial points 3d and
+    --         3d points obtained from line lying in parameric space of surface
 
 fields
 
diff --git a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
index 4cb1f72d2b..e25429ba22 100644
--- a/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
+++ b/src/ShapeConstruct/ShapeConstruct_ProjectCurveOnSurface.cxx
@@ -307,7 +307,6 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::Perform (Handle(Geom_Curv
   c2d = InterpolatePCurve (nbPini, thePnts2d, theParams2d, c3d);
 //  c2d = ApproximatePCurve (nbPini, thePnts2d, theParams2d, c3d);
 //  Faut-il aussi reprendre la C3D ?
-
   myStatus |= ShapeExtend::EncodeStatus (c2d.IsNull() ? ShapeExtend_FAIL1 : ShapeExtend_DONE2);
   return Status (ShapeExtend_DONE);
 }
@@ -463,19 +462,211 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G
   return result;
 }
 
+ //! Fix possible period jump and handle walking period parameter.
+ static Standard_Boolean fixPeriodictyTroubles(gp_Pnt2d *thePnt, // pointer to gp_Pnt2d[4] beginning
+                                               Standard_Integer theIdx, // Index of objective coord: 1 ~ X, 2 ~ Y
+                                               Standard_Real thePeriod) // Period on objective coord
+ {
+   Standard_Integer i;
+
+   Standard_Boolean isNeedToFix = Standard_True;
+   for (i = 0; i < 3; i++)
+   {
+     Standard_Real aDiff = Abs (thePnt[i].Coord(theIdx) - thePnt[i + 1].Coord(theIdx));
+     if ( aDiff > Precision::PConfusion() && 
+          aDiff < thePeriod - Precision::PConfusion())
+     {
+       // Walk over period coord -> not walking on another isoline in parameter space.
+       isNeedToFix = Standard_False; 
+     }
+   }
+
+   if (isNeedToFix)
+   {
+     // Walking on isoline on another parameter. Fix period paramter to obtained minimum.
+     Standard_Real aFixParam = Min (thePnt[0].Coord(theIdx), thePnt[3].Coord(theIdx));
+     for(i = 0; i < 4; i++)
+       thePnt[i].SetCoord(theIdx, aFixParam);
+   }
+
+   // Fix possible period jump on first point.
+   if ( Abs(thePnt[0].Coord(theIdx) - thePnt[1].Coord(theIdx) ) >  thePeriod / 2.01)
+   {
+     Standard_Real aMult = thePnt[0].Coord(theIdx) < thePnt[1].Coord(theIdx) ? 1.0 : -1.0;
+     Standard_Real aNewParam = thePnt[0].Coord(theIdx) + aMult * thePeriod;
+     thePnt[0].SetCoord(theIdx, aNewParam);
+     return Standard_False;
+   }
+
+   // Fix possible period jump on last point.
+   if ( Abs(thePnt[2].Coord(theIdx) - thePnt[3].Coord(theIdx) ) >  thePeriod / 2.01)
+   {
+     Standard_Real aMult = thePnt[3].Coord(theIdx) < thePnt[2].Coord(theIdx) ? 1.0 : -1.0;
+     Standard_Real aNewParam = thePnt[3].Coord(theIdx) + aMult * thePeriod;
+     thePnt[3].SetCoord(theIdx, aNewParam);
+     return Standard_False;
+   }
+
+   return Standard_True;
+ }
+
+//=======================================================================
+//function : getLine
+//purpose  : 
+//=======================================================================
+
+ Handle(Geom2d_Curve) ShapeConstruct_ProjectCurveOnSurface::getLine(
+   const TColgp_Array1OfPnt& thepoints,
+   const TColStd_Array1OfReal& theparams,
+   TColgp_Array1OfPnt2d& thePnt2ds,
+   Standard_Real theTol,
+   Standard_Boolean &isRecompute) const 
+ {
+   Standard_Integer nb =  thepoints.Length();
+   gp_Pnt aP[4];
+   aP[0] = thepoints(1);
+   aP[1] = thepoints(2);
+   aP[2] = thepoints(nb - 1);
+   aP[3] = thepoints(nb);
+   gp_Pnt2d aP2d[4];
+   Standard_Integer i = 0;
+
+   Standard_Real aTol2 = theTol * theTol;
+   Standard_Boolean isPeriodicU = mySurf->Surface()->IsUPeriodic();
+   Standard_Boolean isPeriodicV = mySurf->Surface()->IsVPeriodic();
+
+   // Workaround:
+   // Protection against bad "tolerance" shapes.
+   if (aTol2 > 1.0)
+   {
+     theTol = Precision::Confusion();
+     aTol2 = theTol * theTol;
+   }
+   Standard_Real anOldTol2 = aTol2;
+
+   // project first and last points
+   for( ; i < 4; i +=3)
+   {
+     Standard_Integer j;
+     for ( j=0; j < myNbCashe; j++ ) 
+       if ( myCashe3d[j].SquareDistance (aP[i] ) < aTol2)
+       {
+         aP2d[i] = mySurf->NextValueOfUV (myCashe2d[j], aP[i], theTol, 
+           theTol);
+         break;
+       }
+       if ( j >= myNbCashe )
+         aP2d[i] = mySurf->ValueOfUV(aP[i], theTol);
+
+       Standard_Real aDist = mySurf->Gap();
+       Standard_Real aCurDist = aDist * aDist;
+       if( aTol2 < aDist * aDist)
+         aTol2 = aCurDist;
+   }
+
+   if ( isPeriodicU || isPeriodicV )
+   {
+     // Compute second and last but one c2d points.
+     for(i = 1; i < 3; i++)
+     {
+       Standard_Integer j;
+       for ( j=0; j < myNbCashe; j++ ) 
+         if ( myCashe3d[j].SquareDistance (aP[i] ) < aTol2)
+         {
+           aP2d[i] = mySurf->NextValueOfUV (myCashe2d[j], aP[i], theTol, theTol);
+           break;
+         }
+         if ( j >= myNbCashe )
+           aP2d[i] = mySurf->ValueOfUV(aP[i], theTol);
+
+         Standard_Real aDist = mySurf->Gap();
+         Standard_Real aCurDist = aDist * aDist;
+         if( aTol2 < aDist * aDist)
+           aTol2 = aCurDist;
+     }
+
+     if (isPeriodicU)
+     {
+       isRecompute = fixPeriodictyTroubles(&aP2d[0], 1 /* X Coord */, mySurf->Surface()->UPeriod());
+     }
+
+     if (isPeriodicV)
+     {
+       isRecompute = fixPeriodictyTroubles(&aP2d[0], 2 /* Y Coord */, mySurf->Surface()->VPeriod());
+     }
+   }
+
+   thePnt2ds.SetValue(1, aP2d[0]);
+   thePnt2ds.SetValue(nb, aP2d[3]);
+
+   // Restore old tolerance in 2d space to avoid big gap cases.
+   aTol2 = anOldTol2;
+   // Check that straight line in 2d with parameterisation as in 3d will fit 
+   // fit 3d curve at all points.
+   Standard_Real dPar = theparams(nb) - theparams(1);
+   if ( Abs(dPar) < Precision::PConfusion() )
+     return 0;
+   gp_Vec2d aVec0 (aP2d[0], aP2d[3]);
+   gp_Vec2d aVec = aVec0 / dPar;
+   Standard_Real aFirstPointDist = mySurf->Surface()->Value(aP2d[0].X(), aP2d[0].Y()). 
+                                   SquareDistance(thepoints(1));
+   for(i = 2; i <  nb; i++)
+   {
+     gp_XY aCurPoint = aP2d[0].XY() + aVec.XY() * (theparams(i) - theparams(1));
+     gp_Pnt aCurP;
+     mySurf->Surface()->D0(aCurPoint.X(), aCurPoint.Y(), aCurP);
+     Standard_Real aDist1 = aCurP.SquareDistance(thepoints(i));
+
+     if(Abs (aFirstPointDist - aDist1) > aTol2)
+       return 0;
+   }
+
+   // check if pcurve can be represented by Geom2d_Line (parameterised by length)
+   Standard_Real aLLength = aVec0.Magnitude();
+   if ( Abs (aLLength - dPar) <= Precision::PConfusion() )
+   {
+     gp_XY aDirL = aVec0.XY() / aLLength;
+     gp_Pnt2d aPL (aP2d[0].XY() - theparams(1) * aDirL);
+     return new Geom2d_Line (aPL, gp_Dir2d(aDirL));
+   }
+
+   // create straight bspline
+   TColgp_Array1OfPnt2d aPoles(1, 2);
+   aPoles(1) = aP2d[0];
+   aPoles(2) = aP2d[3];
+
+   TColStd_Array1OfReal aKnots(1,2);
+   aKnots(1) = theparams(1);
+   aKnots(2) = theparams(theparams.Length());
+
+   TColStd_Array1OfInteger aMults(1,2);
+   aMults(1) = 2;
+   aMults(2) = 2;
+   Standard_Integer aDegree = 1;
+   Handle(Geom2d_BSplineCurve) abspl2d =
+     new Geom2d_BSplineCurve (aPoles, aKnots, aMults, aDegree);
+   return abspl2d;
+ }
+
 //=======================================================================
 //function : ApproxPCurve
 //purpose  : 
 //=======================================================================
 
- Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::ApproxPCurve(const Standard_Integer nbrPnt,
+  Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::ApproxPCurve(const Standard_Integer nbrPnt,
 								     const TColgp_Array1OfPnt& points,
 								     const TColStd_Array1OfReal& params,
 								     TColgp_Array1OfPnt2d& pnt2d,
 								     Handle(Geom2d_Curve)& c2d) 
 {
-  Standard_Boolean isDone = Standard_True;
-  
+  // for performance, first try to handle typical case when pcurve is straight
+  Standard_Boolean isRecompute = Standard_False;
+  c2d = getLine(points, params, pnt2d, myPreci, isRecompute);
+  if(!c2d.IsNull())
+  {
+    return Standard_True;
+  }
+    Standard_Boolean isDone = Standard_True;
   // test if the curve 3d is a boundary of the surface 
   // (only for Bezier or BSpline surface)
   
@@ -628,17 +819,29 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G
       if     ( (i == 1)      && p1OnIso)  p2d = valueP1;
       else if( (i == nbrPnt) && p2OnIso)  p2d = valueP2;
       else  {// general case (not an iso)  mais attention aux singularites !
-	if ( ii==1 ) {
-	  //:q9 abv 23 Mar 99: use cashe as 1st approach
-	  Standard_Integer j; // svv #1
-	  for ( j=0; j < myNbCashe; j++ ) 
-	    if ( myCashe3d[j].SquareDistance ( p3d ) < myPreci*myPreci ) {
-	      p2d = mySurf->NextValueOfUV (myCashe2d[j], p3d, myPreci, 
-					   Precision::Confusion()+gap);
-	      break;
-	    }
-	  if ( j >= myNbCashe ) p2d = mySurf->ValueOfUV(p3d, myPreci); 
-	}
+        // first and last points are already computed by getLine()
+        if ( (i == 1 || i == nbrPnt))
+        {
+          if (!isRecompute)
+          {
+            p2d = pnt2d(i);
+            gap = mySurf->Gap();
+            continue;
+          }
+          else
+          {
+            //:q9 abv 23 Mar 99: use cashe as 1st approach
+            Standard_Integer j; // svv #1
+            for ( j=0; j < myNbCashe; j++ ) 
+              if ( myCashe3d[j].SquareDistance ( p3d ) < myPreci*myPreci )
+              {
+                p2d = mySurf->NextValueOfUV (myCashe2d[j], p3d, myPreci, 
+                  Precision::Confusion()+gap);
+                break;
+              }
+              if ( j >= myNbCashe ) p2d = mySurf->ValueOfUV(p3d, myPreci);
+          }
+        }
         else {
           p2d = mySurf->NextValueOfUV (p2d, p3d, myPreci, //:S4030: optimizing
                                        Precision::Confusion()+1000*gap); //:q1
@@ -964,21 +1167,6 @@ Standard_Boolean ShapeConstruct_ProjectCurveOnSurface::PerformAdvanced (Handle(G
     myCashe2d[1] = pnt2d(1);
     myCashe2d[0] = pnt2d(nbrPnt);
   }
-  
-  if (isoParam && isoPar2d3d) {
-    
-    // create directly isoparametrics (PCurve)
-    
-    gp_Vec2d aVec2d(valueP1, valueP2);
-    gp_Dir2d aDir2d(aVec2d);
-    gp_Pnt2d P0;
-    
-    if (isoTypeU) P0.SetCoord(valueP1.X(), valueP1.Y() - params(1)*aDir2d.Y());
-    else          P0.SetCoord(valueP1.X() - params(1)*aDir2d.X(), valueP1.Y());
-    
-    c2d = new Geom2d_Line(P0, aDir2d);
-  }
-
   return isDone;
 }
 
@@ -1432,7 +1620,7 @@ Handle(Geom_Curve) ShapeConstruct_ProjectCurveOnSurface::InterpolateCurve3d(cons
     if (mp[0] > 0 && 
 	( ! p1OnIso || currd2[0] < mind2[0] ) ) {
       p1OnIso = Standard_True;
-      mind2[0] = currd2[0];
+      mind2[0] = currd2[0]; // LP2.stp #105899: FLT_INVALID_OPERATION on Windows 7 VC 9 Release mode on the whole file 
       if (isoU) valueP1.SetCoord(isoVal, tp[0]);
       else      valueP1.SetCoord(tp[0], isoVal);
     }
diff --git a/src/ShapeFix/ShapeFix_Edge.cxx b/src/ShapeFix/ShapeFix_Edge.cxx
index a6e4b044de..51ada3fd00 100644
--- a/src/ShapeFix/ShapeFix_Edge.cxx
+++ b/src/ShapeFix/ShapeFix_Edge.cxx
@@ -491,18 +491,6 @@ Standard_Boolean ShapeFix_Edge::FixAddPCurve (const TopoDS_Edge& edge,
 
 //    step = 2;
 
-    // adding by skl 28.03.2003 for usung Line instead of BSpline
-    Standard_Real fp=0.,lp=0.;
-    Standard_Boolean isLine=Standard_False;
-    if(c2d->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve))) {
-      Handle(Geom2d_TrimmedCurve) tc = Handle(Geom2d_TrimmedCurve)::DownCast(c2d);
-      if(tc->BasisCurve()->IsKind(STANDARD_TYPE(Geom2d_Line))) {
-        fp = tc->FirstParameter();
-        lp = tc->LastParameter();
-        isLine = Standard_True;
-      }
-    }
-
     if (isSeam) {
       // On ne sait pas laquelle est Forward. Au PIF. La geometrie Forward
       // sera mise a jour dans ComputeWire
@@ -538,12 +526,6 @@ Standard_Boolean ShapeFix_Edge::FixAddPCurve (const TopoDS_Edge& edge,
       B.UpdateEdge (edge,c2d,surf,location, 0.); //#82 rln 16.03.99: preci
     }
 
-    if ( isLine ) {
-      B.Range(edge,surf,location,fp,lp);
-      B.SameParameter(edge,Standard_False);
-      B.SameRange(edge,Standard_False);
-    }
-
     //  Conclusion
 //    step = 3;
     if ( myProjector->Status ( ShapeExtend_DONE3 ) ) {
diff --git a/tests/bugs/heal/bug210 b/tests/bugs/heal/bug210
index 09ba026c72..7a354609b8 100755
--- a/tests/bugs/heal/bug210
+++ b/tests/bugs/heal/bug210
@@ -5,6 +5,7 @@ puts ""
 ##################################################
 # Improve FixShape to correct case of touching wires
 ##################################################
+puts "TODO CR22598 ALL: Faulty shapes in variables faulty_1 to faulty_" 
 
 pload XDE
 
diff --git a/tests/bugs/modalg_2/bug22631 b/tests/bugs/modalg_2/bug22631
index da8164fc25..2c53e9d332 100755
--- a/tests/bugs/modalg_2/bug22631
+++ b/tests/bugs/modalg_2/bug22631
@@ -15,14 +15,14 @@ testreadstep [locate_data_file OCC22145.stp] result
 set square 205444
 
 set nb_v_good 3344
-set nb_e_good 4685
+set nb_e_good 4679
 set nb_w_good 1943
 set nb_f_good 1943
 set nb_sh_good 1
 set nb_sol_good 1
 set nb_compsol_good 0
 set nb_compound_good 2
-set nb_shape_good 11919
+set nb_shape_good 11913
 
 vinit
 tclean result
diff --git a/tests/bugs/step/bug55 b/tests/bugs/step/bug55
index eda4ba3184..4785268388 100755
--- a/tests/bugs/step/bug55
+++ b/tests/bugs/step/bug55
@@ -1,5 +1,3 @@
-puts "TODO OCC25583 ALL: Faulty shapes in variables faulty_1 to faulty_"
-
 puts "========================"
 puts " OCC55 "
 puts "========================"
diff --git a/tests/de/iges_1/B4 b/tests/de/iges_1/B4
index 26a5e47edf..25ddbc11ea 100644
--- a/tests/de/iges_1/B4
+++ b/tests/de/iges_1/B4
@@ -7,9 +7,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 169  ( 430 )  Summary  = 169  ( 430 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 674  ( 674 )   Summary  = 9628  ( 9625 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 674  ( 674 )   Summary  = 9627  ( 9625 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 674  ( 674 )   FreeWire = 0  ( 0 )   FreeEdge  = 28 ( 28 )   SharedEdge = 4104  ( 4104 )
-TOLERANCE   : MaxTol   =    0.483503583  (   0.4835035831 )  AvgTol   =   0.00204387873  (  0.002030701378 )
+TOLERANCE   : MaxTol   =    0.483503583  (   0.4835035831 )  AvgTol   =   0.00303544578  (  0.003024564929 )
 LABELS      : N0Labels = 702  ( 702 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 702  ( 702 )   NameLabels = 702  ( 702 )   ColorLabels = 16  ( 16 )   LayerLabels = 702  ( 702 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/iges_1/D7 b/tests/de/iges_1/D7
index 6027c93835..a68f542251 100644
--- a/tests/de/iges_1/D7
+++ b/tests/de/iges_1/D7
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 129  ( 71 )  Summary  = 129  ( 71
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 1 )  Shell    = 0  ( 1 )  Face     = 180  ( 180 )   Summary  = 2185  ( 1096 )
 STATSHAPE   : Solid    = 0  ( 1 )  Shell    = 0  ( 1 )  Face     = 180  ( 180 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 912  ( 457 )
-TOLERANCE   : MaxTol   =  0.02358959588  (  0.02358723715 )  AvgTol   =  0.0007627425938  (  0.001634419614 )
+TOLERANCE   : MaxTol   =  0.04953179108  (  0.04952733504 )  AvgTol   =  0.005022224409  (  0.01224482043 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 180  ( 180 )  N2Labels = 0  ( 0 )   TotalLabels = 181  ( 181 )   NameLabels = 181  ( 181 )   ColorLabels = 180  ( 180 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/iges_1/J6 b/tests/de/iges_1/J6
index 9bbad034a6..3c2e8ad8a4 100644
--- a/tests/de/iges_1/J6
+++ b/tests/de/iges_1/J6
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 156  ( 818 )  Summary  = 156  ( 818 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 282  ( 282 )   Summary  = 4898  ( 4898 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 282  ( 282 )   FreeWire = 0  ( 0 )   FreeEdge  = 7 ( 7 )   SharedEdge = 2170  ( 2170 )
-TOLERANCE   : MaxTol   =   0.8210384396  (    0.821038439 )  AvgTol   =  0.006791053813  (   0.00686200517 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 282  ( 282 )   Summary  = 4886  ( 4886 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 282  ( 282 )   FreeWire = 0  ( 0 )   FreeEdge  = 7 ( 7 )   SharedEdge = 2158  ( 2158 )
+TOLERANCE   : MaxTol   =   0.8210384396  (    0.821038439 )  AvgTol   =  0.008238191769  (  0.008314230694 )
 LABELS      : N0Labels = 289  ( 289 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 289  ( 289 )   NameLabels = 289  ( 289 )   ColorLabels = 101  ( 101 )   LayerLabels = 288  ( 288 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 8 )
diff --git a/tests/de/iges_1/L1 b/tests/de/iges_1/L1
index eb2ebb430b..9d9ba8bb33 100644
--- a/tests/de/iges_1/L1
+++ b/tests/de/iges_1/L1
@@ -8,8 +8,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 94 )  Summary  = 0  ( 94 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 90  ( 90 )   Summary  = 1161  ( 1155 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 90  ( 90 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 502  ( 496 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 90  ( 90 )   Summary  = 1157  ( 1151 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 90  ( 90 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 498  ( 492 )
 TOLERANCE   : MaxTol   = 0.0004488403826  ( 0.0004487950678 )  AvgTol   =  5.999008312e-006  (  6.427182608e-006 )
 LABELS      : N0Labels = 3  ( 6 )  N1Labels = 90  ( 90 )  N2Labels = 0  ( 0 )   TotalLabels = 93  ( 96 )   NameLabels = 3  ( 6 )   ColorLabels = 90  ( 90 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/iges_1/L4 b/tests/de/iges_1/L4
index 694bd4190e..d4ac8ba533 100644
--- a/tests/de/iges_1/L4
+++ b/tests/de/iges_1/L4
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 18  ( 62 )  Summary  = 18  ( 62 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 230  ( 230 )   Summary  = 2910  ( 2906 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 230  ( 230 )   FreeWire = 1  ( 1 )   FreeEdge  = 63 ( 63 )   SharedEdge = 1195  ( 1193 )
-TOLERANCE   : MaxTol   =  0.06012224669  (   0.1346852729 )  AvgTol   =  0.001230721372  (  0.001407061098 )
+TOLERANCE   : MaxTol   =  0.06012224669  (   0.1346852729 )  AvgTol   =  0.001347528763  (  0.001523930617 )
 LABELS      : N0Labels = 292  ( 292 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 292  ( 292 )   NameLabels = 292  ( 292 )   ColorLabels = 291  ( 292 )   LayerLabels = 247  ( 248 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/iges_1/L5 b/tests/de/iges_1/L5
index 142b27ee2d..b53eda8875 100644
--- a/tests/de/iges_1/L5
+++ b/tests/de/iges_1/L5
@@ -12,7 +12,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 146  ( 887 )  Summary  = 146  ( 88
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 221  ( 221 )   Summary  = 13351  ( 13351 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 221  ( 221 )   FreeWire = 0  ( 0 )   FreeEdge  = 6 ( 6 )   SharedEdge = 6452  ( 6452 )
-TOLERANCE   : MaxTol   =  0.01205458838  (  0.01098786532 )  AvgTol   =  6.578043174e-005  (  6.481652011e-005 )
+TOLERANCE   : MaxTol   =  0.01225213609  (  0.01098786532 )  AvgTol   =  0.0001816430452  (  0.0001806163302 )
 LABELS      : N0Labels = 232  ( 232 )  N1Labels = 0  ( 6521 )  N2Labels = 0  ( 0 )   TotalLabels = 232  ( 6753 )   NameLabels = 232  ( 347 )   ColorLabels = 227  ( 6753 )   LayerLabels = 227  ( 6753 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/iges_1/L9 b/tests/de/iges_1/L9
index 643fbc0e22..39ed9b543b 100644
--- a/tests/de/iges_1/L9
+++ b/tests/de/iges_1/L9
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 347  ( 691 )  Summary  = 347  ( 69
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2297  ( 2297 )   Summary  = 26114  ( 26114 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2297  ( 2297 )   FreeWire = 0  ( 0 )   FreeEdge  = 22 ( 22 )   SharedEdge = 10774  ( 10774 )
-TOLERANCE   : MaxTol   =   0.2778575821  (   0.2778575802 )  AvgTol   =  0.0007983843446  (  0.0007904430744 )
+TOLERANCE   : MaxTol   =   0.2778575821  (   0.2778575802 )  AvgTol   =   0.00113643717  (  0.001128576508 )
 LABELS      : N0Labels = 2329  ( 2329 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 2329  ( 2329 )   NameLabels = 2329  ( 2329 )   ColorLabels = 2319  ( 2329 )   LayerLabels = 2319  ( 2329 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 8  ( 8 )
diff --git a/tests/de/iges_1/N9 b/tests/de/iges_1/N9
index 4a0f54be9f..d338560a11 100644
--- a/tests/de/iges_1/N9
+++ b/tests/de/iges_1/N9
@@ -8,8 +8,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 3  ( 183 )  Summary  = 3  ( 183 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 98  ( 98 )   Summary  = 2690  ( 2687 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 98  ( 98 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1244  ( 1243 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 98  ( 98 )   Summary  = 2688  ( 2687 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 98  ( 98 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1243  ( 1243 )
 TOLERANCE   : MaxTol   = 0.009955692634  ( 0.009955692464 )  AvgTol   =  0.0008509893784  (  0.0008531522552 )
 LABELS      : N0Labels = 97  ( 97 )  N1Labels = 2  ( 102 )  N2Labels = 0  ( 0 )   TotalLabels = 99  ( 199 )   NameLabels = 97  ( 97 )   ColorLabels = 98  ( 199 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/iges_1/O2 b/tests/de/iges_1/O2
index e1ef1c0143..2de3acd876 100644
--- a/tests/de/iges_1/O2
+++ b/tests/de/iges_1/O2
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 12  ( 485 )  Summary  = 12  ( 485
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 239  ( 239 )   Summary  = 4786  ( 4768 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 239  ( 239 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2151  ( 2144 )
-TOLERANCE   : MaxTol   = 0.0006563832817  ( 0.0006563832817 )  AvgTol   =  2.900975685e-005  (  2.941852737e-005 )
+TOLERANCE   : MaxTol   = 0.0009886042946  ( 0.0009885051926 )  AvgTol   =  5.777641061e-005  (  5.821884006e-005 )
 LABELS      : N0Labels = 237  ( 237 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 237  ( 237 )   NameLabels = 237  ( 237 )   ColorLabels = 0  ( 0 )   LayerLabels = 236  ( 237 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/iges_1/O3 b/tests/de/iges_1/O3
index 5c181af71e..6063e7ad3a 100644
--- a/tests/de/iges_1/O3
+++ b/tests/de/iges_1/O3
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 68  ( 594 )  Summary  = 68  ( 594
 CHECKSHAPE  : Wires    = 1  ( 3 )  Faces    = 1  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 457  ( 457 )   Summary  = 10476  ( 10473 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 457  ( 457 )   FreeWire = 26  ( 26 )   FreeEdge  = 1283 ( 1283 )   SharedEdge = 4133  ( 4130 )
-TOLERANCE   : MaxTol   =   0.9875148267  (     0.98741607 )  AvgTol   =   0.01634290864  (   0.01654218425 )
+TOLERANCE   : MaxTol   =   0.9875148267  (     0.98741607 )  AvgTol   =    0.0166905215  (   0.01689161447 )
 LABELS      : N0Labels = 1706  ( 1706 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1706  ( 1706 )   NameLabels = 1706  ( 1706 )   ColorLabels = 1680  ( 1706 )   LayerLabels = 1680  ( 1706 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/iges_1/P4 b/tests/de/iges_1/P4
index 2c3dc61647..6d7a423011 100644
--- a/tests/de/iges_1/P4
+++ b/tests/de/iges_1/P4
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 88  ( 75 )  Summary  = 88  ( 75 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 1 )  Shell    = 0  ( 1 )  Face     = 320  ( 320 )   Summary  = 4995  ( 4896 )
 STATSHAPE   : Solid    = 0  ( 1 )  Shell    = 0  ( 1 )  Face     = 320  ( 320 )   FreeWire = 0  ( 0 )   FreeEdge  = 218 ( 218 )   SharedEdge = 2066  ( 2024 )
-TOLERANCE   : MaxTol   =   0.9408369253  (    1.136317349 )  AvgTol   =    0.0339705896  (   0.03797247772 )
+TOLERANCE   : MaxTol   =   0.9408369253  (    1.136317349 )  AvgTol   =   0.03468777686  (   0.04030133427 )
 LABELS      : N0Labels = 521  ( 521 )  N1Labels = 18  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 539  ( 521 )   NameLabels = 521  ( 521 )   ColorLabels = 537  ( 521 )   LayerLabels = 455  ( 439 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/iges_1/P5 b/tests/de/iges_1/P5
index f3422ea2c4..46fa3b6167 100755
--- a/tests/de/iges_1/P5
+++ b/tests/de/iges_1/P5
@@ -7,11 +7,11 @@ set filename brazo1.igs
 set ref_data {
 DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 144  ( 455 )  Summary  = 144  ( 455 )
-CHECKSHAPE  : Wires    = 5  ( 7 )  Faces    = 6  ( 7 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 228  ( 228 )   Summary  = 4666  ( 4567 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 228  ( 228 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2127  ( 2073 )
+CHECKSHAPE  : Wires    = 6  ( 8 )  Faces    = 6  ( 8 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 223  ( 223 )   Summary  = 4688  ( 4576 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 223  ( 223 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2156  ( 2092 )
 TOLERANCE   : MaxTol   =    0.991254355  (    0.991254355 )  AvgTol   =    0.0113074551  (   0.01224298461 )
-LABELS      : N0Labels = 223  ( 223 )  N1Labels = 6  ( 301 )  N2Labels = 0  ( 0 )   TotalLabels = 229  ( 524 )   NameLabels = 223  ( 387 )   ColorLabels = 228  ( 524 )   LayerLabels = 228  ( 524 )
+LABELS      : N0Labels = 223  ( 223 )  N1Labels = 0  ( 256 )  N2Labels = 0  ( 0 )   TotalLabels = 223  ( 479 )   NameLabels = 223  ( 388 )   ColorLabels = 223  ( 479 )   LayerLabels = 223  ( 479 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
 COLORS      : Colors   = BLUE1 MAGENTA1 YELLOW  ( BLUE1 MAGENTA1 YELLOW )
diff --git a/tests/de/iges_1/P9 b/tests/de/iges_1/P9
index ec1789de04..8883a5c894 100644
--- a/tests/de/iges_1/P9
+++ b/tests/de/iges_1/P9
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 38  ( 183 )  Summary  = 38  ( 183
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 114  ( 114 )   Summary  = 2511  ( 2510 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 114  ( 114 )   FreeWire = 23  ( 23 )   FreeEdge  = 331 ( 331 )   SharedEdge = 983  ( 983 )
-TOLERANCE   : MaxTol   =   0.1829958579  (   0.1829958769 )  AvgTol   =  0.002970769325  (  0.003040791402 )
+TOLERANCE   : MaxTol   =   0.1829958579  (   0.1829958769 )  AvgTol   =  0.003259834421  (  0.003329232309 )
 LABELS      : N0Labels = 412  ( 412 )  N1Labels = 2  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 414  ( 412 )   NameLabels = 412  ( 412 )   ColorLabels = 389  ( 410 )   LayerLabels = 389  ( 410 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/iges_1/Q3 b/tests/de/iges_1/Q3
index 0b94be4005..b4e6d196bd 100644
--- a/tests/de/iges_1/Q3
+++ b/tests/de/iges_1/Q3
@@ -1,14 +1,14 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
-
+puts "TODO CR22598 ALL: CHECKSHAPE : Faulty" 
 
 set filename 919-001-T02-04-CP-VL.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 98  ( 1376 )  Summary  = 98  ( 1376 )
-CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 899  ( 899 )   Summary  = 24042  ( 24038 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 899  ( 899 )   FreeWire = 366  ( 366 )   FreeEdge  = 3783 ( 3783 )   SharedEdge = 9390  ( 9388 )
 TOLERANCE   : MaxTol   =   0.3151652209  (   0.3151652209 )  AvgTol   =  0.0006858150184  (  0.000729734612 )
diff --git a/tests/de/iges_1/R3 b/tests/de/iges_1/R3
index f9d3ddfb46..d50b3c16c8 100644
--- a/tests/de/iges_1/R3
+++ b/tests/de/iges_1/R3
@@ -9,9 +9,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 211  ( 2186 )  Summary  = 211  ( 2186 )
 CHECKSHAPE  : Wires    = 0  ( 1 )  Faces    = 0  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 872  ( 872 )   Summary  = 30412  ( 30408 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 872  ( 872 )   FreeWire = 39  ( 39 )   FreeEdge  = 979 ( 979 )   SharedEdge = 14224  ( 14222 )
-TOLERANCE   : MaxTol   =   0.9989623361  (   0.9989623361 )  AvgTol   =  0.008004743627  (  0.008006427388 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 872  ( 872 )   Summary  = 30411  ( 30408 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 872  ( 872 )   FreeWire = 39  ( 39 )   FreeEdge  = 979 ( 979 )   SharedEdge = 14223  ( 14222 )
+TOLERANCE   : MaxTol   =   0.9989623361  (   0.9989623361 )  AvgTol   =   0.00936440041  (  0.009365667686 )
 LABELS      : N0Labels = 1063  ( 1063 )  N1Labels = 0  ( 1675 )  N2Labels = 0  ( 0 )   TotalLabels = 1063  ( 2738 )   NameLabels = 1063  ( 1644 )   ColorLabels = 1024  ( 2738 )   LayerLabels = 1024  ( 2738 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 5 )
diff --git a/tests/de/iges_1/R8 b/tests/de/iges_1/R8
index d6e1002dc4..e5e4bdc7d0 100755
--- a/tests/de/iges_1/R8
+++ b/tests/de/iges_1/R8
@@ -7,10 +7,10 @@ set filename BUC60743.igs
 set ref_data {
 DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 3  ( 59 )  Warnings = 2203  ( 4655 )  Summary  = 2206  ( 4714 )
-CHECKSHAPE  : Wires    = 7  ( 16 )  Faces    = 6  ( 11 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3349  ( 2837 )   Summary  = 45817  ( 39080 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3349  ( 3349 )   FreeWire = 6  ( 6 )   FreeEdge  = 67 ( 67 )   SharedEdge = 19532  ( 16687 )
-TOLERANCE   : MaxTol   =    4.854604894  (    5.769095076 )  AvgTol   =   0.01611269216  (   0.01730055221 )
+CHECKSHAPE  : Wires    = 7  ( 17 )  Faces    = 7  ( 12 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3349  ( 2837 )   Summary  = 45816  ( 39080 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3349  ( 3349 )   FreeWire = 6  ( 6 )   FreeEdge  = 67 ( 67 )   SharedEdge = 19531  ( 16687 )
+TOLERANCE   : MaxTol   =    4.854604894  (    5.769095076 )  AvgTol   =   0.01628658326  (   0.01747356296 )
 LABELS      : N0Labels = 11  ( 11 )  N1Labels = 2891  ( 6256 )  N2Labels = 0  ( 0 )   TotalLabels = 2902  ( 6267 )   NameLabels = 2900  ( 5879 )   ColorLabels = 2891  ( 6256 )   LayerLabels = 2411  ( 5261 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/iges_2/A4 b/tests/de/iges_2/A4
index 68ebe3b7e0..dc1bc93dbf 100644
--- a/tests/de/iges_2/A4
+++ b/tests/de/iges_2/A4
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 9 )  Warnings = 110  ( 1040 )  Summary  = 110  ( 1
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 622  ( 311 )   Summary  = 23710  ( 11832 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 622  ( 622 )   FreeWire = 816  ( 816 )   FreeEdge  = 4824 ( 4824 )   SharedEdge = 10126  ( 5051 )
-TOLERANCE   : MaxTol   =   0.6358507691  (    4.452024967 )  AvgTol   =  0.002687669987  (   0.00407957753 )
+TOLERANCE   : MaxTol   =   0.6427268663  (    4.452116544 )  AvgTol   =   0.01239717192  (   0.01380706073 )
 LABELS      : N0Labels = 7  ( 7 )  N1Labels = 379  ( 3264 )  N2Labels = 0  ( 0 )   TotalLabels = 386  ( 3271 )   NameLabels = 386  ( 1010 )   ColorLabels = 381  ( 3266 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/iges_2/A7 b/tests/de/iges_2/A7
index 82a550f6f4..1c3c8b7855 100644
--- a/tests/de/iges_2/A7
+++ b/tests/de/iges_2/A7
@@ -2,6 +2,7 @@
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
+puts "TODO CR23096 ALL: NBSHAPES : Faulty"
 
 set LinuxDiff 2
 set LinuxFaulties {NBSHAPES}
@@ -10,9 +11,9 @@ set filename CTS18547.igs
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 49 )  Warnings = 41  ( 1012 )  Summary  = 41  ( 1061 )
-CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 539  ( 539 )   Summary  = 12802  ( 12800 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 539  ( 539 )   FreeWire = 19  ( 21 )   FreeEdge  = 1864 ( 1864 )   SharedEdge = 4959  ( 4957 )
+CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 539  ( 539 )   Summary  = 12798  ( 12800 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 539  ( 539 )   FreeWire = 19  ( 21 )   FreeEdge  = 1864 ( 1864 )   SharedEdge = 4957  ( 4957 )
 TOLERANCE   : MaxTol   =   0.7510769849  (   0.7510769849 )  AvgTol   =  0.006853010548  (  0.007168795519 )
 LABELS      : N0Labels = 65  ( 65 )  N1Labels = 2112  ( 4351 )  N2Labels = 0  ( 0 )   TotalLabels = 2177  ( 4416 )   NameLabels = 2177  ( 2778 )   ColorLabels = 2123  ( 4366 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/iges_2/A9 b/tests/de/iges_2/A9
index e6d32207c0..59abafc95f 100755
--- a/tests/de/iges_2/A9
+++ b/tests/de/iges_2/A9
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
+puts "TODO 0025623 ALL: CHECKSHAPE : Faulty" 
 
 set LinuxDiff 3
 set filename Amino_172448-65210.igs
@@ -9,9 +9,9 @@ set filename Amino_172448-65210.igs
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 56  ( 12 )  Summary  = 56  ( 12 )
-CHECKSHAPE  : Wires    = 0  ( 1 )  Faces    = 0  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2346  ( 1106 )   Summary  = 59781  ( 25969 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2346  ( 2342 )   FreeWire = 2328  ( 2328 )   FreeEdge  = 14016 ( 14016 )   SharedEdge = 24556  ( 10687 )
+CHECKSHAPE  : Wires    = 2  ( 1 )  Faces    = 2  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2342  ( 1106 )   Summary  = 59777  ( 25969 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2342  ( 2342 )   FreeWire = 2328  ( 2328 )   FreeEdge  = 14016 ( 14016 )   SharedEdge = 24558  ( 10687 )
 TOLERANCE   : MaxTol   =   0.9711309062  (   0.9711309063 )  AvgTol   =   0.01916076754  (   0.01948753951 )
 LABELS      : N0Labels = 250  ( 250 )  N1Labels = 2268  ( 3205 )  N2Labels = 0  ( 0 )   TotalLabels = 2518  ( 3455 )   NameLabels = 2518  ( 3453 )   ColorLabels = 2512  ( 3449 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/iges_2/B1 b/tests/de/iges_2/B1
index a5be016ae5..68dda4c9ba 100755
--- a/tests/de/iges_2/B1
+++ b/tests/de/iges_2/B1
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
@@ -12,8 +11,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 480 )  Warnings = 322  ( 4629 )  Summary  = 322  ( 5109 )
 CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 732  ( 732 )   Summary  = 60881  ( 60890 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 732  ( 732 )   FreeWire = 1612  ( 1613 )   FreeEdge  = 16359 ( 16359 )   SharedEdge = 22931  ( 22935 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 732  ( 732 )   Summary  = 60876  ( 60888 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 732  ( 732 )   FreeWire = 1612  ( 1613 )   FreeEdge  = 16359 ( 16359 )   SharedEdge = 22927  ( 22933 )
 TOLERANCE   : MaxTol   =   0.6032674714  (   0.6032674714 )  AvgTol   =  0.001483351096  (   0.00148733059 )
 LABELS      : N0Labels = 4  ( 7 )  N1Labels = 11017  ( 17868 )  N2Labels = 0  ( 0 )   TotalLabels = 11021  ( 17875 )   NameLabels = 10620  ( 13085 )   ColorLabels = 11018  ( 17867 )   LayerLabels = 10517  ( 17715 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/iges_2/C2 b/tests/de/iges_2/C2
index d5beae200f..6106d5414f 100644
--- a/tests/de/iges_2/C2
+++ b/tests/de/iges_2/C2
@@ -11,9 +11,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 2  ( 0 )  Warnings = 85  ( 295 )  Summary  = 87  ( 295 )
 CHECKSHAPE  : Wires    = 8  ( 13 )  Faces    = 8  ( 13 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 419  ( 419 )   Summary  = 5330  ( 5352 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 419  ( 419 )   Summary  = 5330  ( 5351 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 419  ( 419 )   FreeWire = 4  ( 4 )   FreeEdge  = 42 ( 42 )   SharedEdge = 2221  ( 2227 )
-TOLERANCE   : MaxTol   =    4.549042095  (    4.543567878 )  AvgTol   =   0.03220479855  (   0.03563724531 )
+TOLERANCE   : MaxTol   =    4.548096104  (    4.543567878 )  AvgTol   =   0.03300579563  (   0.03647254811 )
 LABELS      : N0Labels = 457  ( 457 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 457  ( 457 )   NameLabels = 457  ( 457 )   ColorLabels = 451  ( 455 )   LayerLabels = 453  ( 457 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/iges_2/C4 b/tests/de/iges_2/C4
index facf3cda76..d6f43c74ca 100644
--- a/tests/de/iges_2/C4
+++ b/tests/de/iges_2/C4
@@ -1,5 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
+puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
+puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
+puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 
 set LinuxDiff 1
 set filename PRO14323.igs
@@ -8,9 +11,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 29  ( 233 )  Summary  = 29  ( 233 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 153  ( 153 )   Summary  = 3509  ( 3508 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 153  ( 153 )   FreeWire = 21  ( 21 )   FreeEdge  = 435 ( 435 )   SharedEdge = 1387  ( 1387 )
-TOLERANCE   : MaxTol   =   0.7766762288  (   0.7767538966 )  AvgTol   =   0.01313632194  (   0.01322061361 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 153  ( 153 )   Summary  = 3497  ( 3504 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 153  ( 153 )   FreeWire = 21  ( 21 )   FreeEdge  = 435 ( 435 )   SharedEdge = 1380  ( 1384 )
+TOLERANCE   : MaxTol   =   0.9672552763  (   0.9530871146 )  AvgTol   =   0.01866948774  (   0.01940759381 )
 LABELS      : N0Labels = 564  ( 564 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 564  ( 564 )   NameLabels = 564  ( 564 )   ColorLabels = 543  ( 564 )   LayerLabels = 543  ( 564 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/iges_2/C6 b/tests/de/iges_2/C6
index 0c60729be7..f6ab2f0223 100644
--- a/tests/de/iges_2/C6
+++ b/tests/de/iges_2/C6
@@ -1,6 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
+puts "TODO 0025623 ALL: CHECKSHAPE : Faulty" 
 
 
 set filename PRO19800.igs
@@ -8,9 +9,9 @@ set filename PRO19800.igs
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
-CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1  ( 1 )   Summary  = 11  ( 11 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 5  ( 5 )
+CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1  ( 1 )   Summary  = 13  ( 11 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 6  ( 5 )
 TOLERANCE   : MaxTol   =  0.04476902169  (  0.04476636368 )  AvgTol   =   0.02402039477  (   0.02401933664 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 5 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 6 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 6 )   LayerLabels = 1  ( 6 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/iges_2/E1 b/tests/de/iges_2/E1
index dcdf91935f..fc776757a1 100644
--- a/tests/de/iges_2/E1
+++ b/tests/de/iges_2/E1
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 2 )  Warnings = 0  ( 48 )  Summary  = 0  ( 50 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 12  ( 6 )   Summary  = 743  ( 624 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 12  ( 12 )   FreeWire = 40  ( 40 )   FreeEdge  = 188 ( 188 )   SharedEdge = 296  ( 242 )
-TOLERANCE   : MaxTol   =   0.2600681266  (    7.241630725 )  AvgTol   =    0.0311002192  (    0.4059717949 )
+TOLERANCE   : MaxTol   =   0.2600681266  (    7.241630725 )  AvgTol   =   0.03297721346  (    0.4073375928 )
 LABELS      : N0Labels = 7  ( 7 )  N1Labels = 44  ( 98 )  N2Labels = 0  ( 0 )   TotalLabels = 51  ( 105 )   NameLabels = 51  ( 97 )   ColorLabels = 50  ( 104 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/iges_2/F9 b/tests/de/iges_2/F9
index 3db7abf59e..f05122ec5a 100644
--- a/tests/de/iges_2/F9
+++ b/tests/de/iges_2/F9
@@ -10,8 +10,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 2 )  Warnings = 277  ( 2065 )  Summary  = 277  ( 2067 )
 CHECKSHAPE  : Wires    = 0  ( 3 )  Faces    = 0  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1457  ( 1455 )   Summary  = 38865  ( 38834 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1457  ( 1455 )   FreeWire = 516  ( 528 )   FreeEdge  = 6208 ( 6208 )   SharedEdge = 15328  ( 15304 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1457  ( 1455 )   Summary  = 38866  ( 38834 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1457  ( 1455 )   FreeWire = 516  ( 528 )   FreeEdge  = 6208 ( 6208 )   SharedEdge = 15329  ( 15304 )
 TOLERANCE   : MaxTol   =   0.7947997475  (   0.4653265785 )  AvgTol   =  0.001017262894  (  0.0008404073573 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 5689  ( 14457 )  N2Labels = 0  ( 0 )   TotalLabels = 5694  ( 14462 )   NameLabels = 5694  ( 7040 )   ColorLabels = 5689  ( 14461 )   LayerLabels = 5689  ( 14461 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/iges_2/G1 b/tests/de/iges_2/G1
index e6d88495ea..19269cf1b1 100755
--- a/tests/de/iges_2/G1
+++ b/tests/de/iges_2/G1
@@ -12,9 +12,9 @@ set filename Henri.igs
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 69  ( 41 )  Summary  = 69  ( 41 )
-CHECKSHAPE  : Wires    = 8  ( 2 )  Faces    = 8  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3592  ( 2312 )   Summary  = 112063  ( 71736 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3592  ( 3592 )   FreeWire = 4024  ( 4024 )   FreeEdge  = 28849 ( 28849 )   SharedEdge = 44966  ( 28775 )
+CHECKSHAPE  : Wires    = 8  ( 5 )  Faces    = 8  ( 5 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3592  ( 2314 )   Summary  = 112057  ( 71744 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3592  ( 3592 )   FreeWire = 4024  ( 4024 )   FreeEdge  = 28849 ( 28849 )   SharedEdge = 44964  ( 28779 )
 TOLERANCE   : MaxTol   =   0.9133007093  (   0.9133008813 )  AvgTol   =  0.005629101837  (  0.005904201197 )
 LABELS      : N0Labels = 24  ( 24 )  N1Labels = 5153  ( 6559 )  N2Labels = 0  ( 0 )   TotalLabels = 5177  ( 6583 )   NameLabels = 5177  ( 6583 )   ColorLabels = 5153  ( 6559 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/iges_2/G8 b/tests/de/iges_2/G8
index 21726fcdd9..330327d996 100644
--- a/tests/de/iges_2/G8
+++ b/tests/de/iges_2/G8
@@ -11,9 +11,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 2 )  Warnings = 145  ( 1619 )  Summary  = 145  ( 1621 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 253  ( 253 )   Summary  = 5360  ( 5363 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 253  ( 253 )   Summary  = 5359  ( 5363 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 253  ( 253 )   FreeWire = 7  ( 10 )   FreeEdge  = 78 ( 78 )   SharedEdge = 2412  ( 2412 )
-TOLERANCE   : MaxTol   =  0.04061865832  (  0.03139483949 )  AvgTol   =  0.0003212756237  (  0.0002830654529 )
+TOLERANCE   : MaxTol   =  0.04838312754  (   0.0483782783 )  AvgTol   =  0.002925020972  (  0.002891060102 )
 LABELS      : N0Labels = 8  ( 8 )  N1Labels = 269  ( 2698 )  N2Labels = 0  ( 0 )   TotalLabels = 277  ( 2706 )   NameLabels = 277  ( 384 )   ColorLabels = 272  ( 2704 )   LayerLabels = 272  ( 2704 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 4 )
diff --git a/tests/de/iges_2/H9 b/tests/de/iges_2/H9
index d7774c8b90..6edda92ef6 100755
--- a/tests/de/iges_2/H9
+++ b/tests/de/iges_2/H9
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 
@@ -12,8 +11,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 3 )  Warnings = 274  ( 4465 )  Summary  = 274  ( 4468 )
 CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 3  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1628  ( 1628 )   Summary  = 39243  ( 39275 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1628  ( 1628 )   FreeWire = 22  ( 26 )   FreeEdge  = 135 ( 135 )   SharedEdge = 17944  ( 17947 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1628  ( 1628 )   Summary  = 39230  ( 39268 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1628  ( 1628 )   FreeWire = 22  ( 26 )   FreeEdge  = 135 ( 135 )   SharedEdge = 17933  ( 17940 )
 TOLERANCE   : MaxTol   =   4.337400808e+088  (    8.082392835e+086 )  AvgTol   =  2.040579288e+085  (    5.099401401e+083 )
 LABELS      : N0Labels = 6  ( 6 )  N1Labels = 1643  ( 9638 )  N2Labels = 0  ( 0 )   TotalLabels = 1649  ( 9644 )   NameLabels = 1649  ( 2890 )   ColorLabels = 1645  ( 9643 )   LayerLabels = 489  ( 3997 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/iges_2/I7 b/tests/de/iges_2/I7
index a64604a605..f487a196f7 100644
--- a/tests/de/iges_2/I7
+++ b/tests/de/iges_2/I7
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
-
+puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 
 set filename ims016.igs
 
@@ -9,8 +9,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 120  ( 402 )  Summary  = 120  ( 402 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 138  ( 138 )   Summary  = 10563  ( 10563 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 138  ( 138 )   FreeWire = 6  ( 6 )   FreeEdge  = 353 ( 353 )   SharedEdge = 4949  ( 4949 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 138  ( 138 )   Summary  = 10561  ( 10563 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 138  ( 138 )   FreeWire = 6  ( 6 )   FreeEdge  = 353 ( 353 )   SharedEdge = 4947  ( 4949 )
 TOLERANCE   : MaxTol   =  0.07559058774  (  0.07559058772 )  AvgTol   =  0.0006486647078  (  0.0006485486933 )
 LABELS      : N0Labels = 503  ( 503 )  N1Labels = 0  ( 196 )  N2Labels = 0  ( 0 )   TotalLabels = 503  ( 699 )   NameLabels = 503  ( 503 )   ColorLabels = 470  ( 699 )   LayerLabels = 313  ( 344 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/iges_3/A4 b/tests/de/iges_3/A4
index eecbeb1b79..9fcc24c500 100755
--- a/tests/de/iges_3/A4
+++ b/tests/de/iges_3/A4
@@ -12,10 +12,10 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 12  ( 238 )  Warnings = 470  ( 2526 )  Summary  = 482  ( 2764 )
 CHECKSHAPE  : Wires    = 3  ( 3 )  Faces    = 3  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1346  ( 1345 )   Summary  = 22207  ( 22290 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1346  ( 1345 )   FreeWire = 96  ( 170 )   FreeEdge  = 1061 ( 1061 )   SharedEdge = 9265  ( 9275 )
-TOLERANCE   : MaxTol   =   0.8630766579  (    1.367916315 )  AvgTol   =  0.008032623547  (  0.008257993798 )
-LABELS      : N0Labels = 27  ( 27 )  N1Labels = 2100  ( 6099 )  N2Labels = 0  ( 0 )   TotalLabels = 2127  ( 6126 )   NameLabels = 2127  ( 2596 )   ColorLabels = 2114  ( 6125 )   LayerLabels = 2114  ( 6125 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1346  ( 1345 )   Summary  = 22209  ( 22292 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1346  ( 1345 )   FreeWire = 96  ( 170 )   FreeEdge  = 1061 ( 1061 )   SharedEdge = 9267  ( 9277 )
+TOLERANCE   : MaxTol   =   0.8099726869  (    1.367966665 )  AvgTol   =  0.008047288197  (  0.008376941947 )
+LABELS      : N0Labels = 27  ( 27 )  N1Labels = 2100  ( 6101 )  N2Labels = 0  ( 0 )   TotalLabels = 2127  ( 6128 )   NameLabels = 2127  ( 2596 )   ColorLabels = 2114  ( 6127 )   LayerLabels = 2114  ( 6127 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 11  ( 12 )
 COLORS      : Colors   = BLUE1 CYAN1 CYAN2 DARKGOLDENROD GREEN MAGENTA1 PALEVIOLETRED1 RED TURQUOISE2 WHITE YELLOW  ( BLUE1 CYAN1 CYAN2 DARKGOLDENROD GRAY53 GREEN MAGENTA1 PALEVIOLETRED1 RED TURQUOISE2 WHITE YELLOW )
diff --git a/tests/de/iges_3/A6 b/tests/de/iges_3/A6
index 34f99eadc5..fa27c7ab92 100755
--- a/tests/de/iges_3/A6
+++ b/tests/de/iges_3/A6
@@ -11,9 +11,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 16  ( 3 )  Warnings = 46  ( 305 )  Summary  = 62  ( 308 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 145  ( 145 )   Summary  = 3869  ( 3869 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 145  ( 145 )   Summary  = 3870  ( 3869 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 145  ( 145 )   FreeWire = 64  ( 64 )   FreeEdge  = 617 ( 617 )   SharedEdge = 1627  ( 1627 )
-TOLERANCE   : MaxTol   =   0.0521262172  (   0.0521264751 )  AvgTol   =  0.0004294496628  (  0.0004227153137 )
+TOLERANCE   : MaxTol   =  0.09719916174  (  0.09719915743 )  AvgTol   =  0.001636226349  (  0.001630578185 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 346  ( 756 )  N2Labels = 0  ( 0 )   TotalLabels = 348  ( 758 )   NameLabels = 348  ( 478 )   ColorLabels = 347  ( 757 )   LayerLabels = 336  ( 744 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 3 )
diff --git a/tests/de/iges_3/A9 b/tests/de/iges_3/A9
index aa386db8ee..2cc49321f1 100644
--- a/tests/de/iges_3/A9
+++ b/tests/de/iges_3/A9
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 5745  ( 31066 )  Summary  = 5745  ( 31066 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 6500  ( 6500 )   Summary  = 158092  ( 158092 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 6500  ( 6500 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 72654  ( 72654 )
-TOLERANCE   : MaxTol   =   0.9560441943  (   0.9560441934 )  AvgTol   =   0.00182443883  (  0.001822190978 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 6500  ( 6500 )   Summary  = 158096  ( 158092 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 6500  ( 6500 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 72656  ( 72654 )
+TOLERANCE   : MaxTol   =   0.9560441943  (   0.9560441934 )  AvgTol   =  0.001956426418  (  0.001954522593 )
 LABELS      : N0Labels = 6500  ( 6500 )  N1Labels = 0  ( 25582 )  N2Labels = 0  ( 0 )   TotalLabels = 6500  ( 32082 )   NameLabels = 6500  ( 6500 )   ColorLabels = 6500  ( 32082 )   LayerLabels = 6500  ( 32082 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/A3 b/tests/de/step_1/A3
index b399859590..0241b6353f 100644
--- a/tests/de/step_1/A3
+++ b/tests/de/step_1/A3
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 42  ( 58 )  Summary  = 42  ( 58 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 49  ( 0 )  Face     = 49  ( 49 )   Summary  = 579  ( 530 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 49  ( 0 )  Face     = 49  ( 49 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 220  ( 218 )
-TOLERANCE   : MaxTol   = 0.003591433268  ( 0.003591433268 )  AvgTol   =  0.0002622543709  (  0.0002642585768 )
+TOLERANCE   : MaxTol   = 0.003591433268  ( 0.006121716429 )  AvgTol   =  0.0002657130942  (  0.0004625449099 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/A7 b/tests/de/step_1/A7
index 4cee0556df..934f2c3f45 100644
--- a/tests/de/step_1/A7
+++ b/tests/de/step_1/A7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 33  ( 32 )  Summary  = 33  ( 32 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 8  ( 8 )  Shell    = 8  ( 8 )  Face     = 101  ( 101 )   Summary  = 604  ( 604 )
 STATSHAPE   : Solid    = 11  ( 11 )  Shell    = 11  ( 11 )  Face     = 134  ( 134 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 221  ( 221 )
-TOLERANCE   : MaxTol   = 0.0002663670698  ( 0.0002663644067 )  AvgTol   =  6.037718226e-006  (  6.059069808e-006 )
+TOLERANCE   : MaxTol   = 0.0002663644062  ( 0.004247215546 )  AvgTol   =  6.0376793e-006  (  9.943585154e-005 )
 LABELS      : N0Labels = 13  ( 13 )  N1Labels = 18  ( 23 )  N2Labels = 0  ( 5 )   TotalLabels = 31  ( 41 )   NameLabels = 27  ( 27 )   ColorLabels = 12  ( 12 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/B4 b/tests/de/step_1/B4
index c4e4fd1dca..439694b752 100644
--- a/tests/de/step_1/B4
+++ b/tests/de/step_1/B4
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 40 )  Summary  = 4  ( 40 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 36  ( 3 )  Face     = 186  ( 186 )   Summary  = 1404  ( 1371 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 36  ( 3 )  Face     = 186  ( 186 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 548  ( 548 )
-TOLERANCE   : MaxTol   =  0.00767687178  ( 0.007676871778 )  AvgTol   =  0.000146989591  (  0.0001476364721 )
+TOLERANCE   : MaxTol   = 0.007676795012  (  0.01770527621 )  AvgTol   =  0.0001484581256  (  0.0002068814634 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 37  ( 37 )  N2Labels = 0  ( 0 )   TotalLabels = 42  ( 42 )   NameLabels = 9  ( 9 )   ColorLabels = 36  ( 36 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/B7 b/tests/de/step_1/B7
index 97fc51439d..61d3412893 100644
--- a/tests/de/step_1/B7
+++ b/tests/de/step_1/B7
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 0 )  Face     = 1  ( 1 )   Summary  = 11  ( 11 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 0 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 4  ( 4 )
-TOLERANCE   : MaxTol   = 0.007328453216  ( 0.007328453217 )  AvgTol   =  0.005461043908  (  0.005461043909 )
+TOLERANCE   : MaxTol   =  0.01553531324  (  0.04002196131 )  AvgTol   =  0.009251748359  (   0.02246039438 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 1  ( 1 )  N2Labels = 0  ( 0 )   TotalLabels = 2  ( 2 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/C2 b/tests/de/step_1/C2
index 329f25870b..b2c76bc817 100644
--- a/tests/de/step_1/C2
+++ b/tests/de/step_1/C2
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
 set filename PRO12761.stp
@@ -9,9 +7,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 3 )  Summary  = 9  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 36  ( 36 )   Summary  = 282  ( 262 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 36  ( 36 )   FreeWire = 0  ( 2 )   FreeEdge  = 19 ( 19 )   SharedEdge = 108  ( 107 )
-TOLERANCE   : MaxTol   = 0.009538012231  ( 0.006059255816 )  AvgTol   =  0.0006604275096  (  0.0005391951287 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 36  ( 36 )   Summary  = 281  ( 262 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 36  ( 36 )   FreeWire = 0  ( 2 )   FreeEdge  = 19 ( 19 )   SharedEdge = 107  ( 107 )
+TOLERANCE   : MaxTol   = 0.008665713529  (  0.01506194194 )  AvgTol   =  0.0006799119121  (  0.001501244216 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/C3 b/tests/de/step_1/C3
index c3c1dce905..36863c082c 100644
--- a/tests/de/step_1/C3
+++ b/tests/de/step_1/C3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 
 
 set filename trj10_b2-id-214.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 221  ( 221 )   Summary  = 1398  ( 1397 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 221  ( 221 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 576  ( 576 )
-TOLERANCE   : MaxTol   = 0.009952224089  ( 0.009952224089 )  AvgTol   =  0.0006781202362  (  0.0006785080306 )
+TOLERANCE   : MaxTol   = 0.009952224089  ( 0.009952224089 )  AvgTol   =  0.0007250477715  (  0.000901206859 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/C7 b/tests/de/step_1/C7
index 48672ccdb8..a115adc49a 100644
--- a/tests/de/step_1/C7
+++ b/tests/de/step_1/C7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 1 )  Summary  = 6  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 52  ( 52 )  Face     = 52  ( 52 )   Summary  = 1126  ( 942 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 52  ( 52 )  Face     = 52  ( 52 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 484  ( 484 )
-TOLERANCE   : MaxTol   = 0.002730674215  ( 0.002730674215 )  AvgTol   =  0.0001713195092  (  0.0002334494908 )
+TOLERANCE   : MaxTol   = 0.002730674215  (   0.0116718272 )  AvgTol   =  0.000209395694  (  0.001020276868 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 105  ( 53 )  N2Labels = 0  ( 0 )   TotalLabels = 107  ( 55 )   NameLabels = 3  ( 3 )   ColorLabels = 104  ( 53 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/E3 b/tests/de/step_1/E3
index df017cb26b..e7cce727ca 100644
--- a/tests/de/step_1/E3
+++ b/tests/de/step_1/E3
@@ -8,7 +8,7 @@ set filename bm1_sy_exhaust.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 21  ( 12 )  Summary  = 21  ( 12 )
-CHECKSHAPE  : Wires    = 2  ( 0 )  Faces    = 2  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 6  ( 1 )  Faces    = 6  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 35  ( 35 )   Summary  = 289  ( 266 )
 STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 35  ( 35 )   FreeWire = 0  ( 0 )   FreeEdge  = 24 ( 24 )   SharedEdge = 103  ( 103 )
 TOLERANCE   : MaxTol   = 6.104502198e-006  (         1e-005 )  AvgTol   =  9.28336616e-007  (  2.903661931e-006 )
diff --git a/tests/de/step_1/E5 b/tests/de/step_1/E5
index 2b6546567a..6f7306a93a 100644
--- a/tests/de/step_1/E5
+++ b/tests/de/step_1/E5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 1 )  Summary  = 6  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 5  ( 1 )  Face     = 78  ( 78 )   Summary  = 510  ( 506 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 5  ( 1 )  Face     = 78  ( 78 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 206  ( 206 )
-TOLERANCE   : MaxTol   = 0.005871790092  ( 0.005871790092 )  AvgTol   =  0.0001195955053  (  0.0001195955053 )
+TOLERANCE   : MaxTol   = 0.005871790092  (  0.01255641392 )  AvgTol   =  0.0001232801436  (  0.0004487678765 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/E7 b/tests/de/step_1/E7
index b881cb60d8..94174dcce7 100644
--- a/tests/de/step_1/E7
+++ b/tests/de/step_1/E7
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 1 )  Summary  = 1  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 58  ( 58 )  Face     = 58  ( 58 )   Summary  = 837  ( 475 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 58  ( 58 )  Face     = 58  ( 58 )   FreeWire = 0  ( 16 )   FreeEdge  = 16 ( 16 )   SharedEdge = 312  ( 165 )
-TOLERANCE   : MaxTol   = 0.0008167207419  ( 0.000816761578 )  AvgTol   =  5.200297581e-005  (  9.917834779e-005 )
+TOLERANCE   : MaxTol   = 0.0008167207419  ( 0.0009782609385 )  AvgTol   =  5.20029758e-005  (  0.0001030777287 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 60  ( 76 )  N2Labels = 0  ( 0 )   TotalLabels = 63  ( 79 )   NameLabels = 5  ( 5 )   ColorLabels = 58  ( 74 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/G1 b/tests/de/step_1/G1
index b79e7b7e91..46bdb07b78 100644
--- a/tests/de/step_1/G1
+++ b/tests/de/step_1/G1
@@ -12,7 +12,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 184 )  Summary  = 9  ( 184 )
 CHECKSHAPE  : Wires    = 2  ( 0 )  Faces    = 2  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 236  ( 236 )   Summary  = 1654  ( 1655 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 236  ( 236 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 653  ( 653 )
-TOLERANCE   : MaxTol   =   0.9036712736  ( 0.004380869839 )  AvgTol   =  0.002836223222  (  0.0001546745731 )
+TOLERANCE   : MaxTol   =   0.9036712736  (  0.01854047103 )  AvgTol   =  0.002851128061  (  0.0005801792851 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 34  ( 34 )  N2Labels = 0  ( 0 )   TotalLabels = 35  ( 35 )   NameLabels = 1  ( 1 )   ColorLabels = 35  ( 35 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 11  ( 11 )
diff --git a/tests/de/step_1/G4 b/tests/de/step_1/G4
index d159e2585c..49c7f3fbe8 100644
--- a/tests/de/step_1/G4
+++ b/tests/de/step_1/G4
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   Summary  = 369  ( 361 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   FreeWire = 0  ( 0 )   FreeEdge  = 7 ( 7 )   SharedEdge = 145  ( 145 )
-TOLERANCE   : MaxTol   = 0.002782235243  ( 0.002782235243 )  AvgTol   =  0.0002755630596  (  0.0002755632068 )
+TOLERANCE   : MaxTol   = 0.002782235243  ( 0.008046428382 )  AvgTol   =  0.0002755630596  (  0.0008383168463 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 7  ( 9 )  N2Labels = 0  ( 0 )   TotalLabels = 10  ( 12 )   NameLabels = 5  ( 5 )   ColorLabels = 5  ( 5 )   LayerLabels = 5  ( 7 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/I2 b/tests/de/step_1/I2
index 8d77395e1d..01e5f6210c 100644
--- a/tests/de/step_1/I2
+++ b/tests/de/step_1/I2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 2 )  Summary  = 0  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   Summary  = 73  ( 73 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 31  ( 31 )
-TOLERANCE   : MaxTol   = 0.004821884032  ( 0.004821883985 )  AvgTol   =  0.0006277753383  (  0.0006277753348 )
+TOLERANCE   : MaxTol   = 0.004821884032  (   0.2046977269 )  AvgTol   =  0.0006277936905  (   0.01292923854 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/I5 b/tests/de/step_1/I5
index 600db6578c..6350f93476 100644
--- a/tests/de/step_1/I5
+++ b/tests/de/step_1/I5
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 14  ( 4 )  Summary  = 14  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 41  ( 41 )   Summary  = 366  ( 345 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 41  ( 41 )   FreeWire = 0  ( 4 )   FreeEdge  = 24 ( 24 )   SharedEdge = 147  ( 146 )
-TOLERANCE   : MaxTol   =  0.07980045861  (  0.07980045861 )  AvgTol   =  0.005840669333  (  0.005686183039 )
+TOLERANCE   : MaxTol   =  0.07980045861  (  0.07980045861 )  AvgTol   =  0.006103158242  (  0.006647466389 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/I7 b/tests/de/step_1/I7
index e18ed357c0..189e8b2e66 100644
--- a/tests/de/step_1/I7
+++ b/tests/de/step_1/I7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 103  ( 103 )   Summary  = 748  ( 720 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 103  ( 103 )   FreeWire = 0  ( 0 )   FreeEdge  = 28 ( 28 )   SharedEdge = 275  ( 275 )
-TOLERANCE   : MaxTol   =  0.07080255958  (  0.07080255958 )  AvgTol   =  0.001643516697  (  0.001643516697 )
+TOLERANCE   : MaxTol   =  0.07080255958  (  0.07080255958 )  AvgTol   =  0.001643516697  (  0.002252531923 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 7  ( 7 )   NameLabels = 7  ( 7 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/J5 b/tests/de/step_1/J5
index dc5b05f87b..33bdfd839a 100644
--- a/tests/de/step_1/J5
+++ b/tests/de/step_1/J5
@@ -4,7 +4,7 @@ set filename bm1_ie_t4.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
-CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 15  ( 15 )  Face     = 16  ( 16 )   Summary  = 173  ( 173 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 15  ( 15 )  Face     = 16  ( 16 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 62  ( 62 )
 TOLERANCE   : MaxTol   = 0.005727453836  ( 0.005727453946 )  AvgTol   =  0.001247002689  (  0.001247002697 )
diff --git a/tests/de/step_1/J6 b/tests/de/step_1/J6
index 7a3cd8e2a1..73c5ac7875 100755
--- a/tests/de/step_1/J6
+++ b/tests/de/step_1/J6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 set LinuxDiff 2
 set LinuxFaulties {STATSHAPE}
@@ -8,9 +7,9 @@ set filename bm1_pe_t4.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 2 )  Warnings = 19  ( 27 )  Summary  = 19  ( 29 )
-CHECKSHAPE  : Wires    = 2  ( 3 )  Faces    = 2  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 13  ( 12 )  Face     = 16  ( 15 )   Summary  = 154  ( 151 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 13  ( 12 )  Face     = 16  ( 15 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 59  ( 60 )
+CHECKSHAPE  : Wires    = 2  ( 3 )  Faces    = 3  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 12  ( 12 )  Face     = 15  ( 15 )   Summary  = 151  ( 151 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 12  ( 12 )  Face     = 15  ( 15 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 59  ( 60 )
 TOLERANCE   : MaxTol   =    1562.051497  (    1562.051497 )  AvgTol   =     192.5735494  (     206.7634854 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/step_1/J8 b/tests/de/step_1/J8
index 28a1f92617..a1b7819dd4 100644
--- a/tests/de/step_1/J8
+++ b/tests/de/step_1/J8
@@ -8,7 +8,7 @@ set filename bm1_sy_lever.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 11  ( 9 )  Summary  = 11  ( 9 )
-CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 99  ( 99 )   Summary  = 655  ( 656 )
 STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 99  ( 99 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 266  ( 266 )
 TOLERANCE   : MaxTol   =    3.000180002  (    3.000180002 )  AvgTol   =    0.1203601833  (    0.1203606739 )
diff --git a/tests/de/step_1/K9 b/tests/de/step_1/K9
index a11b34fa9e..d58a0ba9f1 100644
--- a/tests/de/step_1/K9
+++ b/tests/de/step_1/K9
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 7  ( 7 )  Summary  = 7  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 63  ( 63 )   Summary  = 397  ( 397 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 63  ( 63 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 161  ( 161 )
-TOLERANCE   : MaxTol   = 0.003354436772  ( 0.003354436766 )  AvgTol   =  9.01049205e-005  (  9.010492038e-005 )
+TOLERANCE   : MaxTol   = 0.003354436772  ( 0.005782871451 )  AvgTol   =  9.01049205e-005  (  0.0002474592456 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/L1 b/tests/de/step_1/L1
index d9438b1697..02ddde8b39 100644
--- a/tests/de/step_1/L1
+++ b/tests/de/step_1/L1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 3 )  Summary  = 1  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 63  ( 63 )   Summary  = 397  ( 397 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 63  ( 63 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 161  ( 161 )
-TOLERANCE   : MaxTol   = 0.003354570949  ( 0.003354570942 )  AvgTol   =  9.013170155e-005  (  9.013204232e-005 )
+TOLERANCE   : MaxTol   = 0.003354570949  ( 0.004866377804 )  AvgTol   =  9.013170155e-005  (  0.0002225463723 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/L2 b/tests/de/step_1/L2
index 1bd5a793f2..905b125807 100644
--- a/tests/de/step_1/L2
+++ b/tests/de/step_1/L2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 7  ( 7 )  Summary  = 7  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 63  ( 63 )   Summary  = 397  ( 397 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 63  ( 63 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 161  ( 161 )
-TOLERANCE   : MaxTol   = 0.003354436772  ( 0.003354436766 )  AvgTol   =  9.01049205e-005  (  9.010492038e-005 )
+TOLERANCE   : MaxTol   = 0.003354436772  ( 0.005782871451 )  AvgTol   =  9.01049205e-005  (  0.0002474592456 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/L3 b/tests/de/step_1/L3
index 2d2203e12a..3def8bfcb7 100644
--- a/tests/de/step_1/L3
+++ b/tests/de/step_1/L3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 4 )  Summary  = 1  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 63  ( 63 )   Summary  = 397  ( 397 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 63  ( 63 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 161  ( 161 )
-TOLERANCE   : MaxTol   = 0.003354570949  ( 0.003354570943 )  AvgTol   =  9.015270484e-005  (  9.015342029e-005 )
+TOLERANCE   : MaxTol   = 0.003354570949  ( 0.004866377804 )  AvgTol   =  9.015270484e-005  (  0.000222559965 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/L4 b/tests/de/step_1/L4
index 65e36cae5f..42dbf6ca26 100644
--- a/tests/de/step_1/L4
+++ b/tests/de/step_1/L4
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
 set filename bm2_ie_lever-C.stp
@@ -11,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 7 )  Summary  = 9  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 333  ( 333 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 135  ( 135 )
-TOLERANCE   : MaxTol   = 1.823995648e-006  ( 2.885128872e-007 )  AvgTol   =  1.410536468e-007  (  1.021395759e-007 )
+TOLERANCE   : MaxTol   = 2.885723252e-007  ( 0.005189489581 )  AvgTol   =  1.021399653e-007  (  0.0002274307219 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/L5 b/tests/de/step_1/L5
index fdaa1c6c9f..16f192cd41 100644
--- a/tests/de/step_1/L5
+++ b/tests/de/step_1/L5
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 12  ( 7 )  Summary  = 12  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 335  ( 335 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 136  ( 136 )
-TOLERANCE   : MaxTol   = 0.000304966156  ( 0.0003049661559 )  AvgTol   =  4.358245067e-006  (  4.319600685e-006 )
+TOLERANCE   : MaxTol   = 0.000304966156  ( 0.005189422784 )  AvgTol   =  4.319600685e-006  (  0.0002258553417 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/L9 b/tests/de/step_1/L9
index 4c7b53ed4c..1cf009bd8b 100644
--- a/tests/de/step_1/L9
+++ b/tests/de/step_1/L9
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 3  ( 0 )  Summary  = 3  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 73  ( 73 )   Summary  = 469  ( 469 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 73  ( 73 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 194  ( 194 )
-TOLERANCE   : MaxTol   =   0.2144663085  (   0.2144663085 )  AvgTol   =  0.003528428672  (  0.003148222274 )
+TOLERANCE   : MaxTol   =   0.2144663085  (   0.2144663085 )  AvgTol   =  0.003931550309  (   0.01531627646 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/M1 b/tests/de/step_1/M1
index 62f15aefde..110b1e013e 100644
--- a/tests/de/step_1/M1
+++ b/tests/de/step_1/M1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 73  ( 73 )   Summary  = 471  ( 471 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 73  ( 73 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 195  ( 195 )
-TOLERANCE   : MaxTol   = 0.002772705081  ( 0.002772705081 )  AvgTol   =  0.0001862241325  (  0.0001862241325 )
+TOLERANCE   : MaxTol   = 0.002772705081  ( 0.007671422015 )  AvgTol   =  0.0001862241325  (  0.0004076685863 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/M2 b/tests/de/step_1/M2
index 1e35f2f456..00b4bca749 100644
--- a/tests/de/step_1/M2
+++ b/tests/de/step_1/M2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 73  ( 73 )   Summary  = 471  ( 471 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 73  ( 73 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 195  ( 195 )
-TOLERANCE   : MaxTol   = 0.002169065527  ( 0.002169065527 )  AvgTol   =  0.0001558899524  (  0.0001558899524 )
+TOLERANCE   : MaxTol   = 0.002169065527  ( 0.004310633963 )  AvgTol   =  0.0001558899524  (  0.0002499195251 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/N3 b/tests/de/step_1/N3
index 09333ccae8..7445478419 100644
--- a/tests/de/step_1/N3
+++ b/tests/de/step_1/N3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 25  ( 27 )  Summary  = 25  ( 27 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 5  ( 5 )  Face     = 87  ( 87 )   Summary  = 536  ( 536 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 5  ( 5 )  Face     = 87  ( 87 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 220  ( 220 )
-TOLERANCE   : MaxTol   = 0.001356543019  ( 0.001356543019 )  AvgTol   =  0.000207749345  (  0.0001980041425 )
+TOLERANCE   : MaxTol   = 0.001640491495  (   0.0154023028 )  AvgTol   =  0.0003285396147  (  0.001132378182 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 8  ( 8 )  N2Labels = 0  ( 0 )   TotalLabels = 11  ( 11 )   NameLabels = 5  ( 5 )   ColorLabels = 7  ( 7 )   LayerLabels = 5  ( 5 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/N4 b/tests/de/step_1/N4
index 468ffe7f4f..91dbb5f5f5 100644
--- a/tests/de/step_1/N4
+++ b/tests/de/step_1/N4
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename bm4_id_eye_a.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 5 )  Summary  = 8  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   Summary  = 422  ( 422 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 175  ( 175 )
-TOLERANCE   : MaxTol   = 0.003734968074  ( 0.003734968077 )  AvgTol   =  0.0003473000281  (  0.000347321758 )
+TOLERANCE   : MaxTol   = 0.003734968074  ( 0.009941326565 )  AvgTol   =  0.0003603377154  (  0.0006897182502 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 116  ( 116 )  N2Labels = 0  ( 0 )   TotalLabels = 117  ( 117 )   NameLabels = 1  ( 1 )   ColorLabels = 117  ( 117 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/N5 b/tests/de/step_1/N5
index cd6f7054fd..53bd00430a 100644
--- a/tests/de/step_1/N5
+++ b/tests/de/step_1/N5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename bm4_id_eye_b.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 5 )  Summary  = 6  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   Summary  = 422  ( 422 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 175  ( 175 )
-TOLERANCE   : MaxTol   = 0.003734968074  ( 0.003734968077 )  AvgTol   =  0.0003472405838  (  0.0003472786949 )
+TOLERANCE   : MaxTol   = 0.003734968074  ( 0.008476378102 )  AvgTol   =  0.0003702712832  (  0.0009328150641 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 116  ( 116 )  N2Labels = 0  ( 0 )   TotalLabels = 117  ( 117 )   NameLabels = 1  ( 1 )   ColorLabels = 117  ( 117 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/N6 b/tests/de/step_1/N6
index 7835734741..635bce1d1e 100644
--- a/tests/de/step_1/N6
+++ b/tests/de/step_1/N6
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 13 )  Summary  = 9  ( 13 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 5  ( 5 )  Shell    = 6  ( 6 )  Face     = 186  ( 186 )   Summary  = 1310  ( 1291 )
 STATSHAPE   : Solid    = 5  ( 5 )  Shell    = 6  ( 6 )  Face     = 186  ( 186 )   FreeWire = 0  ( 0 )   FreeEdge  = 6 ( 6 )   SharedEdge = 524  ( 524 )
-TOLERANCE   : MaxTol   = 0.007713500664  ( 0.007713500658 )  AvgTol   =  0.0007192934915  (  0.0007194804808 )
+TOLERANCE   : MaxTol   = 0.007713500664  (  0.00997839292 )  AvgTol   =  0.0007516875718  (  0.001114041492 )
 LABELS      : N0Labels = 7  ( 7 )  N1Labels = 10  ( 6 )  N2Labels = 0  ( 0 )   TotalLabels = 17  ( 13 )   NameLabels = 13  ( 13 )   ColorLabels = 6  ( 4 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/N7 b/tests/de/step_1/N7
index 75dd8e9e99..5009e6969e 100644
--- a/tests/de/step_1/N7
+++ b/tests/de/step_1/N7
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 13  ( 0 )  Summary  = 13  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 182  ( 182 )   Summary  = 1237  ( 1237 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 182  ( 182 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 500  ( 500 )
-TOLERANCE   : MaxTol   = 0.0006834695356  ( 0.0006834695356 )  AvgTol   =  1.670011327e-005  (  1.670011329e-005 )
+TOLERANCE   : MaxTol   = 0.009731472373  (  0.01295381237 )  AvgTol   =  0.0003805396289  (  0.0007344871275 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 37  ( 37 )  N2Labels = 0  ( 0 )   TotalLabels = 42  ( 42 )   NameLabels = 9  ( 9 )   ColorLabels = 4  ( 4 )   LayerLabels = 33  ( 33 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/N8 b/tests/de/step_1/N8
index f1f2e123c0..9d9ba73701 100644
--- a/tests/de/step_1/N8
+++ b/tests/de/step_1/N8
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 14 )  Summary  = 4  ( 14 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 36  ( 36 )  Face     = 186  ( 186 )   Summary  = 1404  ( 1404 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 36  ( 36 )  Face     = 186  ( 186 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 548  ( 548 )
-TOLERANCE   : MaxTol   =  0.00767687178  ( 0.007676871778 )  AvgTol   =  0.0001470156168  (  0.0001476665188 )
+TOLERANCE   : MaxTol   = 0.007676795012  (  0.01770527621 )  AvgTol   =  0.0001484880722  (  0.0002069115043 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 37  ( 37 )  N2Labels = 0  ( 0 )   TotalLabels = 42  ( 42 )   NameLabels = 9  ( 9 )   ColorLabels = 36  ( 36 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/O4 b/tests/de/step_1/O4
index 96dde435bd..719d52e4a8 100644
--- a/tests/de/step_1/O4
+++ b/tests/de/step_1/O4
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 19  ( 5 )  Summary  = 19  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 40  ( 40 )  Face     = 40  ( 40 )   Summary  = 547  ( 527 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 40  ( 40 )  Face     = 40  ( 40 )   FreeWire = 0  ( 0 )   FreeEdge  = 20 ( 20 )   SharedEdge = 196  ( 196 )
-TOLERANCE   : MaxTol   =  0.02294330394  (  0.02294330394 )  AvgTol   =  0.001135014538  (    0.0011345786 )
+TOLERANCE   : MaxTol   =  0.02294330394  (  0.02748335355 )  AvgTol   =   0.00118366439  (  0.001785361613 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 84  ( 84 )  N2Labels = 0  ( 0 )   TotalLabels = 87  ( 87 )   NameLabels = 5  ( 5 )   ColorLabels = 82  ( 82 )   LayerLabels = 60  ( 60 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/Q4 b/tests/de/step_1/Q4
index 1ec5275f90..e95a6f4f85 100644
--- a/tests/de/step_1/Q4
+++ b/tests/de/step_1/Q4
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename id_turbine-A.stp
@@ -8,9 +7,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 21  ( 16 )  Summary  = 21  ( 16 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 49  ( 49 )   Summary  = 291  ( 290 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 49  ( 49 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 120  ( 119 )
-TOLERANCE   : MaxTol   = 0.003591433268  ( 0.003591433268 )  AvgTol   =  0.0004763290463  (  0.0004798376538 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 49  ( 49 )   Summary  = 290  ( 290 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 49  ( 49 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 119  ( 119 )
+TOLERANCE   : MaxTol   = 0.003591433268  ( 0.006109109885 )  AvgTol   =  0.0004792377666  (  0.0008287050108 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 87  ( 87 )  N2Labels = 0  ( 0 )   TotalLabels = 90  ( 90 )   NameLabels = 5  ( 5 )   ColorLabels = 86  ( 86 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_1/Q5 b/tests/de/step_1/Q5
index e6af402f2f..125798d08b 100644
--- a/tests/de/step_1/Q5
+++ b/tests/de/step_1/Q5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename id_turbine-B.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 11  ( 8 )  Summary  = 11  ( 8 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 49  ( 49 )   Summary  = 290  ( 290 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 49  ( 49 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 119  ( 119 )
-TOLERANCE   : MaxTol   = 0.003591433268  ( 0.003591433268 )  AvgTol   =  0.0004743087035  (   0.00047548976 )
+TOLERANCE   : MaxTol   = 0.003591433268  ( 0.006109109885 )  AvgTol   =  0.000572321951  (  0.001285201537 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 87  ( 87 )  N2Labels = 0  ( 0 )   TotalLabels = 90  ( 90 )   NameLabels = 5  ( 5 )   ColorLabels = 86  ( 86 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_1/Q6 b/tests/de/step_1/Q6
index 7f9709d553..d2fe5ed106 100644
--- a/tests/de/step_1/Q6
+++ b/tests/de/step_1/Q6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename ie_exhaust-A.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 23  ( 16 )  Summary  = 23  ( 16 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 64  ( 64 )   Summary  = 378  ( 378 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 64  ( 64 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 150  ( 150 )
-TOLERANCE   : MaxTol   = 0.0002089967319  ( 0.0002089967128 )  AvgTol   =  2.456943731e-005  (  2.456943149e-005 )
+TOLERANCE   : MaxTol   =  0.01644435227  (  0.01670778143 )  AvgTol   =  0.0005702798849  (  0.0005790244062 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/Q7 b/tests/de/step_1/Q7
index a657543177..cc623a790d 100644
--- a/tests/de/step_1/Q7
+++ b/tests/de/step_1/Q7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 16  ( 16 )  Summary  = 16  ( 16 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 64  ( 64 )   Summary  = 378  ( 378 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 64  ( 64 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 150  ( 150 )
-TOLERANCE   : MaxTol   =  0.01522146251  (  0.01522146254 )  AvgTol   =  0.001034800881  (  0.001034800878 )
+TOLERANCE   : MaxTol   =  0.01574193348  (  0.01692301518 )  AvgTol   =  0.001069439088  (  0.002489134762 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/Q8 b/tests/de/step_1/Q8
index 4362ffbb02..0c5c3df531 100644
--- a/tests/de/step_1/Q8
+++ b/tests/de/step_1/Q8
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 22  ( 22 )  Summary  = 22  ( 22 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 64  ( 64 )   Summary  = 378  ( 378 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 64  ( 64 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 150  ( 150 )
-TOLERANCE   : MaxTol   =  0.01522146251  (  0.01522146254 )  AvgTol   =  0.001034805072  (  0.001034806062 )
+TOLERANCE   : MaxTol   =  0.01574193348  (  0.01692301518 )  AvgTol   =  0.001069359917  (  0.002489057452 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/R3 b/tests/de/step_1/R3
index bb3969d1c4..a4c7363353 100644
--- a/tests/de/step_1/R3
+++ b/tests/de/step_1/R3
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 10  ( 4 )  Summary  = 10  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   Summary  = 338  ( 338 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 144  ( 144 )
-TOLERANCE   : MaxTol   =  0.03986265272  (   0.1567489095 )  AvgTol   =   0.01333022874  (   0.02937515411 )
+TOLERANCE   : MaxTol   =  0.03986265272  (   0.1567489095 )  AvgTol   =   0.01346429968  (   0.02937515411 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/R7 b/tests/de/step_1/R7
index bc41b40e90..ed847eba12 100644
--- a/tests/de/step_1/R7
+++ b/tests/de/step_1/R7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 10  ( 10 )  Face     = 10  ( 10 )   Summary  = 125  ( 123 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 10  ( 10 )  Face     = 10  ( 10 )   FreeWire = 0  ( 0 )   FreeEdge  = 2 ( 2 )   SharedEdge = 44  ( 44 )
-TOLERANCE   : MaxTol   = 8.886924154e-005  ( 8.886893947e-005 )  AvgTol   =  2.639044129e-005  (  2.639042883e-005 )
+TOLERANCE   : MaxTol   =    0.018462436  (  0.04645590147 )  AvgTol   =  0.001814589324  (  0.007120077124 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 4  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 7  ( 7 )   NameLabels = 5  ( 5 )   ColorLabels = 2  ( 2 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/U8 b/tests/de/step_1/U8
index b406e1850a..c4ae87f60b 100644
--- a/tests/de/step_1/U8
+++ b/tests/de/step_1/U8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename trj3_s1-ct-203.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 20  ( 18 )  Summary  = 20  ( 18 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 8  ( 8 )  Shell    = 8  ( 8 )  Face     = 132  ( 132 )   Summary  = 801  ( 801 )
 STATSHAPE   : Solid    = 11  ( 11 )  Shell    = 11  ( 11 )  Face     = 178  ( 178 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 316  ( 316 )
-TOLERANCE   : MaxTol   =  0.06901335768  (  0.06901335768 )  AvgTol   =  0.0007935779827  (  0.0007709981004 )
+TOLERANCE   : MaxTol   =  0.06901335768  (  0.07236095994 )  AvgTol   =  0.0008239378267  (  0.0008694243708 )
 LABELS      : N0Labels = 13  ( 13 )  N1Labels = 21  ( 21 )  N2Labels = 0  ( 0 )   TotalLabels = 34  ( 34 )   NameLabels = 27  ( 27 )   ColorLabels = 15  ( 15 )   LayerLabels = 8  ( 8 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/U9 b/tests/de/step_1/U9
index 023e62fc05..b5563c4ed8 100644
--- a/tests/de/step_1/U9
+++ b/tests/de/step_1/U9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename trj3_s1-ct-214.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 20  ( 18 )  Summary  = 20  ( 18 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 8  ( 8 )  Shell    = 8  ( 8 )  Face     = 132  ( 132 )   Summary  = 801  ( 801 )
 STATSHAPE   : Solid    = 11  ( 11 )  Shell    = 11  ( 11 )  Face     = 178  ( 178 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 316  ( 316 )
-TOLERANCE   : MaxTol   =  0.06901335768  (  0.06901335768 )  AvgTol   =  0.0007935779827  (  0.0007709981004 )
+TOLERANCE   : MaxTol   =  0.06901335768  (  0.07236095994 )  AvgTol   =  0.0008239378267  (  0.0008694243708 )
 LABELS      : N0Labels = 13  ( 13 )  N1Labels = 21  ( 21 )  N2Labels = 0  ( 0 )   TotalLabels = 34  ( 34 )   NameLabels = 27  ( 27 )   ColorLabels = 15  ( 15 )   LayerLabels = 8  ( 8 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/V7 b/tests/de/step_1/V7
index c87da904ba..9cb59b6e45 100644
--- a/tests/de/step_1/V7
+++ b/tests/de/step_1/V7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 1 )  Summary  = 1  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 58  ( 58 )  Face     = 58  ( 58 )   Summary  = 771  ( 425 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 58  ( 58 )  Face     = 58  ( 58 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 296  ( 149 )
-TOLERANCE   : MaxTol   = 0.0008167207419  ( 0.000816761578 )  AvgTol   =  5.463653039e-005  (  0.0001042055786 )
+TOLERANCE   : MaxTol   = 0.0008167207419  ( 0.0009782609385 )  AvgTol   =  5.463653037e-005  (  0.000108302814 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/V9 b/tests/de/step_1/V9
index f7ce5f3eb2..0d522c05f9 100644
--- a/tests/de/step_1/V9
+++ b/tests/de/step_1/V9
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   Summary  = 336  ( 336 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 138  ( 138 )
-TOLERANCE   : MaxTol   = 0.005901949404  ( 0.005901949404 )  AvgTol   =  0.0002996481304  (  0.0002996481595 )
+TOLERANCE   : MaxTol   = 0.005901949404  ( 0.008046615145 )  AvgTol   =  0.0002996481595  (  0.0008772134802 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/X1 b/tests/de/step_1/X1
index 85f32318bd..afb74d04a4 100644
--- a/tests/de/step_1/X1
+++ b/tests/de/step_1/X1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 1 )  Summary  = 1  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 58  ( 58 )  Face     = 58  ( 58 )   Summary  = 837  ( 475 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 58  ( 58 )  Face     = 58  ( 58 )   FreeWire = 0  ( 16 )   FreeEdge  = 16 ( 16 )   SharedEdge = 312  ( 165 )
-TOLERANCE   : MaxTol   = 0.0008167207419  ( 0.000816761578 )  AvgTol   =  5.200297581e-005  (  9.917834779e-005 )
+TOLERANCE   : MaxTol   = 0.0008167207419  ( 0.0009782609385 )  AvgTol   =  5.20029758e-005  (  0.0001030777287 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/X2 b/tests/de/step_1/X2
index 440075533b..7758e6b3fd 100644
--- a/tests/de/step_1/X2
+++ b/tests/de/step_1/X2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename trj5_k1-ec-214.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 12  ( 0 )  Summary  = 12  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 47  ( 47 )  Face     = 47  ( 47 )   Summary  = 614  ( 614 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 47  ( 47 )  Face     = 47  ( 47 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 240  ( 240 )
-TOLERANCE   : MaxTol   = 8.726098798e-006  ( 8.726098798e-006 )  AvgTol   =  5.150126454e-007  (  5.150126454e-007 )
+TOLERANCE   : MaxTol   = 0.0001716884488  ( 0.0009724780717 )  AvgTol   =  5.387053125e-006  (  7.074542139e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/Y6 b/tests/de/step_1/Y6
index 40b027841f..8ee0b48de4 100644
--- a/tests/de/step_1/Y6
+++ b/tests/de/step_1/Y6
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   Summary  = 336  ( 336 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 138  ( 138 )
-TOLERANCE   : MaxTol   = 0.005901949404  ( 0.005901949404 )  AvgTol   =  0.0002996481304  (  0.0002996481595 )
+TOLERANCE   : MaxTol   = 0.005901949404  ( 0.008046615145 )  AvgTol   =  0.0002996481595  (  0.0008772134802 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/Y7 b/tests/de/step_1/Y7
index 8b8c5d59ee..4ca8901957 100644
--- a/tests/de/step_1/Y7
+++ b/tests/de/step_1/Y7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   Summary  = 336  ( 336 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 138  ( 138 )
-TOLERANCE   : MaxTol   = 0.005901949404  ( 0.005901949404 )  AvgTol   =  0.0002996481304  (  0.0002996481595 )
+TOLERANCE   : MaxTol   = 0.005901949404  ( 0.008046615145 )  AvgTol   =  0.0002996481595  (  0.0008772134802 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/Z1 b/tests/de/step_1/Z1
index 5c151cacbd..c7111322f4 100644
--- a/tests/de/step_1/Z1
+++ b/tests/de/step_1/Z1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 2 )  Summary  = 2  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 70  ( 70 )   Summary  = 427  ( 427 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 70  ( 70 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 176  ( 176 )
-TOLERANCE   : MaxTol   = 0.006057322867  ( 0.006057322865 )  AvgTol   =  0.001024669403  (  0.0009677910598 )
+TOLERANCE   : MaxTol   = 0.006057322867  (  0.01790682739 )  AvgTol   =  0.0009755900047  (  0.002119269064 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/Z6 b/tests/de/step_1/Z6
index be9d9385ca..7b94bda28d 100644
--- a/tests/de/step_1/Z6
+++ b/tests/de/step_1/Z6
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   Summary  = 335  ( 335 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 138  ( 138 )
-TOLERANCE   : MaxTol   = 0.005901949404  ( 0.005901949404 )  AvgTol   =  0.0002996481304  (  0.0002996481595 )
+TOLERANCE   : MaxTol   = 0.005901949404  ( 0.008046615145 )  AvgTol   =  0.0002996481595  (  0.0008772134802 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/Z7 b/tests/de/step_1/Z7
index 0e15c4f63f..31ec0bee4e 100644
--- a/tests/de/step_1/Z7
+++ b/tests/de/step_1/Z7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   Summary  = 335  ( 335 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 138  ( 138 )
-TOLERANCE   : MaxTol   = 0.005901949404  ( 0.005901949404 )  AvgTol   =  0.0002996481304  (  0.0002996481595 )
+TOLERANCE   : MaxTol   = 0.005901949404  ( 0.008046615145 )  AvgTol   =  0.0002996481595  (  0.0008772134802 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/ZA3 b/tests/de/step_1/ZA3
index 9032e0c92f..7c3a1a1c47 100644
--- a/tests/de/step_1/ZA3
+++ b/tests/de/step_1/ZA3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   Summary  = 335  ( 335 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 52  ( 52 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 138  ( 138 )
-TOLERANCE   : MaxTol   = 0.005901949404  ( 0.005901949404 )  AvgTol   =  0.0002996481304  (  0.0002996481595 )
+TOLERANCE   : MaxTol   = 0.005901949404  ( 0.008046615145 )  AvgTol   =  0.0002996481595  (  0.0008772134802 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/ZA6 b/tests/de/step_1/ZA6
index e195e2d05f..cdb3fc600b 100644
--- a/tests/de/step_1/ZA6
+++ b/tests/de/step_1/ZA6
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 34 )  Summary  = 4  ( 34 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 216  ( 216 )   Summary  = 1421  ( 1421 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 216  ( 216 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 588  ( 588 )
-TOLERANCE   : MaxTol   = 0.007909701545  ( 0.007909701545 )  AvgTol   =  0.0006382364714  (  0.000639377615 )
+TOLERANCE   : MaxTol   = 0.007909701545  (  0.01677199988 )  AvgTol   =  0.0006487127928  (  0.0008020095458 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZA9 b/tests/de/step_1/ZA9
index 25fdb88455..11a7b61665 100644
--- a/tests/de/step_1/ZA9
+++ b/tests/de/step_1/ZA9
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 78  ( 78 )   Summary  = 456  ( 456 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 78  ( 78 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 191  ( 191 )
-TOLERANCE   : MaxTol   = 0.008856670537  ( 0.008856670537 )  AvgTol   =  0.001433109436  (  0.001433109436 )
+TOLERANCE   : MaxTol   =  0.03540333048  (  0.03540333048 )  AvgTol   =   0.01419078581  (   0.01419078581 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZB1 b/tests/de/step_1/ZB1
index f935d76365..1665f6f9a6 100644
--- a/tests/de/step_1/ZB1
+++ b/tests/de/step_1/ZB1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 78  ( 78 )   Summary  = 456  ( 456 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 78  ( 78 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 191  ( 191 )
-TOLERANCE   : MaxTol   = 0.0007738160419  ( 0.0007738160417 )  AvgTol   =  0.0001517257683  (  0.0001517257683 )
+TOLERANCE   : MaxTol   = 0.0008779939056  ( 0.002970920499 )  AvgTol   =  0.0002392657978  (  0.0003764865332 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZB2 b/tests/de/step_1/ZB2
index b32b9e6177..37a0f5df99 100644
--- a/tests/de/step_1/ZB2
+++ b/tests/de/step_1/ZB2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename boot.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 3  ( 1 )  Summary  = 3  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 54  ( 54 )   Summary  = 346  ( 346 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 54  ( 54 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 143  ( 143 )
-TOLERANCE   : MaxTol   = 0.0007675518072  ( 0.0007675518122 )  AvgTol   =  4.47813254e-005  (  4.493329741e-005 )
+TOLERANCE   : MaxTol   = 0.0007675518072  (  0.07502548071 )  AvgTol   =  4.478132068e-005  (  0.006388828005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZB3 b/tests/de/step_1/ZB3
index e90468d9c4..07ba27468e 100644
--- a/tests/de/step_1/ZB3
+++ b/tests/de/step_1/ZB3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 34 )  Summary  = 0  ( 34 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 216  ( 216 )   Summary  = 1421  ( 1421 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 216  ( 216 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 588  ( 588 )
-TOLERANCE   : MaxTol   = 0.0007520801154  (  0.04372745817 )  AvgTol   =  7.021641527e-005  (  0.0008818813065 )
+TOLERANCE   : MaxTol   = 0.0009115635861  (  0.04372745817 )  AvgTol   =  9.848185929e-005  (  0.0009099184092 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZB4 b/tests/de/step_1/ZB4
index 94940c26be..ad5dbb27dd 100644
--- a/tests/de/step_1/ZB4
+++ b/tests/de/step_1/ZB4
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 34 )  Summary  = 4  ( 34 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 216  ( 216 )   Summary  = 1421  ( 1421 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 216  ( 216 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 588  ( 588 )
-TOLERANCE   : MaxTol   = 0.007909701545  ( 0.007909701545 )  AvgTol   =  0.0006382364714  (  0.000639377615 )
+TOLERANCE   : MaxTol   = 0.007909701545  (  0.01677199988 )  AvgTol   =  0.0006487127928  (  0.0008020095458 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZB5 b/tests/de/step_1/ZB5
index cd06842dc0..89c3c0233c 100644
--- a/tests/de/step_1/ZB5
+++ b/tests/de/step_1/ZB5
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 34 )  Summary  = 0  ( 34 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 216  ( 216 )   Summary  = 1421  ( 1421 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 216  ( 216 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 588  ( 588 )
-TOLERANCE   : MaxTol   = 0.0007520801154  (  0.04372745817 )  AvgTol   =  7.021641527e-005  (  0.0008818813065 )
+TOLERANCE   : MaxTol   = 0.0009115635861  (  0.04372745817 )  AvgTol   =  9.848185929e-005  (  0.0009099184092 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZB7 b/tests/de/step_1/ZB7
index b55fc39d0d..e0e9fc961a 100644
--- a/tests/de/step_1/ZB7
+++ b/tests/de/step_1/ZB7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename ug_soapbox-A.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 3 )  Summary  = 8  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 94  ( 94 )   Summary  = 570  ( 570 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 94  ( 94 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 232  ( 232 )
-TOLERANCE   : MaxTol   = 0.008977613887  ( 0.008977613885 )  AvgTol   =  0.001750900293  (  0.001751252138 )
+TOLERANCE   : MaxTol   = 0.008981237811  (  0.03359184316 )  AvgTol   =  0.001989925701  (   0.00429652078 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZC3 b/tests/de/step_1/ZC3
index 1fe59ab2b5..a5e6ea93b6 100644
--- a/tests/de/step_1/ZC3
+++ b/tests/de/step_1/ZC3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename bm2_db_leverrod-B.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 4 )  Summary  = 9  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 74  ( 74 )   Summary  = 470  ( 470 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 74  ( 74 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 192  ( 192 )
-TOLERANCE   : MaxTol   = 0.005871972782  (  0.01255650011 )  AvgTol   =  0.0001239325156  (  0.0002329775002 )
+TOLERANCE   : MaxTol   = 0.005871972782  (  0.01255650011 )  AvgTol   =  0.0001289836811  (  0.0004682686404 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZC4 b/tests/de/step_1/ZC4
index 3ee75abf9e..fc616e9dd2 100644
--- a/tests/de/step_1/ZC4
+++ b/tests/de/step_1/ZC4
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename bm2_db_leverrod-C.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 5  ( 1 )  Summary  = 5  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 74  ( 74 )   Summary  = 470  ( 470 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 74  ( 74 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 192  ( 192 )
-TOLERANCE   : MaxTol   = 0.005871972782  (  0.01255650011 )  AvgTol   =  0.0001240972664  (  0.0002331433892 )
+TOLERANCE   : MaxTol   = 0.005871972782  (  0.01255650011 )  AvgTol   =  0.0001291774461  (  0.0004684624026 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZI7 b/tests/de/step_1/ZI7
index e172571ab9..131ad3924e 100644
--- a/tests/de/step_1/ZI7
+++ b/tests/de/step_1/ZI7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename PRO9245.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 2 )  Summary  = 4  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 12  ( 12 )  Face     = 12  ( 12 )   Summary  = 136  ( 136 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 12  ( 12 )  Face     = 12  ( 12 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 49  ( 49 )
-TOLERANCE   : MaxTol   = 0.0009846163783  ( 0.0009846163783 )  AvgTol   =  7.79898348e-005  (  7.798983564e-005 )
+TOLERANCE   : MaxTol   = 0.0009846163783  (  0.09817574823 )  AvgTol   =  7.811513437e-005  (  0.005635227301 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/ZJ9 b/tests/de/step_1/ZJ9
index 1bfb41d240..7c066a846c 100644
--- a/tests/de/step_1/ZJ9
+++ b/tests/de/step_1/ZJ9
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 68  ( 68 )   Summary  = 430  ( 430 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 68  ( 68 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 175  ( 175 )
-TOLERANCE   : MaxTol   = 5.222214856e-007  ( 5.222214871e-007 )  AvgTol   =  1.105810875e-007  (  1.105810876e-007 )
+TOLERANCE   : MaxTol   = 5.222214856e-007  ( 0.0002490151482 )  AvgTol   =  1.105810875e-007  (  6.344591722e-006 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/ZK5 b/tests/de/step_1/ZK5
index 83b352134a..79d8beeffd 100644
--- a/tests/de/step_1/ZK5
+++ b/tests/de/step_1/ZK5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename bm2_ie_lever-A.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 0 )  Summary  = 1  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 333  ( 333 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 135  ( 135 )
-TOLERANCE   : MaxTol   = 2.885132887e-007  ( 2.885128872e-007 )  AvgTol   =  1.013219976e-007  (  1.013219948e-007 )
+TOLERANCE   : MaxTol   = 2.885132887e-007  ( 0.001459932907 )  AvgTol   =  1.013219976e-007  (  5.528247406e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/ZK7 b/tests/de/step_1/ZK7
index 37a265dc09..860a34f148 100644
--- a/tests/de/step_1/ZK7
+++ b/tests/de/step_1/ZK7
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 0 )  Summary  = 4  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 335  ( 335 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 136  ( 136 )
-TOLERANCE   : MaxTol   = 0.000304966156  ( 0.0003049661559 )  AvgTol   =  4.319608909e-006  (  4.319608909e-006 )
+TOLERANCE   : MaxTol   = 0.000304966156  ( 0.001459917492 )  AvgTol   =  4.319608909e-006  (  5.49000906e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/ZM3 b/tests/de/step_1/ZM3
index cf8a5bade6..30cf214a3c 100644
--- a/tests/de/step_1/ZM3
+++ b/tests/de/step_1/ZM3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 15  ( 15 )   Summary  = 88  ( 88 )
 STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 15  ( 15 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 32  ( 32 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000042329e-007  (  1.000042329e-007 )
+TOLERANCE   : MaxTol   = 0.0003426289767  ( 0.0003426285624 )  AvgTol   =  7.259288845e-005  (  7.259282167e-005 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 4  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 9  ( 9 )   NameLabels = 9  ( 9 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/ZM8 b/tests/de/step_1/ZM8
index 03b6b1f261..2f4c97fe34 100644
--- a/tests/de/step_1/ZM8
+++ b/tests/de/step_1/ZM8
@@ -9,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 7  ( 8 )  Summary  = 7  ( 8 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 13  ( 13 )   Summary  = 80  ( 80 )
 STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 13  ( 13 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 30  ( 30 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+ TOLERANCE   : MaxTol   = 0.008922501024  (  0.03514950194 )  AvgTol   =  0.000950414902  (  0.004694138186 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 4  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 1  ( 1 )   ColorLabels = 4  ( 4 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/step_1/ZY5 b/tests/de/step_1/ZY5
index 93cc579d67..5d34ca4b69 100644
--- a/tests/de/step_1/ZY5
+++ b/tests/de/step_1/ZY5
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 5 )  Summary  = 0  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 50  ( 50 )   Summary  = 328  ( 328 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 50  ( 50 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 133  ( 133 )
-TOLERANCE   : MaxTol   = 4.305225726e-007  (         1e-005 )  AvgTol   =  1.039061036e-007  (  8.713065481e-007 )
+TOLERANCE   : MaxTol   = 4.305225726e-007  ( 0.0001910564609 )  AvgTol   =  1.039061036e-007  (  7.176472402e-006 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/A6 b/tests/de/step_2/A6
index a4c14afa99..5c84c98b1f 100644
--- a/tests/de/step_2/A6
+++ b/tests/de/step_2/A6
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 84 )  Warnings = 0  ( 0 )  Summary  = 0  ( 84 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 85 )  Summary  = 4  ( 85 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 34  ( 34 )  Shell    = 34  ( 34 )  Face     = 254  ( 254 )   Summary  = 1470  ( 1508 )
-STATSHAPE   : Solid    = 34  ( 34 )  Shell    = 34  ( 34 )  Face     = 254  ( 254 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 539  ( 577 )
-TOLERANCE   : MaxTol   =    4.686868233  (    4.686868233 )  AvgTol   =   0.06006921055  (   0.05835476027 )
+NBSHAPES    : Solid    = 34  ( 34 )  Shell    = 34  ( 34 )  Face     = 254  ( 254 )   Summary  = 1477  ( 1508 )
+STATSHAPE   : Solid    = 34  ( 34 )  Shell    = 34  ( 34 )  Face     = 254  ( 254 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 546  ( 577 )
+TOLERANCE   : MaxTol   =    4.686868233  (    4.686868233 )  AvgTol   =   0.06081724539  (   0.05855797358 )
 LABELS      : N0Labels = 42  ( 42 )  N1Labels = 41  ( 41 )  N2Labels = 0  ( 0 )   TotalLabels = 83  ( 83 )   NameLabels = 83  ( 83 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/A9 b/tests/de/step_2/A9
index 1d34f546f5..4149fe7559 100644
--- a/tests/de/step_2/A9
+++ b/tests/de/step_2/A9
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 83  ( 34 )  Summary  = 83  ( 34 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 619  ( 76 )  Face     = 619  ( 619 )   Summary  = 8060  ( 7347 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 619  ( 76 )  Face     = 619  ( 619 )   FreeWire = 0  ( 0 )   FreeEdge  = 213 ( 213 )   SharedEdge = 2941  ( 2941 )
-TOLERANCE   : MaxTol   =  0.08237032966  (  0.08237032966 )  AvgTol   =  0.0003456724841  (  0.0003583335721 )
+TOLERANCE   : MaxTol   =  0.08237032966  (  0.09298535539 )  AvgTol   =  0.0004419215919  (  0.001445750058 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 9  ( 9 )  N2Labels = 0  ( 0 )   TotalLabels = 14  ( 14 )   NameLabels = 14  ( 14 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/B1 b/tests/de/step_2/B1
index 38a1b5bf2a..3407f0ceb9 100644
--- a/tests/de/step_2/B1
+++ b/tests/de/step_2/B1
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 17  ( 8 )  Summary  = 17  ( 8 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 141  ( 10 )  Face     = 141  ( 141 )   Summary  = 3556  ( 2958 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 141  ( 10 )  Face     = 141  ( 141 )   FreeWire = 0  ( 0 )   FreeEdge  = 468 ( 468 )   SharedEdge = 1106  ( 1106 )
-TOLERANCE   : MaxTol   =  0.02617992696  (  0.02617992696 )  AvgTol   =  4.946260842e-005  (  4.961565591e-005 )
+TOLERANCE   : MaxTol   =  0.02617992696  (  0.08193326774 )  AvgTol   =  4.94626084e-005  (  0.0004226568167 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/B2 b/tests/de/step_2/B2
index 2444aa8226..23bf5b8b49 100644
--- a/tests/de/step_2/B2
+++ b/tests/de/step_2/B2
@@ -9,9 +9,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 52  ( 22 )  Summary  = 52  ( 22 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 308  ( 308 )   Summary  = 2025  ( 2024 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 308  ( 308 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 851  ( 850 )
-TOLERANCE   : MaxTol   = 0.007289138208  ( 0.005806659935 )  AvgTol   =  0.0002349111304  (  0.0002264417103 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 308  ( 308 )   Summary  = 2024  ( 2024 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 308  ( 308 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 850  ( 850 )
+TOLERANCE   : MaxTol   =  0.00708774003  ( 0.005806659935 )  AvgTol   =  0.0003095425146  (  0.0005353262142 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/B3 b/tests/de/step_2/B3
index 3b0f00e534..ab31a8f775 100644
--- a/tests/de/step_2/B3
+++ b/tests/de/step_2/B3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 392  ( 384 )  Summary  = 392  ( 38
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 469  ( 0 )  Face     = 469  ( 469 )   Summary  = 5735  ( 5266 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 469  ( 0 )  Face     = 469  ( 469 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2160  ( 2160 )
-TOLERANCE   : MaxTol   = 0.003303397777  ( 0.003303824773 )  AvgTol   =  0.0002306033612  (  0.0002463792868 )
+TOLERANCE   : MaxTol   = 0.003303397777  ( 0.007504420009 )  AvgTol   =  0.0002306033612  (  0.0009643387762 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/B4 b/tests/de/step_2/B4
index 5a45dc8fee..ffb575af80 100644
--- a/tests/de/step_2/B4
+++ b/tests/de/step_2/B4
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 67 )  Summary  = 0  ( 67 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 696  ( 696 )   Summary  = 6794  ( 6252 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 696  ( 696 )   FreeWire = 0  ( 0 )   FreeEdge  = 541 ( 541 )   SharedEdge = 2479  ( 2479 )
-TOLERANCE   : MaxTol   =  0.03072519149  (   0.3955576531 )  AvgTol   =  0.0005067319118  (  0.001409502943 )
+TOLERANCE   : MaxTol   =  0.03072519149  (   0.3955576531 )  AvgTol   =  0.001220761433  (  0.003949950917 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 543  ( 548 )  N2Labels = 0  ( 0 )   TotalLabels = 546  ( 551 )   NameLabels = 5  ( 5 )   ColorLabels = 542  ( 394 )   LayerLabels = 542  ( 547 )
 PROPS       : Centroid = 2  ( 2 )  Volume   = 2  ( 2 )  Area     = 2  ( 2 )
 NCOLORS     : NColors  = 9  ( 9 )
diff --git a/tests/de/step_2/B6 b/tests/de/step_2/B6
index 8e9582e4ed..4544744581 100644
--- a/tests/de/step_2/B6
+++ b/tests/de/step_2/B6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 120  ( 100 )  Summary  = 120  ( 10
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 457  ( 457 )   Summary  = 2948  ( 2947 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 457  ( 457 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1203  ( 1203 )
-TOLERANCE   : MaxTol   = 0.005476437308  ( 0.005476492073 )  AvgTol   =  0.0003181744877  (  0.0003186393874 )
+TOLERANCE   : MaxTol   = 0.005476437308  ( 0.009836983218 )  AvgTol   =  0.0003494138018  (  0.0006808429815 )
 LABELS      : N0Labels = 6  ( 6 )  N1Labels = 5  ( 7 )  N2Labels = 0  ( 2 )   TotalLabels = 11  ( 15 )   NameLabels = 11  ( 11 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/B7 b/tests/de/step_2/B7
index 49d2bb9e72..f08a138fea 100644
--- a/tests/de/step_2/B7
+++ b/tests/de/step_2/B7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 
 
 set filename trj9_b2-id-214.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 47  ( 49 )  Summary  = 47  ( 49 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 231  ( 231 )   Summary  = 1450  ( 1449 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 231  ( 231 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 594  ( 594 )
-TOLERANCE   : MaxTol   =   0.0061882807  ( 0.006188280702 )  AvgTol   =  0.0004160092031  (  0.0004163610707 )
+TOLERANCE   : MaxTol   =   0.0061882807  ( 0.009178817508 )  AvgTol   =  0.0004704441275  (  0.0007231965608 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/B8 b/tests/de/step_2/B8
index d490856e34..8702acbf47 100644
--- a/tests/de/step_2/B8
+++ b/tests/de/step_2/B8
@@ -12,7 +12,7 @@ TPSTAT      : Faulties = 3  ( 0 )  Warnings = 10  ( 32 )  Summary  = 13  ( 32 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 25  ( 25 )  Shell    = 42  ( 45 )  Face     = 195  ( 198 )   Summary  = 1276  ( 1343 )
 STATSHAPE   : Solid    = 25  ( 25 )  Shell    = 42  ( 45 )  Face     = 195  ( 198 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 467  ( 496 )
-TOLERANCE   : MaxTol   =  0.01438603118  (   0.0293421074 )  AvgTol   =  0.0002702515297  (  0.001025315229 )
+TOLERANCE   : MaxTol   =  0.01438603118  (   0.0293421074 )  AvgTol   =  0.0002717522291  (  0.001390253412 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 61  ( 67 )  N2Labels = 0  ( 0 )   TotalLabels = 64  ( 70 )   NameLabels = 5  ( 5 )   ColorLabels = 42  ( 45 )   LayerLabels = 42  ( 45 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/B9 b/tests/de/step_2/B9
index 75d05ab44b..b0adf29e58 100644
--- a/tests/de/step_2/B9
+++ b/tests/de/step_2/B9
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 11  ( 11 )  Summary  = 11  ( 11 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 9  ( 2 )  Face     = 210  ( 210 )   Summary  = 1631  ( 1598 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 9  ( 2 )  Face     = 210  ( 210 )   FreeWire = 0  ( 0 )   FreeEdge  = 26 ( 26 )   SharedEdge = 677  ( 677 )
-TOLERANCE   : MaxTol   =  0.03020760843  (  0.03020760843 )  AvgTol   =  0.001590573826  (  0.001613562745 )
+TOLERANCE   : MaxTol   =   0.0377578426  (  0.09627168289 )  AvgTol   =  0.003150471765  (   0.01084852352 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 32  ( 32 )  N2Labels = 0  ( 0 )   TotalLabels = 36  ( 36 )   NameLabels = 7  ( 7 )   ColorLabels = 5  ( 5 )   LayerLabels = 26  ( 26 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/C6 b/tests/de/step_2/C6
index 999d684112..38758d871d 100644
--- a/tests/de/step_2/C6
+++ b/tests/de/step_2/C6
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 11  ( 11 )  Summary  = 11  ( 11 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 9  ( 2 )  Face     = 210  ( 210 )   Summary  = 1630  ( 1598 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 9  ( 2 )  Face     = 210  ( 210 )   FreeWire = 0  ( 0 )   FreeEdge  = 26 ( 26 )   SharedEdge = 677  ( 677 )
-TOLERANCE   : MaxTol   =  0.03020760843  (  0.03020760843 )  AvgTol   =  0.001600603957  (  0.001613562745 )
+TOLERANCE   : MaxTol   =  0.03020760843  (  0.09627168289 )  AvgTol   =   0.00257577559  (   0.01084852352 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 31  ( 31 )  N2Labels = 0  ( 0 )   TotalLabels = 32  ( 32 )   NameLabels = 1  ( 1 )   ColorLabels = 5  ( 5 )   LayerLabels = 26  ( 26 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/C9 b/tests/de/step_2/C9
index a340bc6b73..7fe759d5e7 100755
--- a/tests/de/step_2/C9
+++ b/tests/de/step_2/C9
@@ -12,7 +12,7 @@ TPSTAT      : Faulties = 5  ( 0 )  Warnings = 8  ( 2 )  Summary  = 13  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 54  ( 59 )  Face     = 54  ( 59 )   Summary  = 766  ( 889 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 54  ( 59 )  Face     = 54  ( 59 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 302  ( 356 )
-TOLERANCE   : MaxTol   =  0.01782737572  (  0.03722151184 )  AvgTol   =  0.001549641187  (  0.003291526808 )
+TOLERANCE   : MaxTol   =  0.01782737572  (  0.03722151184 )  AvgTol   =  0.002033692633  (  0.003517189961 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 108  ( 118 )  N2Labels = 0  ( 0 )   TotalLabels = 109  ( 119 )   NameLabels = 1  ( 1 )   ColorLabels = 54  ( 59 )   LayerLabels = 54  ( 59 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/D2 b/tests/de/step_2/D2
index a7bc3f8b55..547280faaf 100755
--- a/tests/de/step_2/D2
+++ b/tests/de/step_2/D2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 82 )  Summary  = 8  ( 82 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 18  ( 18 )  Shell    = 18  ( 18 )  Face     = 376  ( 376 )   Summary  = 2466  ( 2466 )
 STATSHAPE   : Solid    = 18  ( 18 )  Shell    = 18  ( 18 )  Face     = 376  ( 376 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 955  ( 955 )
-TOLERANCE   : MaxTol   = 0.005929066011  ( 0.005929066208 )  AvgTol   =  9.716404089e-05  (  9.861168642e-05 )
+TOLERANCE   : MaxTol   = 0.005929066011  (  0.01678547427 )  AvgTol   =  9.716431133e-005  (  0.0001556346626 )
 LABELS      : N0Labels = 20  ( 20 )  N1Labels = 19  ( 19 )  N2Labels = 0  ( 0 )   TotalLabels = 39  ( 39 )   NameLabels = 39  ( 39 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 20  ( 20 )  Volume   = 20  ( 20 )  Area     = 20  ( 20 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/D4 b/tests/de/step_2/D4
index 4f5b0bf3ad..703c0fe1e4 100644
--- a/tests/de/step_2/D4
+++ b/tests/de/step_2/D4
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 11  ( 11 )  Summary  = 11  ( 11 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 9  ( 2 )  Face     = 210  ( 210 )   Summary  = 1630  ( 1598 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 9  ( 2 )  Face     = 210  ( 210 )   FreeWire = 0  ( 0 )   FreeEdge  = 26 ( 26 )   SharedEdge = 677  ( 677 )
-TOLERANCE   : MaxTol   =  0.03020760843  (  0.03020760843 )  AvgTol   =  0.001600603957  (  0.001613562745 )
+TOLERANCE   : MaxTol   =  0.03020760843  (  0.09627168289 )  AvgTol   =   0.00257577559  (   0.01084852352 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 31  ( 31 )  N2Labels = 0  ( 0 )   TotalLabels = 32  ( 32 )   NameLabels = 1  ( 1 )   ColorLabels = 5  ( 5 )   LayerLabels = 26  ( 26 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/D6 b/tests/de/step_2/D6
index 028c31818c..69ddcecf74 100644
--- a/tests/de/step_2/D6
+++ b/tests/de/step_2/D6
@@ -12,7 +12,7 @@ TPSTAT      : Faulties = 5  ( 0 )  Warnings = 0  ( 0 )  Summary  = 5  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 59  ( 64 )  Face     = 59  ( 64 )   Summary  = 686  ( 759 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 59  ( 64 )  Face     = 59  ( 64 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 254  ( 283 )
-TOLERANCE   : MaxTol   =  0.01572432916  (  0.03822476581 )  AvgTol   =  0.001130934878  (  0.002347097209 )
+TOLERANCE   : MaxTol   =  0.01572432916  (  0.03822476581 )  AvgTol   =  0.001130934878  (  0.002480845829 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 118  ( 128 )  N2Labels = 0  ( 0 )   TotalLabels = 119  ( 129 )   NameLabels = 1  ( 1 )   ColorLabels = 59  ( 64 )   LayerLabels = 59  ( 64 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/D7 b/tests/de/step_2/D7
index 14be11d44b..ffb838930c 100644
--- a/tests/de/step_2/D7
+++ b/tests/de/step_2/D7
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 36  ( 77 )  Summary  = 36  ( 77 )
 CHECKSHAPE  : Wires    = 4  ( 4 )  Faces    = 4  ( 4 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 40  ( 3 )  Face     = 182  ( 182 )   Summary  = 1490  ( 1445 )
-STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 40  ( 3 )  Face     = 182  ( 182 )   FreeWire = 0  ( 0 )   FreeEdge  = 6 ( 6 )   SharedEdge = 587  ( 586 )
-TOLERANCE   : MaxTol   = 0.007713500664  ( 0.007713500658 )  AvgTol   =  0.0006864600464  (  0.0006853348978 )
+NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 40  ( 3 )  Face     = 182  ( 182 )   Summary  = 1489  ( 1445 )
+STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 40  ( 3 )  Face     = 182  ( 182 )   FreeWire = 0  ( 0 )   FreeEdge  = 6 ( 6 )   SharedEdge = 586  ( 586 )
+TOLERANCE   : MaxTol   = 0.007713500664  ( 0.009978407929 )  AvgTol   =  0.0007020642139  (  0.0008074713016 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 4  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 9  ( 9 )   NameLabels = 9  ( 9 )   ColorLabels = 3  ( 3 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/D8 b/tests/de/step_2/D8
index 890152c803..66c14431f4 100644
--- a/tests/de/step_2/D8
+++ b/tests/de/step_2/D8
@@ -9,9 +9,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 28  ( 69 )  Summary  = 28  ( 69 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 5  ( 5 )  Shell    = 42  ( 5 )  Face     = 186  ( 186 )   Summary  = 1540  ( 1483 )
-STATSHAPE   : Solid    = 5  ( 5 )  Shell    = 42  ( 5 )  Face     = 186  ( 186 )   FreeWire = 0  ( 0 )   FreeEdge  = 6 ( 6 )   SharedEdge = 603  ( 602 )
-TOLERANCE   : MaxTol   = 0.007713500664  ( 0.007713500658 )  AvgTol   =  0.0006669808353  (  0.0006683092632 )
+NBSHAPES    : Solid    = 5  ( 5 )  Shell    = 42  ( 5 )  Face     = 186  ( 186 )   Summary  = 1539  ( 1483 )
+STATSHAPE   : Solid    = 5  ( 5 )  Shell    = 42  ( 5 )  Face     = 186  ( 186 )   FreeWire = 0  ( 0 )   FreeEdge  = 6 ( 6 )   SharedEdge = 602  ( 602 )
+TOLERANCE   : MaxTol   = 0.007713500664  ( 0.009978407929 )  AvgTol   =  0.0006822328058  (  0.000967548793 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 8  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 13  ( 9 )   NameLabels = 9  ( 9 )   ColorLabels = 5  ( 3 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/E1 b/tests/de/step_2/E1
index c61a19e385..6e016b3788 100644
--- a/tests/de/step_2/E1
+++ b/tests/de/step_2/E1
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 7  ( 2 )  Summary  = 7  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 19  ( 1 )  Face     = 26  ( 26 )   Summary  = 1044  ( 852 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 19  ( 1 )  Face     = 26  ( 26 )   FreeWire = 0  ( 0 )   FreeEdge  = 177 ( 177 )   SharedEdge = 319  ( 319 )
-TOLERANCE   : MaxTol   =  0.03657395096  (   0.9781270945 )  AvgTol   =  0.001041638515  (   0.01501517834 )
+TOLERANCE   : MaxTol   =  0.03657395096  (   0.9781270945 )  AvgTol   =  0.001146170258  (    0.0151196088 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 196  ( 197 )  N2Labels = 0  ( 0 )   TotalLabels = 197  ( 198 )   NameLabels = 1  ( 1 )   ColorLabels = 19  ( 19 )   LayerLabels = 177  ( 178 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/E3 b/tests/de/step_2/E3
index 05de9203c0..75af709644 100644
--- a/tests/de/step_2/E3
+++ b/tests/de/step_2/E3
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 77  ( 181 )  Summary  = 77  ( 181
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 15  ( 15 )  Face     = 280  ( 280 )   Summary  = 2349  ( 2212 )
 STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 15  ( 15 )  Face     = 280  ( 280 )   FreeWire = 0  ( 1 )   FreeEdge  = 137 ( 137 )   SharedEdge = 889  ( 889 )
-TOLERANCE   : MaxTol   =  0.02408475069  (  0.02408475069 )  AvgTol   =  0.001635342641  (  0.001615101952 )
+TOLERANCE   : MaxTol   =  0.02408475069  (  0.03962502303 )  AvgTol   =  0.001658839781  (  0.001904420668 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 136  ( 215 )  N2Labels = 0  ( 0 )   TotalLabels = 140  ( 219 )   NameLabels = 7  ( 7 )   ColorLabels = 133  ( 133 )   LayerLabels = 133  ( 212 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/step_2/E5 b/tests/de/step_2/E5
index 5b577a779e..348d760d06 100644
--- a/tests/de/step_2/E5
+++ b/tests/de/step_2/E5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 36  ( 27 )  Summary  = 36  ( 27 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 7  ( 1 )  Face     = 200  ( 200 )   Summary  = 1529  ( 1523 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 7  ( 1 )  Face     = 200  ( 200 )   FreeWire = 0  ( 44 )   FreeEdge  = 44 ( 44 )   SharedEdge = 613  ( 613 )
-TOLERANCE   : MaxTol   =  0.02902527695  (  0.02902527731 )  AvgTol   =  0.0006105265613  (  0.0006099213322 )
+TOLERANCE   : MaxTol   =  0.02902527695  (  0.09790099556 )  AvgTol   =  0.002306346274  (    0.0102313292 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 7  ( 7 )   NameLabels = 7  ( 7 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/E7 b/tests/de/step_2/E7
index d49d04c70f..58e001ad59 100644
--- a/tests/de/step_2/E7
+++ b/tests/de/step_2/E7
@@ -9,10 +9,10 @@ set filename r76sy.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 1  ( 4 )  Warnings = 68  ( 103 )  Summary  = 69  ( 107 )
-CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 2  ( 0 )  Faces    = 2  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 23  ( 23 )  Shell    = 46  ( 47 )  Face     = 193  ( 194 )   Summary  = 1329  ( 1357 )
 STATSHAPE   : Solid    = 23  ( 23 )  Shell    = 46  ( 47 )  Face     = 193  ( 194 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 494  ( 504 )
-TOLERANCE   : MaxTol   =   0.0205434719  (   0.0293421419 )  AvgTol   =  0.0005051439412  (  0.001018331812 )
+TOLERANCE   : MaxTol   =   0.0205434719  (   0.0293421419 )  AvgTol   =  0.0005065999101  (   0.00138068504 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 67  ( 67 )  N2Labels = 0  ( 0 )   TotalLabels = 70  ( 70 )   NameLabels = 5  ( 5 )   ColorLabels = 46  ( 45 )   LayerLabels = 42  ( 45 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/F5 b/tests/de/step_2/F5
index 1ad9b8915a..85a64a37ec 100644
--- a/tests/de/step_2/F5
+++ b/tests/de/step_2/F5
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 113  ( 32 )  Summary  = 113  ( 32
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 117  ( 117 )  Face     = 117  ( 117 )   Summary  = 3604  ( 3191 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 117  ( 117 )  Face     = 117  ( 117 )   FreeWire = 0  ( 89 )   FreeEdge  = 502 ( 502 )   SharedEdge = 1120  ( 1120 )
-TOLERANCE   : MaxTol   =   0.1067914979  (   0.1067914979 )  AvgTol   =  0.003835344441  (  0.004035398796 )
+TOLERANCE   : MaxTol   =   0.1067914979  (   0.1067914979 )  AvgTol   =  0.003971306078  (  0.005635792771 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 7  ( 7 )   NameLabels = 7  ( 7 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/F8 b/tests/de/step_2/F8
index 657bbe1f11..f0f8941bbf 100644
--- a/tests/de/step_2/F8
+++ b/tests/de/step_2/F8
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 24  ( 27 )  Summary  = 24  ( 27 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 135  ( 135 )   Summary  = 1358  ( 1260 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 135  ( 135 )   FreeWire = 0  ( 4 )   FreeEdge  = 100 ( 100 )   SharedEdge = 464  ( 464 )
-TOLERANCE   : MaxTol   =  0.04505895972  (  0.04505895972 )  AvgTol   =  0.001379696439  (  0.001381897647 )
+TOLERANCE   : MaxTol   =  0.04505895972  (  0.09572273863 )  AvgTol   =  0.005281217499  (   0.01244848052 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 8  ( 8 )   NameLabels = 8  ( 8 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/F9 b/tests/de/step_2/F9
index 2318142629..04e186106b 100644
--- a/tests/de/step_2/F9
+++ b/tests/de/step_2/F9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename CC670-12608.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 35  ( 21 )  Summary  = 35  ( 21 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 126  ( 126 )   Summary  = 1309  ( 1222 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 126  ( 126 )   FreeWire = 0  ( 8 )   FreeEdge  = 94 ( 94 )   SharedEdge = 449  ( 449 )
-TOLERANCE   : MaxTol   =  0.02385233045  (  0.02385233045 )  AvgTol   =  0.0005034785375  (  0.0004891920813 )
+TOLERANCE   : MaxTol   =  0.02385233045  (  0.09640334764 )  AvgTol   =  0.002320875309  (   0.01039707001 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 8  ( 8 )   NameLabels = 8  ( 8 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/G1 b/tests/de/step_2/G1
index 870ae0e573..36249e6eb2 100644
--- a/tests/de/step_2/G1
+++ b/tests/de/step_2/G1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 16  ( 16 )  Summary  = 16  ( 16 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 102  ( 102 )   Summary  = 1024  ( 967 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 102  ( 102 )   FreeWire = 0  ( 8 )   FreeEdge  = 64 ( 64 )   SharedEdge = 356  ( 356 )
-TOLERANCE   : MaxTol   =  0.01157947103  (  0.01157947103 )  AvgTol   =  0.0004786577909  (  0.0004686105209 )
+TOLERANCE   : MaxTol   =  0.01775256793  (  0.09055851084 )  AvgTol   =   0.00206647858  (  0.006259859734 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 8  ( 8 )   NameLabels = 8  ( 8 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/G9 b/tests/de/step_2/G9
index 70fe1c6f12..39a1b45edc 100644
--- a/tests/de/step_2/G9
+++ b/tests/de/step_2/G9
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 2 )  Summary  = 2  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 36  ( 36 )  Face     = 36  ( 36 )   Summary  = 600  ( 600 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 36  ( 36 )  Face     = 36  ( 36 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 246  ( 246 )
-TOLERANCE   : MaxTol   =   0.0200634573  (   0.0230274088 )  AvgTol   =  0.001236953756  (     0.001729254 )
+TOLERANCE   : MaxTol   =   0.0200634573  (   0.0230274088 )  AvgTol   =  0.001342925364  (  0.002493523287 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 72  ( 72 )  N2Labels = 0  ( 0 )   TotalLabels = 73  ( 73 )   NameLabels = 1  ( 1 )   ColorLabels = 36  ( 36 )   LayerLabels = 36  ( 36 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/step_2/H1 b/tests/de/step_2/H1
index 5311ea9194..3a958fcac0 100644
--- a/tests/de/step_2/H1
+++ b/tests/de/step_2/H1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 18  ( 18 )  Summary  = 18  ( 18 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 66  ( 66 )   Summary  = 955  ( 833 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 66  ( 66 )   FreeWire = 0  ( 0 )   FreeEdge  = 122 ( 122 )   SharedEdge = 325  ( 325 )
-TOLERANCE   : MaxTol   =  0.05706634351  (  0.05706634351 )  AvgTol   =   0.01188180151  (   0.01188858328 )
+TOLERANCE   : MaxTol   =   0.1618955924  (   0.3526187023 )  AvgTol   =   0.03794615013  (   0.05391633347 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 124  ( 124 )  N2Labels = 0  ( 0 )   TotalLabels = 127  ( 127 )   NameLabels = 5  ( 5 )   ColorLabels = 123  ( 123 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 7  ( 7 )
diff --git a/tests/de/step_2/H6 b/tests/de/step_2/H6
index 17d08205b7..e55b7d7cee 100644
--- a/tests/de/step_2/H6
+++ b/tests/de/step_2/H6
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 16 )  Summary  = 6  ( 16 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 600  ( 600 )   Summary  = 4036  ( 4036 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 600  ( 600 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1713  ( 1713 )
-TOLERANCE   : MaxTol   =   0.2070257209  (   0.2070257209 )  AvgTol   =  0.001880246498  (  0.001880252808 )
+TOLERANCE   : MaxTol   =   0.2070257209  (   0.2070257209 )  AvgTol   =  0.003182074294  (  0.007107905924 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/H8 b/tests/de/step_2/H8
index 206bd1f91a..4a3a960523 100644
--- a/tests/de/step_2/H8
+++ b/tests/de/step_2/H8
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 55  ( 59 )  Summary  = 55  ( 59 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 219  ( 219 )   Summary  = 1685  ( 1626 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 219  ( 219 )   FreeWire = 0  ( 0 )   FreeEdge  = 58 ( 58 )   SharedEdge = 643  ( 643 )
-TOLERANCE   : MaxTol   = 0.004786272898  ( 0.004786272898 )  AvgTol   =  0.0003424021369  (  0.000342596968 )
+TOLERANCE   : MaxTol   = 0.004786272898  ( 0.009138362239 )  AvgTol   =  0.000424289509  (  0.0008489791221 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 192  ( 192 )  N2Labels = 0  ( 0 )   TotalLabels = 195  ( 195 )   NameLabels = 5  ( 5 )   ColorLabels = 191  ( 191 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_2/I4 b/tests/de/step_2/I4
index 2c3ddd02f4..229e758eb0 100644
--- a/tests/de/step_2/I4
+++ b/tests/de/step_2/I4
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 84  ( 84 )   Summary  = 477  ( 477 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 84  ( 84 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 188  ( 188 )
-TOLERANCE   : MaxTol   =  0.06142318886  (   0.4504518198 )  AvgTol   =  0.009910702137  (   0.04347575673 )
+TOLERANCE   : MaxTol   =  0.06142318886  (   0.4504518198 )  AvgTol   =   0.01076191057  (   0.04960239377 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/I5 b/tests/de/step_2/I5
index 072d9c9897..bf24d8840f 100644
--- a/tests/de/step_2/I5
+++ b/tests/de/step_2/I5
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 8  ( 8 )  Shell    = 8  ( 8 )  Face     = 112  ( 112 )   Summary  = 805  ( 805 )
 STATSHAPE   : Solid    = 8  ( 8 )  Shell    = 8  ( 8 )  Face     = 112  ( 112 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 324  ( 324 )
-TOLERANCE   : MaxTol   = 4.317703646e-007  ( 4.317703709e-007 )  AvgTol   =  1.120134652e-007  (  1.120162122e-007 )
+TOLERANCE   : MaxTol   = 0.0001990392016  ( 0.0005993176483 )  AvgTol   =  2.653422516e-005  (  8.791024979e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/I6 b/tests/de/step_2/I6
index 7a21439e5c..20eb9bd489 100644
--- a/tests/de/step_2/I6
+++ b/tests/de/step_2/I6
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 23  ( 21 )  Summary  = 23  ( 21 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 161  ( 161 )   Summary  = 867  ( 864 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 161  ( 161 )   FreeWire = 0  ( 0 )   FreeEdge  = 2 ( 2 )   SharedEdge = 339  ( 339 )
-TOLERANCE   : MaxTol   = 0.006107914079  ( 0.006107914082 )  AvgTol   =  0.001067484627  (  0.001064547307 )
+TOLERANCE   : MaxTol   = 0.006107914079  ( 0.008375853082 )  AvgTol   =  0.001105232411  (  0.001173158255 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/I7 b/tests/de/step_2/I7
index 9a43d3c862..2dc1fec03f 100644
--- a/tests/de/step_2/I7
+++ b/tests/de/step_2/I7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 2 )  Warnings = 22  ( 23 )  Summary  = 22  ( 25 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 159  ( 159 )   Summary  = 862  ( 859 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 159  ( 159 )   FreeWire = 0  ( 0 )   FreeEdge  = 2 ( 2 )   SharedEdge = 337  ( 337 )
-TOLERANCE   : MaxTol   = 0.006107853001  ( 0.006107914082 )  AvgTol   =  0.001083554481  (  0.001080597937 )
+TOLERANCE   : MaxTol   = 0.006107914079  ( 0.008375853082 )  AvgTol   =  0.001140158832  (  0.001241335964 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/I8 b/tests/de/step_2/I8
index 4b0545adc3..7f09b2c67f 100644
--- a/tests/de/step_2/I8
+++ b/tests/de/step_2/I8
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 62  ( 62 )   Summary  = 332  ( 332 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 62  ( 62 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 128  ( 128 )
-TOLERANCE   : MaxTol   =  0.00249989428  ( 0.002499894291 )  AvgTol   =  0.0003583352758  (  0.0003583352801 )
+TOLERANCE   : MaxTol   =  0.00249989428  ( 0.002631974883 )  AvgTol   =  0.0003639077926  (  0.0003724293085 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/J7 b/tests/de/step_2/J7
index c358538b17..a037f5b96a 100644
--- a/tests/de/step_2/J7
+++ b/tests/de/step_2/J7
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 63  ( 7 )  Summary  = 63  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 21  ( 21 )  Face     = 197  ( 197 )   Summary  = 1444  ( 1444 )
-STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 21  ( 21 )  Face     = 197  ( 197 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 574  ( 574 )
-TOLERANCE   : MaxTol   = 0.004833959886  ( 0.004833959886 )  AvgTol   =  0.0001264204893  (  0.0001264072525 )
+NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 21  ( 21 )  Face     = 197  ( 197 )   Summary  = 1444  ( 1443 )
+STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 21  ( 21 )  Face     = 197  ( 197 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 574  ( 573 )
+TOLERANCE   : MaxTol   = 0.004833959886  (  0.01857875727 )  AvgTol   =  0.0001319661036  (  0.0004088626406 )
 LABELS      : N0Labels = 6  ( 6 )  N1Labels = 45  ( 45 )  N2Labels = 0  ( 0 )   TotalLabels = 51  ( 51 )   NameLabels = 11  ( 11 )   ColorLabels = 41  ( 41 )   LayerLabels = 21  ( 21 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/step_2/K1 b/tests/de/step_2/K1
index 1632c96b63..6e5decc0a4 100644
--- a/tests/de/step_2/K1
+++ b/tests/de/step_2/K1
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename bm4_id_punch_a.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 24  ( 20 )  Summary  = 24  ( 20 )
 CHECKSHAPE  : Wires    = 4  ( 4 )  Faces    = 4  ( 4 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 182  ( 182 )   Summary  = 1260  ( 1253 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 182  ( 182 )   FreeWire = 0  ( 0 )   FreeEdge  = 6 ( 6 )   SharedEdge = 508  ( 508 )
-TOLERANCE   : MaxTol   = 0.007713500664  ( 0.007713500658 )  AvgTol   =  0.0007455576952  (  0.0007455867855 )
+TOLERANCE   : MaxTol   = 0.007713500664  (  0.00997839292 )  AvgTol   =  0.0007764946067  (  0.0009476325736 )
 LABELS      : N0Labels = 7  ( 7 )  N1Labels = 6  ( 6 )  N2Labels = 0  ( 0 )   TotalLabels = 13  ( 13 )   NameLabels = 13  ( 13 )   ColorLabels = 4  ( 4 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/K3 b/tests/de/step_2/K3
index b9ba34565a..bc3ba79a46 100644
--- a/tests/de/step_2/K3
+++ b/tests/de/step_2/K3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 38  ( 38 )  Summary  = 38  ( 38 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 48  ( 48 )   Summary  = 244  ( 244 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 48  ( 48 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 86  ( 86 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.000014184e-007  (  1.000014184e-007 )
+TOLERANCE   : MaxTol   =   1.00005e-007  ( 0.001600894468 )  AvgTol   =  1.000014184e-007  (  0.000181750437 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 44  ( 44 )  N2Labels = 0  ( 0 )   TotalLabels = 45  ( 45 )   NameLabels = 1  ( 1 )   ColorLabels = 45  ( 45 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/K6 b/tests/de/step_2/K6
index fc1194900c..e9aad2a0b1 100644
--- a/tests/de/step_2/K6
+++ b/tests/de/step_2/K6
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 5 )  Summary  = 2  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   Summary  = 414  ( 414 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 169  ( 169 )
-TOLERANCE   : MaxTol   = 3.740766812e-005  ( 3.74076681e-005 )  AvgTol   =  5.830058903e-006  (  5.839827963e-006 )
+TOLERANCE   : MaxTol   = 3.740766812e-005  ( 0.0007556487161 )  AvgTol   =  6.284473185e-006  (  5.687360867e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/K7 b/tests/de/step_2/K7
index ed65561e8e..afe3da6522 100644
--- a/tests/de/step_2/K7
+++ b/tests/de/step_2/K7
@@ -5,9 +5,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 5 )  Summary  = 2  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   Summary  = 415  ( 414 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 170  ( 169 )
-TOLERANCE   : MaxTol   = 3.740766812e-005  ( 3.74076681e-005 )  AvgTol   =  5.825606395e-006  (  5.841023103e-006 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   Summary  = 414  ( 414 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 169  ( 169 )
+TOLERANCE   : MaxTol   = 7.338458197e-005  ( 0.0007556109356 )  AvgTol   =  7.92475203e-006  (  5.850755016e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/K8 b/tests/de/step_2/K8
index 1b4fb52f5d..2b05fe42f9 100644
--- a/tests/de/step_2/K8
+++ b/tests/de/step_2/K8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename bm4_pe_punch_b.stp
@@ -8,9 +7,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 13  ( 0 )  Summary  = 13  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 182  ( 182 )   Summary  = 1239  ( 1237 )
-STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 182  ( 182 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 502  ( 500 )
-TOLERANCE   : MaxTol   = 0.0006834695394  ( 0.000683469539 )  AvgTol   =  1.66821616e-005  (  1.671509331e-005 )
+NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 182  ( 182 )   Summary  = 1237  ( 1237 )
+STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 182  ( 182 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 500  ( 500 )
+TOLERANCE   : MaxTol   = 0.009731472373  (  0.01295381237 )  AvgTol   =  0.0005901350758  (  0.002429297443 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 37  ( 37 )  N2Labels = 0  ( 0 )   TotalLabels = 42  ( 42 )   NameLabels = 9  ( 9 )   ColorLabels = 4  ( 4 )   LayerLabels = 33  ( 33 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/M2 b/tests/de/step_2/M2
index 0c767ebc52..30145ba43b 100644
--- a/tests/de/step_2/M2
+++ b/tests/de/step_2/M2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 3  ( 9 )  Summary  = 3  ( 9 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 252  ( 252 )   Summary  = 1622  ( 1622 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 252  ( 252 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 673  ( 673 )
-TOLERANCE   : MaxTol   = 0.003900261304  ( 0.003900261304 )  AvgTol   =  9.441138291e-005  (  9.443224434e-005 )
+TOLERANCE   : MaxTol   = 0.003900261304  ( 0.007833404346 )  AvgTol   =  9.450808397e-005  (  0.0001357380201 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/M4 b/tests/de/step_2/M4
index 77dc81442a..bb3455d143 100644
--- a/tests/de/step_2/M4
+++ b/tests/de/step_2/M4
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 8 )  Summary  = 4  ( 8 )
 CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 2  ( 2 )  Shells   = 1  ( 1 )   Solids   = 1 ( 1 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 40  ( 40 )   Summary  = 263  ( 263 )
 STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 40  ( 40 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 98  ( 98 )
-TOLERANCE   : MaxTol   =   0.7571968817  (    0.757178949 )  AvgTol   =   0.03928493209  (   0.03928588596 )
+TOLERANCE   : MaxTol   =   0.7571968817  (    0.757178949 )  AvgTol   =   0.04096331122  (   0.04096426509 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 4  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 1  ( 1 )   ColorLabels = 4  ( 4 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/M6 b/tests/de/step_2/M6
index 7b8c65e23d..ea621fc536 100644
--- a/tests/de/step_2/M6
+++ b/tests/de/step_2/M6
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 25  ( 32 )  Summary  = 25  ( 32 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 108  ( 108 )   Summary  = 674  ( 669 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 108  ( 108 )   FreeWire = 0  ( 0 )   FreeEdge  = 5 ( 5 )   SharedEdge = 275  ( 275 )
-TOLERANCE   : MaxTol   =   0.1162538812  (   0.1162538812 )  AvgTol   =  0.007348335495  (  0.007347627973 )
+TOLERANCE   : MaxTol   =   0.1162538812  (   0.1162538812 )  AvgTol   =  0.007800576583  (   0.01124673982 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 7  ( 7 )  N2Labels = 0  ( 0 )   TotalLabels = 10  ( 10 )   NameLabels = 5  ( 5 )   ColorLabels = 6  ( 6 )   LayerLabels = 6  ( 6 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/M7 b/tests/de/step_2/M7
index 08736aef2a..377c183be5 100644
--- a/tests/de/step_2/M7
+++ b/tests/de/step_2/M7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 66 )  Summary  = 2  ( 66 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 696  ( 696 )   Summary  = 4636  ( 4636 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 696  ( 696 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1943  ( 1943 )
-TOLERANCE   : MaxTol   =  0.02098499877  (  0.02098499875 )  AvgTol   =  0.001450588916  (   0.00145446666 )
+TOLERANCE   : MaxTol   =  0.02098499877  (  0.09930380124 )  AvgTol   =  0.002124131329  (  0.006931207463 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/M8 b/tests/de/step_2/M8
index 346b61dc4b..866c5cff21 100644
--- a/tests/de/step_2/M8
+++ b/tests/de/step_2/M8
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 12  ( 7 )  Summary  = 12  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 40  ( 40 )   Summary  = 231  ( 231 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 40  ( 40 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 99  ( 99 )
-TOLERANCE   : MaxTol   =  0.02294322294  (  0.02294322294 )  AvgTol   =  0.003566378077  (  0.003568339259 )
+TOLERANCE   : MaxTol   =  0.02294322294  (  0.03059350475 )  AvgTol   =  0.003590149917  (  0.004379826317 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/N1 b/tests/de/step_2/N1
index 793ca9397b..6b24f380a5 100644
--- a/tests/de/step_2/N1
+++ b/tests/de/step_2/N1
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 3  ( 0 )  Summary  = 3  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 435  ( 435 )   Summary  = 4899  ( 4899 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 435  ( 435 )   FreeWire = 0  ( 548 )   FreeEdge  = 548 ( 548 )   SharedEdge = 1677  ( 1677 )
-TOLERANCE   : MaxTol   = 0.0005349158543  ( 0.0005349158543 )  AvgTol   =  1.728668173e-005  (  1.728668164e-005 )
+TOLERANCE   : MaxTol   = 0.0005349158543  ( 0.0008075170146 )  AvgTol   =  1.728722228e-005  (  2.28569033e-005 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/N7 b/tests/de/step_2/N7
index e336e23c48..b1a9389b61 100644
--- a/tests/de/step_2/N7
+++ b/tests/de/step_2/N7
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 3 )  Summary  = 8  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 273  ( 273 )   Summary  = 1611  ( 1585 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 273  ( 273 )   FreeWire = 0  ( 0 )   FreeEdge  = 25 ( 25 )   SharedEdge = 634  ( 634 )
-TOLERANCE   : MaxTol   = 0.009439063586  ( 0.009438969195 )  AvgTol   =  0.001453400325  (  0.001448654117 )
+TOLERANCE   : MaxTol   = 0.009439063586  ( 0.009890486094 )  AvgTol   =  0.001469521991  (  0.001693442157 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 400  ( 400 )  N2Labels = 0  ( 0 )   TotalLabels = 403  ( 403 )   NameLabels = 5  ( 5 )   ColorLabels = 399  ( 399 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/N8 b/tests/de/step_2/N8
index 9583353e78..bfc960e9b2 100644
--- a/tests/de/step_2/N8
+++ b/tests/de/step_2/N8
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 5  ( 1 )  Summary  = 5  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 273  ( 273 )   Summary  = 1611  ( 1585 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 273  ( 273 )   FreeWire = 0  ( 0 )   FreeEdge  = 25 ( 25 )   SharedEdge = 634  ( 634 )
-TOLERANCE   : MaxTol   = 0.009439063586  ( 0.009438969195 )  AvgTol   =  0.001453682176  (  0.001448938515 )
+TOLERANCE   : MaxTol   = 0.009439063586  ( 0.009890486094 )  AvgTol   =  0.001476519142  (  0.001696115857 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 400  ( 400 )  N2Labels = 0  ( 0 )   TotalLabels = 403  ( 403 )   NameLabels = 5  ( 5 )   ColorLabels = 399  ( 399 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/N9 b/tests/de/step_2/N9
index b809dc42f9..1a52e84520 100644
--- a/tests/de/step_2/N9
+++ b/tests/de/step_2/N9
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 19  ( 6 )  Summary  = 19  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 104  ( 104 )   Summary  = 752  ( 748 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 104  ( 104 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 266  ( 262 )
-TOLERANCE   : MaxTol   = 0.006923751402  ( 0.006923751402 )  AvgTol   =  0.001305732349  (  0.001307010043 )
+TOLERANCE   : MaxTol   = 0.006923751402  ( 0.009036344633 )  AvgTol   =  0.001364850239  (  0.001796406712 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/O1 b/tests/de/step_2/O1
index cb665b1754..d64db823ad 100644
--- a/tests/de/step_2/O1
+++ b/tests/de/step_2/O1
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 20  ( 6 )  Summary  = 20  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 104  ( 104 )   Summary  = 752  ( 748 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 104  ( 104 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 266  ( 262 )
-TOLERANCE   : MaxTol   = 0.006923751402  ( 0.006923751402 )  AvgTol   =   0.00138492725  (  0.001385308686 )
+TOLERANCE   : MaxTol   = 0.006923751402  ( 0.007596378198 )  AvgTol   =  0.001448520746  (  0.001714495453 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/O2 b/tests/de/step_2/O2
index e11543520c..d454daaa4e 100644
--- a/tests/de/step_2/O2
+++ b/tests/de/step_2/O2
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 18  ( 16 )  Summary  = 18  ( 16 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 64  ( 64 )   Summary  = 378  ( 378 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 64  ( 64 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 150  ( 150 )
-TOLERANCE   : MaxTol   =  0.01528794944  (  0.01528794943 )  AvgTol   =  0.003155850634  (  0.003155850879 )
+TOLERANCE   : MaxTol   =  0.01528794944  (  0.01667849336 )  AvgTol   =  0.003242584981  (   0.00344779789 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/O3 b/tests/de/step_2/O3
index ad7b7a0964..9e847f0f6c 100644
--- a/tests/de/step_2/O3
+++ b/tests/de/step_2/O3
@@ -8,8 +8,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 28  ( 20 )  Summary  = 28  ( 20 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 112  ( 112 )   Summary  = 691  ( 687 )
-STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 112  ( 112 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 292  ( 288 )
+NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 112  ( 112 )   Summary  = 687  ( 687 )
+STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 112  ( 112 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 288  ( 288 )
 TOLERANCE   : MaxTol   = 0.009966026823  ( 0.009966026821 )  AvgTol   =  0.001107205459  (  0.001088049274 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/step_2/O4 b/tests/de/step_2/O4
index 33796bf7f9..c3c2b9c93c 100644
--- a/tests/de/step_2/O4
+++ b/tests/de/step_2/O4
@@ -1,5 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
+puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 
 set filename ie_soapbox-C.stp
@@ -8,8 +9,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 28  ( 14 )  Summary  = 28  ( 14 )
 CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 2  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 108  ( 108 )   Summary  = 681  ( 677 )
-STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 108  ( 108 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 290  ( 286 )
+NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 110  ( 108 )   Summary  = 681  ( 677 )
+STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 110  ( 108 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 286  ( 286 )
 TOLERANCE   : MaxTol   = 0.009966026823  ( 0.009966026821 )  AvgTol   =   0.00112455379  (  0.001105565209 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/step_2/O7 b/tests/de/step_2/O7
index c6467e0132..078eb6d4ad 100644
--- a/tests/de/step_2/O7
+++ b/tests/de/step_2/O7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 114  ( 114 )   Summary  = 632  ( 632 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 114  ( 114 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 252  ( 252 )
-TOLERANCE   : MaxTol   = 0.002986218584  ( 0.002986218585 )  AvgTol   =  0.001242487239  (  0.001242491604 )
+TOLERANCE   : MaxTol   = 0.003361988918  (  0.01686781346 )  AvgTol   =   0.00128557755  (  0.002583616342 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/O8 b/tests/de/step_2/O8
index 3460544396..60a55375a8 100644
--- a/tests/de/step_2/O8
+++ b/tests/de/step_2/O8
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 
 
 set filename pe_soapbox-A.stp
@@ -9,9 +7,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 5  ( 4 )  Summary  = 5  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 135  ( 135 )   Summary  = 829  ( 830 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 135  ( 135 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 344  ( 345 )
-TOLERANCE   : MaxTol   = 0.008167886115  ( 0.008167921107 )  AvgTol   =  0.000533491195  (  0.000477816366 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 135  ( 135 )   Summary  = 831  ( 830 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 135  ( 135 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 346  ( 345 )
+TOLERANCE   : MaxTol   = 0.008167967794  (   0.0138846985 )  AvgTol   =  0.0006876792327  (  0.002088120462 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/O9 b/tests/de/step_2/O9
index e2e227a939..f0b06996e8 100644
--- a/tests/de/step_2/O9
+++ b/tests/de/step_2/O9
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 10  ( 2 )  Summary  = 10  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 136  ( 136 )   Summary  = 840  ( 838 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 136  ( 136 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 351  ( 349 )
-TOLERANCE   : MaxTol   =   0.0155651078  (  0.01556490515 )  AvgTol   =  0.0006835042128  (  0.000592602248 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 135  ( 135 )   Summary  = 834  ( 833 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 135  ( 135 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 348  ( 347 )
+TOLERANCE   : MaxTol   =   0.0154238459  (  0.01542376989 )  AvgTol   =  0.0007316545128  (  0.001217807677 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/P2 b/tests/de/step_2/P2
index ed1d31614c..726080940a 100644
--- a/tests/de/step_2/P2
+++ b/tests/de/step_2/P2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 6  ( 6 )   Summary  = 50  ( 50 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 6  ( 6 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 0.004844238469  ( 0.004844238469 )  AvgTol   =  0.0009046566326  (  0.0009046566326 )
+TOLERANCE   : MaxTol   = 0.009857357586  (   0.1493799144 )  AvgTol   =  0.001724165017  (   0.02015831163 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/P3 b/tests/de/step_2/P3
index 0374f7c4a1..b263d8049b 100644
--- a/tests/de/step_2/P3
+++ b/tests/de/step_2/P3
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 14  ( 5 )  Summary  = 14  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 127  ( 127 )   Summary  = 695  ( 694 )
-STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 127  ( 127 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 269  ( 268 )
-TOLERANCE   : MaxTol   =   0.0357587389  (   0.0357587389 )  AvgTol   =  0.0007767128816  (  0.0007801230155 )
+NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 127  ( 127 )   Summary  = 694  ( 694 )
+STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 127  ( 127 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 268  ( 268 )
+TOLERANCE   : MaxTol   =   0.0357587389  (  0.04624185716 )  AvgTol   =  0.0008007182634  (  0.001664746615 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/P5 b/tests/de/step_2/P5
index d44022c5fe..6a6f89c93e 100644
--- a/tests/de/step_2/P5
+++ b/tests/de/step_2/P5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename r56ie.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 20  ( 17 )  Summary  = 20  ( 17 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 495  ( 495 )   Summary  = 3087  ( 3087 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 495  ( 495 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1285  ( 1285 )
-TOLERANCE   : MaxTol   = 0.007275739139  ( 0.007275739138 )  AvgTol   =  0.0003723029387  (  0.0003723030048 )
+TOLERANCE   : MaxTol   = 0.007275739139  ( 0.009837971082 )  AvgTol   =  0.0003747715952  (  0.0006818197071 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/P6 b/tests/de/step_2/P6
index 80308771f1..b5d77bfec3 100644
--- a/tests/de/step_2/P6
+++ b/tests/de/step_2/P6
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 64  ( 56 )  Summary  = 64  ( 56 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 6  ( 6 )  Shell    = 6  ( 6 )  Face     = 461  ( 461 )   Summary  = 2954  ( 2954 )
 STATSHAPE   : Solid    = 9  ( 9 )  Shell    = 9  ( 9 )  Face     = 593  ( 593 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1214  ( 1214 )
-TOLERANCE   : MaxTol   = 0.003189265597  ( 0.003189265597 )  AvgTol   =  8.528366771e-005  (  8.528366772e-005 )
+TOLERANCE   : MaxTol   = 0.003189265597  (  0.01213102778 )  AvgTol   =  8.562945145e-005  (  0.0003980331971 )
 LABELS      : N0Labels = 7  ( 7 )  N1Labels = 9  ( 9 )  N2Labels = 0  ( 0 )   TotalLabels = 16  ( 16 )   NameLabels = 16  ( 16 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/P7 b/tests/de/step_2/P7
index 84a8ecb7f2..a2e468f7a4 100644
--- a/tests/de/step_2/P7
+++ b/tests/de/step_2/P7
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 10  ( 0 )  Summary  = 10  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 676  ( 676 )   Summary  = 4405  ( 4405 )
 STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 676  ( 676 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1789  ( 1789 )
-TOLERANCE   : MaxTol   = 0.0006326851963  ( 0.0006326851963 )  AvgTol   =  9.75365417e-006  (  9.753654164e-006 )
+TOLERANCE   : MaxTol   = 0.0006326851963  (  0.01045225195 )  AvgTol   =  9.75365417e-006  (  0.0002435784351 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 680  ( 680 )  N2Labels = 0  ( 0 )   TotalLabels = 685  ( 685 )   NameLabels = 9  ( 9 )   ColorLabels = 0  ( 0 )   LayerLabels = 676  ( 676 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/Q1 b/tests/de/step_2/Q1
index 15b33c9dd5..a878ea84ef 100644
--- a/tests/de/step_2/Q1
+++ b/tests/de/step_2/Q1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 4 )  Summary  = 4  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 303  ( 303 )   Summary  = 1953  ( 1953 )
 STATSHAPE   : Solid    = 37  ( 37 )  Shell    = 37  ( 37 )  Face     = 743  ( 743 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 802  ( 802 )
-TOLERANCE   : MaxTol   =  0.07416169578  (  0.07416169585 )  AvgTol   =  0.003042676379  (   0.00304267638 )
+TOLERANCE   : MaxTol   =  0.07416169578  (  0.08279381612 )  AvgTol   =  0.003679745563  (  0.008393331016 )
 LABELS      : N0Labels = 6  ( 6 )  N1Labels = 16  ( 16 )  N2Labels = 0  ( 0 )   TotalLabels = 22  ( 22 )   NameLabels = 22  ( 22 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/Q8 b/tests/de/step_2/Q8
index 4847f82c20..2a2b331e06 100644
--- a/tests/de/step_2/Q8
+++ b/tests/de/step_2/Q8
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 5  ( 5 )  Summary  = 5  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 12  ( 12 )   Summary  = 152  ( 144 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 12  ( 12 )   FreeWire = 0  ( 0 )   FreeEdge  = 7 ( 7 )   SharedEdge = 45  ( 45 )
-TOLERANCE   : MaxTol   = 0.008406290248  ( 0.008406290264 )  AvgTol   =  0.001787192472  (  0.001787192471 )
+TOLERANCE   : MaxTol   = 0.008406290248  ( 0.008408732296 )  AvgTol   =  0.001787192472  (  0.001970108735 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/Q9 b/tests/de/step_2/Q9
index 1bdef16c71..69952b4979 100644
--- a/tests/de/step_2/Q9
+++ b/tests/de/step_2/Q9
@@ -5,9 +5,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 6 )  Summary  = 0  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 339  ( 339 )   Summary  = 1943  ( 1943 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 339  ( 339 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 813  ( 813 )
-TOLERANCE   : MaxTol   =  0.03785483405  (  0.03928050465 )  AvgTol   =  0.0007696572383  (  0.0007865166845 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 339  ( 339 )   Summary  = 1940  ( 1939 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 339  ( 339 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 810  ( 809 )
+TOLERANCE   : MaxTol   =  0.03775850689  (  0.07449683755 )  AvgTol   =  0.009233317918  (   0.01501864352 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/R2 b/tests/de/step_2/R2
index 95f46dc87b..dbf4b23312 100644
--- a/tests/de/step_2/R2
+++ b/tests/de/step_2/R2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename trj7_b1-id-214.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 31  ( 28 )  Summary  = 31  ( 28 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 357  ( 357 )   Summary  = 2005  ( 2003 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 357  ( 357 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 841  ( 839 )
-TOLERANCE   : MaxTol   = 0.007356791914  ( 0.007356791913 )  AvgTol   =  0.0002971946842  (  0.000297748927 )
+TOLERANCE   : MaxTol   = 0.007356791914  ( 0.009485808595 )  AvgTol   =  0.0003528568313  (  0.001207996284 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/R3 b/tests/de/step_2/R3
index 468e917a67..9830eb94de 100644
--- a/tests/de/step_2/R3
+++ b/tests/de/step_2/R3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 14 )  Summary  = 1  ( 14 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 327  ( 327 )   Summary  = 1895  ( 1895 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 327  ( 327 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 787  ( 787 )
-TOLERANCE   : MaxTol   = 0.008986927787  ( 0.008986927786 )  AvgTol   =  0.000727618811  (  0.0007330050859 )
+TOLERANCE   : MaxTol   = 0.009955368478  (  0.01960514969 )  AvgTol   =  0.002055715355  (  0.003376235267 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/R7 b/tests/de/step_2/R7
index 44b73807d7..f04403c68d 100644
--- a/tests/de/step_2/R7
+++ b/tests/de/step_2/R7
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 15  ( 5 )  Summary  = 15  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 251  ( 251 )   Summary  = 1623  ( 1623 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 251  ( 251 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 674  ( 674 )
-TOLERANCE   : MaxTol   = 0.002562040373  ( 0.002562040373 )  AvgTol   =  2.130990263e-005  (  2.135716386e-005 )
+TOLERANCE   : MaxTol   = 0.002562040373  ( 0.005004494964 )  AvgTol   =  2.347361582e-005  (  7.134464059e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/S1 b/tests/de/step_2/S1
index 33224c215e..29df69d871 100644
--- a/tests/de/step_2/S1
+++ b/tests/de/step_2/S1
@@ -1,5 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
+puts "TODO CR23096 ALL: TPSTAT : Faulty"
+puts "TODO CR23096 ALL: CHECKSHAPE : Faulty"
+puts "TODO CR23096 ALL: STATSHAPE : Faulty"
 
 
 set filename trj12_ttmouse-pe-214.stp
@@ -7,10 +9,10 @@ set filename trj12_ttmouse-pe-214.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 39  ( 6 )  Summary  = 39  ( 6 )
-CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 16  ( 16 )  Shell    = 17  ( 17 )  Face     = 364  ( 364 )   Summary  = 2485  ( 2485 )
-STATSHAPE   : Solid    = 79  ( 79 )  Shell    = 87  ( 87 )  Face     = 2716  ( 2716 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1053  ( 1053 )
-TOLERANCE   : MaxTol   = 0.008250618048  ( 0.008250618045 )  AvgTol   =  0.0002623355281  (  0.0002623329911 )
+CHECKSHAPE  : Wires    = 64  ( 48 )  Faces    = 64  ( 48 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 15  ( 16 )  Shell    = 17  ( 17 )  Face     = 367  ( 366 )   Summary  = 2506  ( 2495 )
+STATSHAPE   : Solid    = 71  ( 79 )  Shell    = 87  ( 87 )  Face     = 2740  ( 2732 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1064  ( 1057 )
+TOLERANCE   : MaxTol   =    4.389003466  (    5.153790881 )  AvgTol   =   0.05707355423  (   0.06633632879 )
 LABELS      : N0Labels = 10  ( 10 )  N1Labels = 32  ( 32 )  N2Labels = 0  ( 0 )   TotalLabels = 42  ( 42 )   NameLabels = 22  ( 22 )   ColorLabels = 22  ( 22 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/step_2/S2 b/tests/de/step_2/S2
index 0854491c8c..2a90a47c8f 100644
--- a/tests/de/step_2/S2
+++ b/tests/de/step_2/S2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 3  ( 9 )  Summary  = 3  ( 9 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 252  ( 252 )   Summary  = 1622  ( 1622 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 252  ( 252 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 673  ( 673 )
-TOLERANCE   : MaxTol   = 0.005365460363  ( 0.005365460363 )  AvgTol   =  9.973312668e-005  (  9.977340424e-005 )
+TOLERANCE   : MaxTol   = 0.005365460363  ( 0.007833404346 )  AvgTol   =  9.982982836e-005  (  0.0001410844712 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/S3 b/tests/de/step_2/S3
index 32397e24b4..aa0069326a 100644
--- a/tests/de/step_2/S3
+++ b/tests/de/step_2/S3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 61  ( 61 )   Summary  = 830  ( 830 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 61  ( 61 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 384  ( 384 )
-TOLERANCE   : MaxTol   =  0.05329654166  (  0.05427178221 )  AvgTol   =  0.004974532764  (  0.005076702098 )
+TOLERANCE   : MaxTol   =  0.05329654166  (  0.05427178221 )  AvgTol   =  0.005154426307  (  0.005256226004 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/S4 b/tests/de/step_2/S4
index 4750385fc4..62bebcc41d 100644
--- a/tests/de/step_2/S4
+++ b/tests/de/step_2/S4
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 25  ( 5 )  Summary  = 25  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 94  ( 94 )   Summary  = 570  ( 570 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 94  ( 94 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 232  ( 232 )
-TOLERANCE   : MaxTol   =  0.00325269835  ( 0.003252698346 )  AvgTol   =  0.0003146155421  (  0.0003124677492 )
+TOLERANCE   : MaxTol   =  0.00325269835  (  0.03359335896 )  AvgTol   =  0.0004152472389  (   0.00304307701 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/S6 b/tests/de/step_2/S6
index c8c4cfd7e5..fb7fdfd22c 100644
--- a/tests/de/step_2/S6
+++ b/tests/de/step_2/S6
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 139  ( 48 )  Summary  = 139  ( 48
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 762  ( 762 )   Summary  = 5219  ( 5151 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 762  ( 762 )   FreeWire = 0  ( 0 )   FreeEdge  = 68 ( 68 )   SharedEdge = 2111  ( 2111 )
-TOLERANCE   : MaxTol   =  0.06547014744  (  0.06547014744 )  AvgTol   =  0.0009764552867  (  0.0009747825774 )
+TOLERANCE   : MaxTol   =  0.06547014744  (  0.09657601968 )  AvgTol   =  0.001090769259  (  0.006430218535 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/S7 b/tests/de/step_2/S7
index 739e26ac76..bdc6d47899 100644
--- a/tests/de/step_2/S7
+++ b/tests/de/step_2/S7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename trj4_pm2-ct2-203.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 76  ( 58 )  Summary  = 76  ( 58 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 572  ( 572 )   Summary  = 3459  ( 3435 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 572  ( 572 )   FreeWire = 0  ( 0 )   FreeEdge  = 24 ( 24 )   SharedEdge = 1412  ( 1412 )
-TOLERANCE   : MaxTol   =   0.0680750549  (  0.08160144149 )  AvgTol   =  0.001440241217  (   0.00105598837 )
+TOLERANCE   : MaxTol   =  0.07987447694  (  0.09279010735 )  AvgTol   =  0.001529989628  (  0.002688497303 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/S9 b/tests/de/step_2/S9
index 3a0e7c0b19..a69b00862a 100644
--- a/tests/de/step_2/S9
+++ b/tests/de/step_2/S9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 
 set LinuxFaulties {TOLERANCE}
 set filename trj6_b1-ec-214.stp
@@ -7,10 +6,10 @@ set filename trj6_b1-ec-214.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 5  ( 11 )  Summary  = 5  ( 11 )
-CHECKSHAPE  : Wires    = 4  ( 2 )  Faces    = 4  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 4  ( 4 )  Faces    = 4  ( 4 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 292  ( 292 )   Summary  = 1707  ( 1707 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 292  ( 292 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 718  ( 718 )
-TOLERANCE   : MaxTol   =   0.0920060456  (  0.09527501816 )  AvgTol   =  0.0008900555475  (  0.0009327432451 )
+TOLERANCE   : MaxTol   =   0.1164202689  (   0.1164219029 )  AvgTol   =   0.00286119941  (   0.01095378922 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 19  ( 19 )  N2Labels = 0  ( 0 )   TotalLabels = 20  ( 20 )   NameLabels = 1  ( 1 )   ColorLabels = 20  ( 20 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/T1 b/tests/de/step_2/T1
index e49746d6a9..3b32cdc71c 100644
--- a/tests/de/step_2/T1
+++ b/tests/de/step_2/T1
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 set LinuxDiff 2
 set filename trj6_b1-id-203.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 31  ( 28 )  Summary  = 31  ( 28 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 357  ( 357 )   Summary  = 2006  ( 2004 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 357  ( 357 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 841  ( 839 )
-TOLERANCE   : MaxTol   = 0.007356791914  ( 0.007356791913 )  AvgTol   =  0.0002971897085  (  0.0002976051887 )
+TOLERANCE   : MaxTol   = 0.007356791914  ( 0.009485808595 )  AvgTol   =  0.0003528126958  (  0.001207999522 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/T2 b/tests/de/step_2/T2
index bc8e8066eb..63b2e14b39 100644
--- a/tests/de/step_2/T2
+++ b/tests/de/step_2/T2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 12 )  Summary  = 2  ( 12 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 371  ( 371 )   Summary  = 2101  ( 2101 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 371  ( 371 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 865  ( 865 )
-TOLERANCE   : MaxTol   = 0.003244214222  ( 0.003244214221 )  AvgTol   =  0.000126061368  (  0.0001260718032 )
+TOLERANCE   : MaxTol   = 0.003827431453  ( 0.009890984488 )  AvgTol   =  0.0005233077558  (  0.001598027633 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 28  ( 28 )  N2Labels = 0  ( 0 )   TotalLabels = 29  ( 29 )   NameLabels = 1  ( 1 )   ColorLabels = 28  ( 28 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/T3 b/tests/de/step_2/T3
index 87feab0e27..d7bf11d3c7 100644
--- a/tests/de/step_2/T3
+++ b/tests/de/step_2/T3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 12 )  Summary  = 2  ( 12 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 371  ( 371 )   Summary  = 2101  ( 2101 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 371  ( 371 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 865  ( 865 )
-TOLERANCE   : MaxTol   = 0.003244214222  ( 0.003244214221 )  AvgTol   =  0.000126061368  (  0.0001260718032 )
+TOLERANCE   : MaxTol   = 0.003827431453  ( 0.009890984488 )  AvgTol   =  0.0005233077558  (  0.001598027633 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 28  ( 28 )  N2Labels = 0  ( 0 )   TotalLabels = 29  ( 29 )   NameLabels = 1  ( 1 )   ColorLabels = 28  ( 28 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/T9 b/tests/de/step_2/T9
index 03e1577be3..c7f0f70057 100644
--- a/tests/de/step_2/T9
+++ b/tests/de/step_2/T9
@@ -1,13 +1,15 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 set filename trj7_b1-ec-214.stp
+puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
+puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 2 )  Warnings = 2  ( 28 )  Summary  = 2  ( 30 )
 CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 2  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 414  ( 414 )   Summary  = 2776  ( 2776 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 414  ( 414 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1197  ( 1197 )
-TOLERANCE   : MaxTol   =  0.01929292821  (  0.01929292821 )  AvgTol   =  0.001937877906  (  0.001939205772 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 416  ( 415 )   Summary  = 2779  ( 2761 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 416  ( 415 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1195  ( 1179 )
+TOLERANCE   : MaxTol   =    9036.639612  (   0.9492387908 )  AvgTol   =     21.72114525  (   0.03925492632 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 28  ( 28 )  N2Labels = 0  ( 0 )   TotalLabels = 29  ( 29 )   NameLabels = 1  ( 1 )   ColorLabels = 29  ( 29 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/U1 b/tests/de/step_2/U1
index 8c2a24ea31..df86a4eb33 100644
--- a/tests/de/step_2/U1
+++ b/tests/de/step_2/U1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 12 )  Summary  = 2  ( 12 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 371  ( 371 )   Summary  = 2101  ( 2101 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 371  ( 371 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 865  ( 865 )
-TOLERANCE   : MaxTol   = 0.003244214222  ( 0.003244214221 )  AvgTol   =  0.0001260613681  (  0.0001260718034 )
+TOLERANCE   : MaxTol   = 0.003827431453  ( 0.009890984488 )  AvgTol   =  0.000523307756  (  0.001598027633 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 28  ( 28 )  N2Labels = 0  ( 0 )   TotalLabels = 29  ( 29 )   NameLabels = 1  ( 1 )   ColorLabels = 28  ( 28 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/U2 b/tests/de/step_2/U2
index cdcc0931b1..7c4f752df2 100644
--- a/tests/de/step_2/U2
+++ b/tests/de/step_2/U2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 12 )  Summary  = 2  ( 12 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 371  ( 371 )   Summary  = 2101  ( 2101 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 371  ( 371 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 865  ( 865 )
-TOLERANCE   : MaxTol   = 0.003244214222  ( 0.003244214221 )  AvgTol   =  0.0001260613681  (  0.0001260718034 )
+TOLERANCE   : MaxTol   = 0.003827431453  ( 0.009890984488 )  AvgTol   =  0.000523307756  (  0.001598027633 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 28  ( 28 )  N2Labels = 0  ( 0 )   TotalLabels = 29  ( 29 )   NameLabels = 1  ( 1 )   ColorLabels = 28  ( 28 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/U3 b/tests/de/step_2/U3
index c297261374..5689e990fa 100644
--- a/tests/de/step_2/U3
+++ b/tests/de/step_2/U3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 6 )  Summary  = 4  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 335  ( 335 )   Summary  = 1923  ( 1923 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 335  ( 335 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 805  ( 805 )
-TOLERANCE   : MaxTol   =  0.03785483405  (  0.03928050465 )  AvgTol   =   0.00108375819  (  0.001100782547 )
+TOLERANCE   : MaxTol   =  0.03696608743  (  0.07449683755 )  AvgTol   =  0.009024715928  (   0.01498533653 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/U4 b/tests/de/step_2/U4
index 3becec5a48..36e1c0eba6 100644
--- a/tests/de/step_2/U4
+++ b/tests/de/step_2/U4
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 23  ( 23 )  Summary  = 23  ( 23 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 3  ( 3 )  Face     = 57  ( 57 )   Summary  = 417  ( 417 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 3  ( 3 )  Face     = 57  ( 57 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 177  ( 177 )
-TOLERANCE   : MaxTol   = 0.001016447274  (  0.00101644727 )  AvgTol   =  0.0001410075512  (  0.000141007551 )
+TOLERANCE   : MaxTol   = 0.001141394308  ( 0.009811807981 )  AvgTol   =  0.0001654781889  (  0.0007151230078 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 4  ( 4 )   NameLabels = 1  ( 1 )   ColorLabels = 3  ( 3 )   LayerLabels = 2  ( 2 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/U7 b/tests/de/step_2/U7
index f17f59adaf..482c329d13 100644
--- a/tests/de/step_2/U7
+++ b/tests/de/step_2/U7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 11  ( 28 )  Summary  = 11  ( 28 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 403  ( 403 )   Summary  = 2339  ( 2339 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 403  ( 403 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 985  ( 985 )
-TOLERANCE   : MaxTol   = 0.001828077728  ( 0.001828077728 )  AvgTol   =  0.0001812621846  (  0.0001821511745 )
+TOLERANCE   : MaxTol   = 0.001828077728  ( 0.001828077728 )  AvgTol   =  0.0002142764424  (  0.0003099078585 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 403  ( 403 )  N2Labels = 0  ( 0 )   TotalLabels = 404  ( 404 )   NameLabels = 1  ( 1 )   ColorLabels = 404  ( 404 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/U8 b/tests/de/step_2/U8
index e96819f3a7..6be1678888 100644
--- a/tests/de/step_2/U8
+++ b/tests/de/step_2/U8
@@ -5,9 +5,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 24 )  Summary  = 2  ( 24 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 414  ( 414 )   Summary  = 2770  ( 2770 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 414  ( 414 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1194  ( 1194 )
-TOLERANCE   : MaxTol   =  0.01929292821  (  0.01929292821 )  AvgTol   =  0.001906129445  (  0.001906560518 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 415  ( 415 )   Summary  = 2770  ( 2755 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 415  ( 415 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1191  ( 1176 )
+TOLERANCE   : MaxTol   =  0.09895712553  (   0.9492387908 )  AvgTol   =   0.01303492802  (   0.03965300183 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 28  ( 28 )  N2Labels = 0  ( 0 )   TotalLabels = 29  ( 29 )   NameLabels = 1  ( 1 )   ColorLabels = 29  ( 29 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/V1 b/tests/de/step_2/V1
index ff16a3565c..69e86e95c1 100644
--- a/tests/de/step_2/V1
+++ b/tests/de/step_2/V1
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
 set filename trj8_b1-tc-214.stp
@@ -8,9 +7,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 339  ( 339 )   Summary  = 1945  ( 1945 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 339  ( 339 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 814  ( 814 )
-TOLERANCE   : MaxTol   =  0.03785483405  (  0.03755929942 )  AvgTol   =  0.0007738260708  (  0.0007369445935 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 339  ( 339 )   Summary  = 1941  ( 1941 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 339  ( 339 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 810  ( 810 )
+TOLERANCE   : MaxTol   =  0.03775853832  (  0.05770441607 )  AvgTol   =  0.009180726225  (   0.01351048369 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 22  ( 22 )  N2Labels = 0  ( 0 )   TotalLabels = 23  ( 23 )   NameLabels = 1  ( 1 )   ColorLabels = 23  ( 23 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/V6 b/tests/de/step_2/V6
index 6b551e6ceb..11c573d081 100644
--- a/tests/de/step_2/V6
+++ b/tests/de/step_2/V6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename trj9_b2-oc-214.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 10  ( 5 )  Summary  = 10  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 250  ( 250 )   Summary  = 1618  ( 1618 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 250  ( 250 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 672  ( 672 )
-TOLERANCE   : MaxTol   = 0.002562040373  ( 0.002562040373 )  AvgTol   =  1.863382837e-005  (  1.868123367e-005 )
+TOLERANCE   : MaxTol   = 0.002562040373  ( 0.005004494964 )  AvgTol   =  2.080413824e-005  (  6.882111124e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/V8 b/tests/de/step_2/V8
index 3f6670e1e6..a1d75db03c 100644
--- a/tests/de/step_2/V8
+++ b/tests/de/step_2/V8
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 52  ( 0 )  Summary  = 52  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 469  ( 469 )   Summary  = 2647  ( 2647 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 469  ( 469 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1080  ( 1080 )
-TOLERANCE   : MaxTol   = 0.006604322767  ( 0.006604322767 )  AvgTol   =  0.0007654176454  (  0.0007654176454 )
+TOLERANCE   : MaxTol   = 0.006604322767  (  0.00750479523 )  AvgTol   =  0.0008116667087  (  0.002278120543 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/W6 b/tests/de/step_2/W6
index 9af0f20e1e..953fb8c1d0 100644
--- a/tests/de/step_2/W6
+++ b/tests/de/step_2/W6
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 3  ( 9 )  Summary  = 3  ( 9 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 252  ( 252 )   Summary  = 1622  ( 1622 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 252  ( 252 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 673  ( 673 )
-TOLERANCE   : MaxTol   = 0.003900261304  ( 0.003900261304 )  AvgTol   =  9.441138291e-005  (  9.443224434e-005 )
+TOLERANCE   : MaxTol   = 0.003900261304  ( 0.007833404346 )  AvgTol   =  9.450808397e-005  (  0.0001357380201 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/W7 b/tests/de/step_2/W7
index b9220fb455..7ae02a163d 100644
--- a/tests/de/step_2/W7
+++ b/tests/de/step_2/W7
@@ -1,5 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 set filename db_soapbox-A.stp
+puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
@@ -7,7 +8,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 29  ( 30 )  Summary  = 29  ( 30 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 108  ( 108 )   Summary  = 652  ( 652 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 108  ( 108 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 270  ( 270 )
-TOLERANCE   : MaxTol   =   0.1350899105  (    0.135089907 )  AvgTol   =   0.00993387755  (   0.01302870701 )
+TOLERANCE   : MaxTol   =    0.135089911  (    0.135089907 )  AvgTol   =   0.01291133866  (   0.01518557927 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/W8 b/tests/de/step_2/W8
index 7e50058ef5..9ae9e4df67 100644
--- a/tests/de/step_2/W8
+++ b/tests/de/step_2/W8
@@ -1,5 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 set filename db_soapbox-B.stp
+puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
@@ -7,7 +8,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 32  ( 32 )  Summary  = 32  ( 32 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 108  ( 108 )   Summary  = 652  ( 652 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 108  ( 108 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 270  ( 270 )
-TOLERANCE   : MaxTol   =   0.1274164441  (   0.1274164441 )  AvgTol   =   0.01201852752  (   0.01701895369 )
+TOLERANCE   : MaxTol   =   0.1274164441  (   0.1274164441 )  AvgTol   =   0.01201852752  (   0.01771888311 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/X2 b/tests/de/step_2/X2
index 0a126b46cd..0a327bbe7e 100644
--- a/tests/de/step_2/X2
+++ b/tests/de/step_2/X2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 3  ( 9 )  Summary  = 3  ( 9 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 252  ( 252 )   Summary  = 1622  ( 1622 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 252  ( 252 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 673  ( 673 )
-TOLERANCE   : MaxTol   = 0.005365460363  ( 0.005365460363 )  AvgTol   =  9.973312668e-005  (  9.977340424e-005 )
+TOLERANCE   : MaxTol   = 0.005365460363  ( 0.007833404346 )  AvgTol   =  9.982982836e-005  (  0.0001410844712 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/X9 b/tests/de/step_2/X9
index de96b3c6c2..a27cf4617d 100644
--- a/tests/de/step_2/X9
+++ b/tests/de/step_2/X9
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 14 )  Summary  = 1  ( 14 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 327  ( 327 )   Summary  = 1895  ( 1895 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 327  ( 327 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 787  ( 787 )
-TOLERANCE   : MaxTol   =  0.01146233865  (  0.01146233865 )  AvgTol   =  0.001088482445  (  0.001084763791 )
+TOLERANCE   : MaxTol   =  0.01146233865  (  0.01858460173 )  AvgTol   =  0.002324025457  (  0.003534492623 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/Y1 b/tests/de/step_2/Y1
index 1c55ef92cc..ea640d9d0a 100644
--- a/tests/de/step_2/Y1
+++ b/tests/de/step_2/Y1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 4 )  Summary  = 4  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 83  ( 83 )   Summary  = 490  ( 490 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 83  ( 83 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 204  ( 204 )
-TOLERANCE   : MaxTol   = 0.003929037241  (  0.03181394455 )  AvgTol   =  0.0004573465217  (  0.003125225824 )
+TOLERANCE   : MaxTol   = 0.003929037241  (  0.03181394455 )  AvgTol   =  0.0004814695376  (  0.003318266161 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/Y2 b/tests/de/step_2/Y2
index df9f9d8d82..b798a697a3 100644
--- a/tests/de/step_2/Y2
+++ b/tests/de/step_2/Y2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 4 )  Summary  = 4  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 83  ( 83 )   Summary  = 490  ( 490 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 83  ( 83 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 204  ( 204 )
-TOLERANCE   : MaxTol   = 0.003929037241  (  0.03181394455 )  AvgTol   =  0.0004568669898  (  0.003208903855 )
+TOLERANCE   : MaxTol   = 0.003929037241  (  0.03181394455 )  AvgTol   =  0.0004809897221  (  0.003317484731 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/Y4 b/tests/de/step_2/Y4
index eaa113b610..8cc6128877 100644
--- a/tests/de/step_2/Y4
+++ b/tests/de/step_2/Y4
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 7 )  Summary  = 4  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 453  ( 453 )   Summary  = 2835  ( 2835 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 453  ( 453 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1169  ( 1169 )
-TOLERANCE   : MaxTol   =  0.03659878417  (  0.03659878417 )  AvgTol   =  0.001071594469  (  0.001071594511 )
+TOLERANCE   : MaxTol   =  0.03659878417  (  0.07247642707 )  AvgTol   =  0.001283268686  (  0.005742789733 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/Y5 b/tests/de/step_2/Y5
index 10942534b6..9025f8359e 100644
--- a/tests/de/step_2/Y5
+++ b/tests/de/step_2/Y5
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -10,8 +9,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 77  ( 39 )  Summary  = 77  ( 39 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 11  ( 11 )  Shell    = 13  ( 13 )  Face     = 270  ( 270 )   Summary  = 1673  ( 1667 )
-STATSHAPE   : Solid    = 11  ( 11 )  Shell    = 13  ( 13 )  Face     = 270  ( 270 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 654  ( 654 )
+NBSHAPES    : Solid    = 10  ( 10 )  Shell    = 12  ( 12 )  Face     = 269  ( 269 )   Summary  = 1638  ( 1636 )
+STATSHAPE   : Solid    = 10  ( 10 )  Shell    = 12  ( 12 )  Face     = 269  ( 269 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 636  ( 636 )
 TOLERANCE   : MaxTol   =  0.01008857123  (  0.01008857108 )  AvgTol   =  0.0003104589496  (  0.0003616303196 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 3 )  N2Labels = 0  ( 1 )   TotalLabels = 5  ( 7 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/step_3/A8 b/tests/de/step_3/A8
index b92d85a260..472110dadb 100644
--- a/tests/de/step_3/A8
+++ b/tests/de/step_3/A8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 set LinuxDiff 4
@@ -10,9 +9,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 47  ( 41 )  Summary  = 47  ( 41 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 209  ( 129 )  Face     = 209  ( 209 )   Summary  = 3033  ( 2883 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 209  ( 129 )  Face     = 209  ( 209 )   FreeWire = 0  ( 1 )   FreeEdge  = 67 ( 67 )   SharedEdge = 1153  ( 1150 )
-TOLERANCE   : MaxTol   =   0.3035246255  (   0.3035246024 )  AvgTol   =  0.001284623633  (  0.001353410806 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 209  ( 129 )  Face     = 209  ( 209 )   Summary  = 3032  ( 2883 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 209  ( 129 )  Face     = 209  ( 209 )   FreeWire = 0  ( 1 )   FreeEdge  = 67 ( 67 )   SharedEdge = 1152  ( 1150 )
+TOLERANCE   : MaxTol   =   0.3035246255  (   0.3035246024 )  AvgTol   =  0.001361092422  (  0.003604130581 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/A9 b/tests/de/step_3/A9
index 6c3fa72643..9130d0dc71 100755
--- a/tests/de/step_3/A9
+++ b/tests/de/step_3/A9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 
 
 set filename trj7_pm5-hc-214.stp
diff --git a/tests/de/step_3/B2 b/tests/de/step_3/B2
index e095807f32..49c10b316b 100644
--- a/tests/de/step_3/B2
+++ b/tests/de/step_3/B2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: PROPS : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 7  ( 2 )  Summary  = 7  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 1067  ( 1067 )   Summary  = 7192  ( 7192 )
 STATSHAPE   : Solid    = 6  ( 6 )  Shell    = 6  ( 6 )  Face     = 1083  ( 1083 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3028  ( 3028 )
-TOLERANCE   : MaxTol   = 0.0008521598214  ( 0.0008521598214 )  AvgTol   =  1.249644984e-005  (  1.249720623e-005 )
+TOLERANCE   : MaxTol   = 0.0008521598214  ( 0.001299198834 )  AvgTol   =  1.420819957e-005  (  0.0004704251775 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 107  ( 107 )  N2Labels = 0  ( 0 )   TotalLabels = 112  ( 112 )   NameLabels = 11  ( 11 )   ColorLabels = 104  ( 104 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 5  ( 11 )  Volume   = 5  ( 5 )  Area     = 5  ( 5 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_3/B3 b/tests/de/step_3/B3
index fb225291c6..5fef87e0d5 100644
--- a/tests/de/step_3/B3
+++ b/tests/de/step_3/B3
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 451  ( 435 )  Summary  = 451  ( 43
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 691  ( 691 )   Summary  = 4597  ( 4593 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 691  ( 691 )   FreeWire = 0  ( 0 )   FreeEdge  = 4 ( 4 )   SharedEdge = 1921  ( 1921 )
-TOLERANCE   : MaxTol   = 0.009713246079  ( 0.009713246096 )  AvgTol   =  0.0007364223692  (  0.000740657563 )
+TOLERANCE   : MaxTol   = 0.009713246079  ( 0.009813593708 )  AvgTol   =  0.0007698614465  (  0.001110514786 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 765  ( 761 )  N2Labels = 0  ( 0 )   TotalLabels = 768  ( 764 )   NameLabels = 5  ( 5 )   ColorLabels = 73  ( 70 )   LayerLabels = 691  ( 691 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_3/B4 b/tests/de/step_3/B4
index a0a52bdda4..ed865150c1 100644
--- a/tests/de/step_3/B4
+++ b/tests/de/step_3/B4
@@ -9,9 +9,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 506  ( 256 )  Summary  = 506  ( 256 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 31  ( 31 )  Shell    = 349  ( 349 )  Face     = 1547  ( 1547 )   Summary  = 13547  ( 13348 )
-STATSHAPE   : Solid    = 40  ( 40 )  Shell    = 359  ( 359 )  Face     = 1923  ( 1923 )   FreeWire = 0  ( 3 )   FreeEdge  = 208 ( 208 )   SharedEdge = 5415  ( 5418 )
-TOLERANCE   : MaxTol   =  0.01535715949  (  0.01627658476 )  AvgTol   =  0.0003743548816  (  0.0003565698464 )
+NBSHAPES    : Solid    = 31  ( 31 )  Shell    = 349  ( 349 )  Face     = 1547  ( 1547 )   Summary  = 13546  ( 13344 )
+STATSHAPE   : Solid    = 40  ( 40 )  Shell    = 359  ( 359 )  Face     = 1923  ( 1923 )   FreeWire = 0  ( 3 )   FreeEdge  = 208 ( 208 )   SharedEdge = 5414  ( 5414 )
+TOLERANCE   : MaxTol   =  0.01535715949  (  0.01940049859 )  AvgTol   =  0.000510121635  (  0.001069993247 )
 LABELS      : N0Labels = 13  ( 13 )  N1Labels = 2197  ( 2323 )  N2Labels = 0  ( 0 )   TotalLabels = 2210  ( 2336 )   NameLabels = 31  ( 31 )   ColorLabels = 2183  ( 2183 )   LayerLabels = 483  ( 609 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 7  ( 7 )
diff --git a/tests/de/step_3/B5 b/tests/de/step_3/B5
index 729f9932dc..0d3b1b6640 100644
--- a/tests/de/step_3/B5
+++ b/tests/de/step_3/B5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 
 
 set filename 612319029MB-HEAD-CYLINDER.stp
@@ -7,10 +6,10 @@ set filename 612319029MB-HEAD-CYLINDER.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1869  ( 2152 )  Summary  = 1869  ( 2152 )
-CHECKSHAPE  : Wires    = 36  ( 32 )  Faces    = 36  ( 32 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 17  ( 17 )  Face     = 6173  ( 6173 )   Summary  = 41190  ( 41175 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 17  ( 17 )  Face     = 6173  ( 6173 )   FreeWire = 0  ( 0 )   FreeEdge  = 4 ( 4 )   SharedEdge = 17493  ( 17486 )
-TOLERANCE   : MaxTol   =  0.07753055119  (  0.07753055119 )  AvgTol   =  0.0008306430334  (  0.0007527924205 )
+CHECKSHAPE  : Wires    = 36  ( 36 )  Faces    = 36  ( 36 )  Shells   = 0  ( 0 )   Solids   = 1 ( 1 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 17  ( 17 )  Face     = 6173  ( 6173 )   Summary  = 41176  ( 41161 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 17  ( 17 )  Face     = 6173  ( 6173 )   FreeWire = 0  ( 0 )   FreeEdge  = 4 ( 4 )   SharedEdge = 17483  ( 17472 )
+TOLERANCE   : MaxTol   =  0.07753055119  (  0.08114875624 )  AvgTol   =  0.002252828596  (  0.008808842178 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/B6 b/tests/de/step_3/B6
index 3a7dd8b8dd..5301ff9557 100644
--- a/tests/de/step_3/B6
+++ b/tests/de/step_3/B6
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 228  ( 1 )  Summary  = 228  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 4242  ( 61 )  Face     = 4242  ( 4242 )   Summary  = 46642  ( 42462 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 4242  ( 61 )  Face     = 4242  ( 4242 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 17100  ( 17100 )
-TOLERANCE   : MaxTol   = 0.0002439254042  ( 0.0002439254042 )  AvgTol   =  2.817800594e-007  (  2.287381323e-007 )
+TOLERANCE   : MaxTol   = 0.0003292944598  ( 0.0009787303794 )  AvgTol   =  3.190255905e-007  (  8.698017989e-007 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 4242  ( 4242 )  N2Labels = 0  ( 0 )   TotalLabels = 4243  ( 4243 )   NameLabels = 1  ( 1 )   ColorLabels = 4242  ( 4242 )   LayerLabels = 4242  ( 4242 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_3/B8 b/tests/de/step_3/B8
index dcbd8a5153..d6ec70cc41 100644
--- a/tests/de/step_3/B8
+++ b/tests/de/step_3/B8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename gehaeuse_solid.stp
@@ -8,9 +7,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 120  ( 77 )  Summary  = 120  ( 77 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 12  ( 12 )  Shell    = 28  ( 28 )  Face     = 3042  ( 3042 )   Summary  = 17828  ( 17827 )
-STATSHAPE   : Solid    = 42  ( 42 )  Shell    = 58  ( 58 )  Face     = 3464  ( 3464 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 7282  ( 7281 )
-TOLERANCE   : MaxTol   =  0.08182857582  (  0.08182857582 )  AvgTol   =  0.0001757020743  (  0.000175662186 )
+NBSHAPES    : Solid    = 12  ( 12 )  Shell    = 28  ( 28 )  Face     = 3042  ( 3042 )   Summary  = 17827  ( 17827 )
+STATSHAPE   : Solid    = 42  ( 42 )  Shell    = 58  ( 58 )  Face     = 3464  ( 3464 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 7281  ( 7281 )
+TOLERANCE   : MaxTol   =  0.08182857582  (  0.08182857582 )  AvgTol   =  0.001536334725  (  0.005273191285 )
 LABELS      : N0Labels = 18  ( 18 )  N1Labels = 47  ( 47 )  N2Labels = 0  ( 0 )   TotalLabels = 65  ( 65 )   NameLabels = 65  ( 65 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/B9 b/tests/de/step_3/B9
index 5354f05121..82276ed60b 100644
--- a/tests/de/step_3/B9
+++ b/tests/de/step_3/B9
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 167  ( 910 )  Summary  = 167  ( 91
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 2823  ( 0 )  Face     = 2823  ( 2823 )   Summary  = 35044  ( 32219 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 3347  ( 0 )  Face     = 3347  ( 3347 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 13235  ( 13233 )
-TOLERANCE   : MaxTol   =  0.07507769847  (  0.07507769847 )  AvgTol   =  9.526144643e-005  (  0.000106301461 )
+TOLERANCE   : MaxTol   =  0.07507769847  (  0.07507769847 )  AvgTol   =  0.0002646721739  (  0.002834192939 )
 LABELS      : N0Labels = 37  ( 37 )  N1Labels = 76  ( 76 )  N2Labels = 0  ( 0 )   TotalLabels = 113  ( 113 )   NameLabels = 113  ( 113 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/C4 b/tests/de/step_3/C4
index 16a84c173c..8a07fee4c5 100644
--- a/tests/de/step_3/C4
+++ b/tests/de/step_3/C4
@@ -7,7 +7,7 @@ set filename UKI60591.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 6 )  Warnings = 16  ( 35 )  Summary  = 16  ( 41 )
-CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 27  ( 27 )  Face     = 183  ( 183 )   Summary  = 1491  ( 1486 )
 STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 27  ( 27 )  Face     = 183  ( 183 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 623  ( 622 )
 TOLERANCE   : MaxTol   =   0.2224706003  (   0.2224706003 )  AvgTol   =  0.003966127058  (  0.003995856355 )
diff --git a/tests/de/step_3/C5 b/tests/de/step_3/C5
index ce263d635d..1819f4c38d 100644
--- a/tests/de/step_3/C5
+++ b/tests/de/step_3/C5
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 
@@ -10,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 127  ( 100 )  Summary  = 127  ( 100 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 45  ( 44 )  Face     = 803  ( 803 )   Summary  = 5321  ( 5318 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 45  ( 44 )  Face     = 803  ( 803 )   FreeWire = 0  ( 6 )   FreeEdge  = 6 ( 6 )   SharedEdge = 2214  ( 2211 )
-TOLERANCE   : MaxTol   =  0.03600909588  (  0.03600909508 )  AvgTol   =   0.00065440753  (  0.0006525648269 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 45  ( 44 )  Face     = 804  ( 804 )   Summary  = 5323  ( 5318 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 45  ( 44 )  Face     = 804  ( 804 )   FreeWire = 0  ( 6 )   FreeEdge  = 6 ( 6 )   SharedEdge = 2213  ( 2208 )
+TOLERANCE   : MaxTol   =  0.06389681961  (  0.09956703386 )  AvgTol   =  0.001998735132  (  0.009098714937 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 4  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 9  ( 9 )   NameLabels = 9  ( 9 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/C6 b/tests/de/step_3/C6
index 84921f7e76..9daa17a8b6 100644
--- a/tests/de/step_3/C6
+++ b/tests/de/step_3/C6
@@ -8,8 +8,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 23  ( 499 )  Summary  = 23  ( 499 )
 CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 2  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 98  ( 98 )  Shell    = 98  ( 98 )  Face     = 3829  ( 3829 )   Summary  = 22282  ( 22282 )
-STATSHAPE   : Solid    = 116  ( 116 )  Shell    = 116  ( 116 )  Face     = 4144  ( 4144 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 8833  ( 8833 )
+NBSHAPES    : Solid    = 98  ( 98 )  Shell    = 98  ( 98 )  Face     = 3829  ( 3829 )   Summary  = 22284  ( 22284 )
+STATSHAPE   : Solid    = 116  ( 116 )  Shell    = 116  ( 116 )  Face     = 4144  ( 4144 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 8834  ( 8834 )
 TOLERANCE   : MaxTol   = 0.0002435409967  (  0.06761346589 )  AvgTol   =  7.737752126e-007  (  3.401316374e-005 )
 LABELS      : N0Labels = 14  ( 14 )  N1Labels = 25  ( 25 )  N2Labels = 0  ( 0 )   TotalLabels = 39  ( 39 )   NameLabels = 39  ( 39 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/step_3/C8 b/tests/de/step_3/C8
index a617c9c084..71edb3466f 100644
--- a/tests/de/step_3/C8
+++ b/tests/de/step_3/C8
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 125  ( 461 )  Summary  = 125  ( 46
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 810  ( 0 )  Face     = 810  ( 810 )   Summary  = 10386  ( 9576 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 964  ( 0 )  Face     = 964  ( 964 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3971  ( 3971 )
-TOLERANCE   : MaxTol   = 0.002209187729  ( 0.002209187729 )  AvgTol   =  6.075889762e-005  (  6.038723298e-005 )
+TOLERANCE   : MaxTol   = 0.009818924747  (  0.04427038115 )  AvgTol   =   0.00029913369  (  0.002929666529 )
 LABELS      : N0Labels = 9  ( 9 )  N1Labels = 22  ( 22 )  N2Labels = 0  ( 0 )   TotalLabels = 31  ( 31 )   NameLabels = 31  ( 31 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/C9 b/tests/de/step_3/C9
index 56c4c60f35..5b14b318a2 100644
--- a/tests/de/step_3/C9
+++ b/tests/de/step_3/C9
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 48  ( 180 )  Summary  = 48  ( 180 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 7  ( 7 )  Shell    = 7  ( 7 )  Face     = 2117  ( 2117 )   Summary  = 12742  ( 12742 )
-STATSHAPE   : Solid    = 7  ( 7 )  Shell    = 7  ( 7 )  Face     = 2117  ( 2117 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 5273  ( 5273 )
-TOLERANCE   : MaxTol   =   0.2515134963  (   0.2065786276 )  AvgTol   =  0.0008034861324  (  0.0008522149265 )
+NBSHAPES    : Solid    = 7  ( 7 )  Shell    = 7  ( 7 )  Face     = 2117  ( 2117 )   Summary  = 12742  ( 12741 )
+STATSHAPE   : Solid    = 7  ( 7 )  Shell    = 7  ( 7 )  Face     = 2117  ( 2117 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 5273  ( 5272 )
+TOLERANCE   : MaxTol   =   0.2357145058  (   0.2065786276 )  AvgTol   =  0.009610117691  (    0.0246139599 )
 LABELS      : N0Labels = 9  ( 9 )  N1Labels = 1311  ( 1311 )  N2Labels = 0  ( 0 )   TotalLabels = 1320  ( 1320 )   NameLabels = 17  ( 17 )   ColorLabels = 1303  ( 1303 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 10  ( 10 )
diff --git a/tests/de/step_3/D1 b/tests/de/step_3/D1
index a8902ebfd4..8613236183 100755
--- a/tests/de/step_3/D1
+++ b/tests/de/step_3/D1
@@ -12,7 +12,7 @@ TPSTAT      : Faulties = 11  ( 0 )  Warnings = 78  ( 24 )  Summary  = 89  ( 24 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 95  ( 106 )  Face     = 95  ( 106 )   Summary  = 1451  ( 1665 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 95  ( 106 )  Face     = 95  ( 106 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 580  ( 670 )
-TOLERANCE   : MaxTol   =  0.02881427566  (  0.03703290736 )  AvgTol   =  0.002745495233  (  0.003655741726 )
+TOLERANCE   : MaxTol   =  0.02881427566  (  0.03703290736 )  AvgTol   =  0.002876539025  (  0.004091781903 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 190  ( 212 )  N2Labels = 0  ( 0 )   TotalLabels = 191  ( 213 )   NameLabels = 1  ( 1 )   ColorLabels = 95  ( 106 )   LayerLabels = 95  ( 106 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_3/D7 b/tests/de/step_3/D7
index 5922d86318..f8ad569aa3 100644
--- a/tests/de/step_3/D7
+++ b/tests/de/step_3/D7
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 20 )  Summary  = 4  ( 20 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 13  ( 13 )  Shell    = 13  ( 13 )  Face     = 801  ( 801 )   Summary  = 4582  ( 4580 )
-STATSHAPE   : Solid    = 32  ( 32 )  Shell    = 32  ( 32 )  Face     = 840  ( 840 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1835  ( 1833 )
-TOLERANCE   : MaxTol   = 0.000994818338  ( 0.0009948282861 )  AvgTol   =  7.810876157e-006  (  7.816444503e-006 )
+NBSHAPES    : Solid    = 13  ( 13 )  Shell    = 13  ( 13 )  Face     = 801  ( 801 )   Summary  = 4580  ( 4580 )
+STATSHAPE   : Solid    = 32  ( 32 )  Shell    = 32  ( 32 )  Face     = 840  ( 840 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1833  ( 1833 )
+TOLERANCE   : MaxTol   = 0.000994818338  ( 0.009298751842 )  AvgTol   =  1.273917467e-005  (  0.0002831776234 )
 LABELS      : N0Labels = 21  ( 21 )  N1Labels = 39  ( 39 )  N2Labels = 0  ( 0 )   TotalLabels = 60  ( 60 )   NameLabels = 60  ( 60 )   ColorLabels = 13  ( 13 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 21  ( 60 )  Volume   = 21  ( 21 )  Area     = 21  ( 21 )
 NCOLORS     : NColors  = 7  ( 7 )
diff --git a/tests/de/step_3/D9 b/tests/de/step_3/D9
index e15b695983..4b1a9e0acc 100755
--- a/tests/de/step_3/D9
+++ b/tests/de/step_3/D9
@@ -1,13 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
-
+set LinuxDiff 3
 set filename 53921163S0.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 17  ( 27 )  Summary  = 17  ( 27 )
-CHECKSHAPE  : Wires    = 6  ( 7 )  Faces    = 6  ( 9 )  Shells   = 0  ( 0 )   Solids   = 1 ( 1 )
+CHECKSHAPE  : Wires    = 8  ( 10 )  Faces    = 8  ( 10 )  Shells   = 0  ( 0 )   Solids   = 1 ( 1 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 558  ( 556 )   Summary  = 3668  ( 3661 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 558  ( 556 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1527  ( 1526 )
 TOLERANCE   : MaxTol   =    60.79282309  (    60.87483475 )  AvgTol   =     1.272227708  (     1.266017009 )
diff --git a/tests/de/step_3/E1 b/tests/de/step_3/E1
index bf4df3cf58..71d66d6c89 100644
--- a/tests/de/step_3/E1
+++ b/tests/de/step_3/E1
@@ -12,7 +12,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 44  ( 1 )  Summary  = 44  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 13  ( 13 )  Shell    = 300  ( 298 )  Face     = 482  ( 482 )   Summary  = 5637  ( 5527 )
 STATSHAPE   : Solid    = 13  ( 13 )  Shell    = 300  ( 298 )  Face     = 482  ( 482 )   FreeWire = 0  ( 0 )   FreeEdge  = 107 ( 107 )   SharedEdge = 2116  ( 2116 )
-TOLERANCE   : MaxTol   =  0.02930428273  (  0.02930428273 )  AvgTol   =  7.660141425e-005  (  7.484449088e-005 )
+TOLERANCE   : MaxTol   =  0.02930428273  (  0.09893741783 )  AvgTol   =  0.0003509175902  (  0.003693447129 )
 LABELS      : N0Labels = 7  ( 7 )  N1Labels = 504  ( 515 )  N2Labels = 0  ( 0 )   TotalLabels = 511  ( 522 )   NameLabels = 12  ( 12 )   ColorLabels = 498  ( 498 )   LayerLabels = 407  ( 418 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_3/E2 b/tests/de/step_3/E2
index 2ca00cf772..d8c77f920c 100644
--- a/tests/de/step_3/E2
+++ b/tests/de/step_3/E2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 set LinuxDiff 3
@@ -10,9 +9,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 24  ( 0 )  Summary  = 24  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   Summary  = 640  ( 631 )
-STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 289  ( 282 )
-TOLERANCE   : MaxTol   = 0.0003171897371  ( 0.0003171897371 )  AvgTol   =  3.783030998e-005  (  3.807836632e-005 )
+NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   Summary  = 635  ( 631 )
+STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 284  ( 282 )
+TOLERANCE   : MaxTol   =  0.00199721673  ( 0.008663672498 )  AvgTol   =  0.0001953469228  (  0.001153460099 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 7  ( 7 )  N2Labels = 0  ( 0 )   TotalLabels = 10  ( 10 )   NameLabels = 5  ( 5 )   ColorLabels = 3  ( 3 )   LayerLabels = 5  ( 5 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_3/E3 b/tests/de/step_3/E3
index b8e4714d88..31381593c7 100644
--- a/tests/de/step_3/E3
+++ b/tests/de/step_3/E3
@@ -10,9 +10,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 438  ( 219 )  Summary  = 438  ( 219 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 312  ( 303 )  Face     = 1000  ( 1000 )   Summary  = 9963  ( 9706 )
-STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 313  ( 304 )  Face     = 1231  ( 1231 )   FreeWire = 0  ( 3 )   FreeEdge  = 251 ( 251 )   SharedEdge = 3919  ( 3922 )
-TOLERANCE   : MaxTol   =  0.01535715949  (  0.01627658476 )  AvgTol   =  0.0005496909126  (  0.000522628664 )
+NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 312  ( 303 )  Face     = 1000  ( 1000 )   Summary  = 9962  ( 9702 )
+STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 313  ( 304 )  Face     = 1231  ( 1231 )   FreeWire = 0  ( 3 )   FreeEdge  = 251 ( 251 )   SharedEdge = 3918  ( 3918 )
+TOLERANCE   : MaxTol   =  0.01535715949  (  0.01648925136 )  AvgTol   =  0.0007749108723  (  0.001520406253 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 2126  ( 2252 )  N2Labels = 0  ( 0 )   TotalLabels = 2131  ( 2257 )   NameLabels = 10  ( 10 )   ColorLabels = 2113  ( 2113 )   LayerLabels = 498  ( 624 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/step_3/E4 b/tests/de/step_3/E4
index 3119be3adf..baf3e977cb 100644
--- a/tests/de/step_3/E4
+++ b/tests/de/step_3/E4
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 222  ( 1131 )  Summary  = 222  ( 1131 )
 CHECKSHAPE  : Wires    = 8  ( 8 )  Faces    = 8  ( 8 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 3067  ( 0 )  Face     = 3070  ( 3067 )   Summary  = 38193  ( 35102 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 3550  ( 0 )  Face     = 3553  ( 3550 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 14468  ( 14457 )
-TOLERANCE   : MaxTol   =  0.08182775785  (  0.08182775785 )  AvgTol   =  9.399148298e-005  (  8.050559104e-005 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 3067  ( 0 )  Face     = 3067  ( 3067 )   Summary  = 38169  ( 35102 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 3550  ( 0 )  Face     = 3550  ( 3550 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 14457  ( 14457 )
+TOLERANCE   : MaxTol   =  0.08182775785  (  0.08182775785 )  AvgTol   =  0.0002907732443  (  0.002393164469 )
 LABELS      : N0Labels = 17  ( 17 )  N1Labels = 46  ( 46 )  N2Labels = 0  ( 0 )   TotalLabels = 63  ( 63 )   NameLabels = 63  ( 63 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/E6 b/tests/de/step_3/E6
index 7419cac0e6..97795a7969 100755
--- a/tests/de/step_3/E6
+++ b/tests/de/step_3/E6
@@ -8,11 +8,11 @@ set filename Z8M6SAT.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 9  ( 0 )  Warnings = 928  ( 3166 )  Summary  = 937  ( 3166 )
-CHECKSHAPE  : Wires    = 47  ( 42 )  Faces    = 45  ( 43 )  Shells   = 0  ( 4 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 28  ( 28 )  Shell    = 772  ( 36 )  Face     = 3246  ( 3245 )   Summary  = 29529  ( 28705 )
-STATSHAPE   : Solid    = 28  ( 28 )  Shell    = 772  ( 36 )  Face     = 3246  ( 3245 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 12672  ( 12614 )
-TOLERANCE   : MaxTol   =    15.00025501  (    20.46526799 )  AvgTol   =    0.0249955933  (   0.03758716993 )
+TPSTAT      : Faulties = 11  ( 0 )  Warnings = 946  ( 3166 )  Summary  = 957  ( 3166 )
+CHECKSHAPE  : Wires    = 51  ( 42 )  Faces    = 51  ( 45 )  Shells   = 0  ( 4 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 28  ( 28 )  Shell    = 772  ( 32 )  Face     = 3242  ( 3241 )   Summary  = 29515  ( 28693 )
+STATSHAPE   : Solid    = 28  ( 28 )  Shell    = 772  ( 32 )  Face     = 3242  ( 3241 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 12667  ( 12612 )
+TOLERANCE   : MaxTol   =    15.00001475  (    20.46526799 )  AvgTol   =   0.03158606342  (   0.03807479444 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/E8 b/tests/de/step_3/E8
index b97bf57122..110a5ea3c4 100644
--- a/tests/de/step_3/E8
+++ b/tests/de/step_3/E8
@@ -10,9 +10,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1207  ( 1000 )  Summary  = 1207  ( 1000 )
 CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 2  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 95  ( 95 )  Shell    = 289  ( 271 )  Face     = 3569  ( 3569 )   Summary  = 31396  ( 28458 )
-STATSHAPE   : Solid    = 95  ( 95 )  Shell    = 289  ( 271 )  Face     = 3569  ( 3569 )   FreeWire = 0  ( 102 )   FreeEdge  = 2219 ( 2219 )   SharedEdge = 11602  ( 11394 )
-TOLERANCE   : MaxTol   =   0.6657106806  (   0.6657106806 )  AvgTol   =  0.0009047246906  (  0.003046115432 )
+NBSHAPES    : Solid    = 95  ( 95 )  Shell    = 289  ( 271 )  Face     = 3569  ( 3569 )   Summary  = 31394  ( 28458 )
+STATSHAPE   : Solid    = 95  ( 95 )  Shell    = 289  ( 271 )  Face     = 3569  ( 3569 )   FreeWire = 0  ( 102 )   FreeEdge  = 2219 ( 2219 )   SharedEdge = 11600  ( 11394 )
+TOLERANCE   : MaxTol   =   0.6657106806  (   0.6657106806 )  AvgTol   =  0.001017158361  (  0.003936202705 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 1839  ( 1840 )  N2Labels = 0  ( 0 )   TotalLabels = 1840  ( 1841 )   NameLabels = 1  ( 1 )   ColorLabels = 165  ( 165 )   LayerLabels = 1762  ( 1763 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 9  ( 9 )
diff --git a/tests/de/step_3/E9 b/tests/de/step_3/E9
index 4b94d5ab97..394684e8f9 100644
--- a/tests/de/step_3/E9
+++ b/tests/de/step_3/E9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 set LinuxDiff 3
@@ -10,9 +9,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 24  ( 0 )  Summary  = 24  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   Summary  = 640  ( 631 )
-STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 289  ( 282 )
-TOLERANCE   : MaxTol   = 0.0003171897371  ( 0.0003171897371 )  AvgTol   =  3.783030998e-005  (  3.807836632e-005 )
+NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   Summary  = 635  ( 631 )
+STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 284  ( 282 )
+TOLERANCE   : MaxTol   =  0.00199721673  ( 0.008663672498 )  AvgTol   =  0.0001953469228  (  0.001153460099 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/F2 b/tests/de/step_3/F2
index 041d75be0a..5b2158d3e0 100644
--- a/tests/de/step_3/F2
+++ b/tests/de/step_3/F2
@@ -1,7 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
 set filename PRO10368.stp
@@ -10,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 204  ( 165 )  Summary  = 204  ( 165 )
 CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 3  ( 3 )  Face     = 773  ( 773 )   Summary  = 4599  ( 4557 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 3  ( 3 )  Face     = 773  ( 773 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1948  ( 1943 )
-TOLERANCE   : MaxTol   =  0.06507711685  (   0.0607003883 )  AvgTol   =  0.002006298401  (  0.003310782808 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 3  ( 3 )  Face     = 773  ( 773 )   Summary  = 4594  ( 4557 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 3  ( 3 )  Face     = 773  ( 773 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1943  ( 1943 )
+TOLERANCE   : MaxTol   =  0.06070038815  (   0.0607003883 )  AvgTol   =  0.002533300901  (  0.003394184033 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 4  ( 4 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 3  ( 3 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/F3 b/tests/de/step_3/F3
index 4e0f4846d4..261b49f24c 100644
--- a/tests/de/step_3/F3
+++ b/tests/de/step_3/F3
@@ -1,8 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 Debian60-64: Error : 2 differences with reference data found :" 
 
 set LinuxDiff 2
@@ -12,8 +9,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 283  ( 203 )  Summary  = 283  ( 203 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 863  ( 862 )   Summary  = 5609  ( 5611 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 863  ( 862 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2370  ( 2375 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 862  ( 862 )   Summary  = 5603  ( 5611 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 862  ( 862 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2367  ( 2375 )
 TOLERANCE   : MaxTol   =   0.2981250817  (   0.1424276318 )  AvgTol   =  0.001247316194  (  0.000646415041 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/step_3/F4 b/tests/de/step_3/F4
index 3e366d2e2a..b846423002 100644
--- a/tests/de/step_3/F4
+++ b/tests/de/step_3/F4
@@ -1,7 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
 set filename trj3_pm1-id-214.stp
@@ -10,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1168  ( 895 )  Summary  = 1168  ( 895 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 3831  ( 3826 )   Summary  = 23899  ( 23857 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 3831  ( 3826 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 9990  ( 9965 )
-TOLERANCE   : MaxTol   =  0.02038455644  (  0.00902340394 )  AvgTol   =  0.0003242263552  (  0.0003010775309 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 3826  ( 3826 )   Summary  = 23862  ( 23856 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 3826  ( 3826 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 9969  ( 9964 )
+TOLERANCE   : MaxTol   = 0.009023403931  ( 0.009980833943 )  AvgTol   =  0.0003371911058  (  0.000825361244 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 3047  ( 3047 )  N2Labels = 0  ( 0 )   TotalLabels = 3048  ( 3048 )   NameLabels = 1  ( 1 )   ColorLabels = 3048  ( 3048 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_4/A1 b/tests/de/step_4/A1
index 360b41bf7f..ac27aa4c8b 100644
--- a/tests/de/step_4/A1
+++ b/tests/de/step_4/A1
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
@@ -12,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 54  ( 43 )  Summary  = 54  ( 43 )
 CHECKSHAPE  : Wires    = 0  ( 2 )  Faces    = 0  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 8  ( 8 )  Shell    = 230  ( 230 )  Face     = 734  ( 730 )   Summary  = 5894  ( 5886 )
 STATSHAPE   : Solid    = 8  ( 8 )  Shell    = 230  ( 230 )  Face     = 734  ( 730 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2325  ( 2325 )
-TOLERANCE   : MaxTol   = 0.007776555629  ( 0.007776555631 )  AvgTol   =  0.0001612407656  (  0.0001614685167 )
+TOLERANCE   : MaxTol   = 0.007776555629  ( 0.009838987775 )  AvgTol   =  0.0001629422998  (  0.0003475330146 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 3 )  N2Labels = 0  ( 1 )   TotalLabels = 5  ( 7 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/A2 b/tests/de/step_4/A2
index b05ac51455..9c80a6f67d 100644
--- a/tests/de/step_4/A2
+++ b/tests/de/step_4/A2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 7  ( 10 )  Summary  = 7  ( 10 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 96  ( 96 )  Shell    = 96  ( 96 )  Face     = 1550  ( 1550 )   Summary  = 9569  ( 9569 )
 STATSHAPE   : Solid    = 157  ( 157 )  Shell    = 157  ( 157 )  Face     = 2165  ( 2165 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3746  ( 3746 )
-TOLERANCE   : MaxTol   =    0.064063078  (    0.064063078 )  AvgTol   =  0.0001743918382  (  0.0001589314923 )
+TOLERANCE   : MaxTol   =  0.09605390893  (   0.2017069355 )  AvgTol   =  0.004037409197  (  0.008789463002 )
 LABELS      : N0Labels = 112  ( 112 )  N1Labels = 170  ( 170 )  N2Labels = 0  ( 0 )   TotalLabels = 282  ( 282 )   NameLabels = 282  ( 282 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/A4 b/tests/de/step_4/A4
index dcdf35d410..8936ad573e 100644
--- a/tests/de/step_4/A4
+++ b/tests/de/step_4/A4
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 71  ( 65 )  Summary  = 71  ( 65 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 445  ( 445 )  Face     = 445  ( 445 )   Summary  = 5378  ( 3758 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 445  ( 445 )  Face     = 445  ( 445 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2023  ( 1600 )
-TOLERANCE   : MaxTol   =  0.08129076078  (   0.1779929979 )  AvgTol   =  0.002440613368  (   0.01498805694 )
+TOLERANCE   : MaxTol   =  0.08129076078  (   0.1779929979 )  AvgTol   =  0.002456311675  (   0.01536489548 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 893  ( 893 )  N2Labels = 0  ( 0 )   TotalLabels = 894  ( 894 )   NameLabels = 1  ( 1 )   ColorLabels = 448  ( 448 )   LayerLabels = 448  ( 448 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/step_4/A5 b/tests/de/step_4/A5
index e4971fcbec..a15f3dde0b 100644
--- a/tests/de/step_4/A5
+++ b/tests/de/step_4/A5
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 22  ( 22 )   Summary  = 188  ( 171 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 22  ( 22 )   FreeWire = 0  ( 0 )   FreeEdge  = 17 ( 17 )   SharedEdge = 63  ( 63 )
-TOLERANCE   : MaxTol   = 9.221007947e-006  ( 9.221010787e-006 )  AvgTol   =  3.14609541e-006  (  3.146095349e-006 )
+TOLERANCE   : MaxTol   =  0.01755162064  (  0.05734823138 )  AvgTol   =  0.004026464306  (  0.008726035474 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 19  ( 19 )  N2Labels = 0  ( 0 )   TotalLabels = 22  ( 22 )   NameLabels = 5  ( 5 )   ColorLabels = 18  ( 18 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/step_4/A8 b/tests/de/step_4/A8
index 80cb34c689..d04270acd6 100644
--- a/tests/de/step_4/A8
+++ b/tests/de/step_4/A8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 126  ( 67 )  Summary  = 126  ( 67
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 1393  ( 1393 )   Summary  = 9157  ( 9157 )
 STATSHAPE   : Solid    = 6  ( 6 )  Shell    = 6  ( 6 )  Face     = 1459  ( 1459 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3853  ( 3853 )
-TOLERANCE   : MaxTol   =   0.1532053661  (   0.1473148116 )  AvgTol   =  0.0009144144844  (  0.0009108471996 )
+TOLERANCE   : MaxTol   =   0.1527629212  (   0.1473148116 )  AvgTol   =  0.0009767377272  (  0.001291090251 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 1261  ( 1261 )  N2Labels = 0  ( 0 )   TotalLabels = 1266  ( 1266 )   NameLabels = 11  ( 11 )   ColorLabels = 0  ( 0 )   LayerLabels = 1255  ( 1255 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/B3 b/tests/de/step_4/B3
index db8c4501e5..54264f50fc 100644
--- a/tests/de/step_4/B3
+++ b/tests/de/step_4/B3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 
 set LinuxDiff 1
@@ -10,9 +9,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 76  ( 68 )  Summary  = 76  ( 68 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 101  ( 101 )  Face     = 101  ( 101 )   Summary  = 6262  ( 6266 )
-STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 101  ( 101 )  Face     = 101  ( 101 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2988  ( 2992 )
-TOLERANCE   : MaxTol   =   0.1351488154  (   0.1351488154 )  AvgTol   =  0.0004822364364  (  0.0005707539631 )
+NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 101  ( 101 )  Face     = 101  ( 101 )   Summary  = 6262  ( 6272 )
+STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 101  ( 101 )  Face     = 101  ( 101 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2988  ( 2998 )
+TOLERANCE   : MaxTol   =   0.1351488154  (   0.1351488154 )  AvgTol   =   0.00169512314  (  0.006333173283 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/B8 b/tests/de/step_4/B8
index b5acb099b5..99d83f44db 100644
--- a/tests/de/step_4/B8
+++ b/tests/de/step_4/B8
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 6 )  Summary  = 4  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 41  ( 41 )   Summary  = 612  ( 612 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 41  ( 41 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 275  ( 275 )
-TOLERANCE   : MaxTol   = 0.003916476016  (  0.01715433608 )  AvgTol   =  0.0004422292452  (  0.001564297929 )
+TOLERANCE   : MaxTol   = 0.003916476016  (  0.02740530648 )  AvgTol   =   0.00042102894  (  0.001697797351 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 4  ( 4 )   NameLabels = 1  ( 1 )   ColorLabels = 3  ( 3 )   LayerLabels = 3  ( 3 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/B9 b/tests/de/step_4/B9
index 1d1c8e8454..c23d27a55d 100644
--- a/tests/de/step_4/B9
+++ b/tests/de/step_4/B9
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 7 )  Summary  = 4  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 41  ( 41 )   Summary  = 612  ( 612 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 41  ( 41 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 275  ( 275 )
-TOLERANCE   : MaxTol   = 0.003916476016  (  0.01715433608 )  AvgTol   =  0.0004422274574  (  0.001564296141 )
+TOLERANCE   : MaxTol   = 0.003916476016  (  0.02740530648 )  AvgTol   =  0.0004210271522  (  0.001697795563 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 4  ( 4 )   NameLabels = 1  ( 1 )   ColorLabels = 3  ( 3 )   LayerLabels = 3  ( 3 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/C1 b/tests/de/step_4/C1
index 10f1a21743..6ad9972de1 100644
--- a/tests/de/step_4/C1
+++ b/tests/de/step_4/C1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 7 )  Summary  = 4  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 41  ( 41 )   Summary  = 612  ( 612 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 41  ( 41 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 275  ( 275 )
-TOLERANCE   : MaxTol   = 0.003917262203  (  0.01715433608 )  AvgTol   =  0.0004434943229  (  0.001764012688 )
+TOLERANCE   : MaxTol   = 0.003917262203  (  0.02740530648 )  AvgTol   =  0.0004367734404  (  0.001885763158 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 4  ( 4 )   NameLabels = 1  ( 1 )   ColorLabels = 3  ( 3 )   LayerLabels = 3  ( 3 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/C9 b/tests/de/step_4/C9
index 244eed388e..8dee702bd0 100644
--- a/tests/de/step_4/C9
+++ b/tests/de/step_4/C9
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 6 )  Summary  = 4  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 41  ( 41 )   Summary  = 612  ( 612 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 41  ( 41 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 275  ( 275 )
-TOLERANCE   : MaxTol   =   0.0039188913  (  0.01715433608 )  AvgTol   =  0.0004030761357  (  0.001357501264 )
+TOLERANCE   : MaxTol   =   0.0039188913  (  0.02740530648 )  AvgTol   =  0.0003818758305  (  0.001491000686 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 4  ( 4 )   NameLabels = 1  ( 1 )   ColorLabels = 3  ( 3 )   LayerLabels = 3  ( 3 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/D1 b/tests/de/step_4/D1
index 4c1d9d2663..3bf180ff31 100644
--- a/tests/de/step_4/D1
+++ b/tests/de/step_4/D1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 6 )  Summary  = 4  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 41  ( 41 )   Summary  = 612  ( 612 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 41  ( 41 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 275  ( 275 )
-TOLERANCE   : MaxTol   =   0.0039188913  (  0.01715433608 )  AvgTol   =  0.0004030779235  (  0.001357503052 )
+TOLERANCE   : MaxTol   =   0.0039188913  (  0.02740530648 )  AvgTol   =  0.0003818776183  (  0.001491002474 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 4  ( 4 )   NameLabels = 1  ( 1 )   ColorLabels = 3  ( 3 )   LayerLabels = 3  ( 3 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/D2 b/tests/de/step_4/D2
index 72a18dbabc..ebb1bf03b6 100644
--- a/tests/de/step_4/D2
+++ b/tests/de/step_4/D2
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 10  ( 14 )  Summary  = 10  ( 14 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 108  ( 108 )   Summary  = 673  ( 673 )
 STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 108  ( 108 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 282  ( 282 )
-TOLERANCE   : MaxTol   =  0.01749235594  (  0.01749235594 )  AvgTol   =  0.003420792369  (  0.003429060011 )
+TOLERANCE   : MaxTol   =  0.01749235594  (  0.01749235594 )  AvgTol   =  0.003723787424  (  0.003735669579 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/D4 b/tests/de/step_4/D4
index 9e11ead8ee..7a2a02bc69 100644
--- a/tests/de/step_4/D4
+++ b/tests/de/step_4/D4
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 114  ( 114 )   Summary  = 632  ( 632 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 114  ( 114 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 252  ( 252 )
-TOLERANCE   : MaxTol   = 0.0005616643498  ( 0.0005616643498 )  AvgTol   =  0.0001090450864  (  0.0001090450863 )
+TOLERANCE   : MaxTol   = 0.000614038038  ( 0.002229059815 )  AvgTol   =  0.0001163919322  (  0.0003895058511 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/D7 b/tests/de/step_4/D7
index 79a7b12972..69aea35df8 100644
--- a/tests/de/step_4/D7
+++ b/tests/de/step_4/D7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename r65b-pe.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 14  ( 4 )  Summary  = 14  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 676  ( 676 )   Summary  = 4405  ( 4405 )
 STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 676  ( 676 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1789  ( 1789 )
-TOLERANCE   : MaxTol   = 0.0006316631238  ( 0.0006316631238 )  AvgTol   =  1.900834081e-005  (  1.900839893e-005 )
+TOLERANCE   : MaxTol   = 0.002842802207  (  0.01045213326 )  AvgTol   =  9.202667589e-005  (  0.001200450607 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 680  ( 680 )  N2Labels = 0  ( 0 )   TotalLabels = 685  ( 685 )   NameLabels = 9  ( 9 )   ColorLabels = 0  ( 0 )   LayerLabels = 676  ( 676 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/D9 b/tests/de/step_4/D9
index 1964715066..b5f9c05841 100644
--- a/tests/de/step_4/D9
+++ b/tests/de/step_4/D9
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 308  ( 115 )  Summary  = 308  ( 11
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 742  ( 742 )   Summary  = 5060  ( 5060 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 742  ( 742 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2108  ( 2108 )
-TOLERANCE   : MaxTol   = 0.008481946718  ( 0.008481946718 )  AvgTol   =  0.0001352398423  (  0.0001311596967 )
+TOLERANCE   : MaxTol   = 0.008481946718  (  0.01167681549 )  AvgTol   =  0.0001367132065  (  0.0002869491135 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/E1 b/tests/de/step_4/E1
index 978aed033c..a6476b3cd4 100644
--- a/tests/de/step_4/E1
+++ b/tests/de/step_4/E1
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename test-m020306-v2.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 317  ( 158 )  Summary  = 317  ( 15
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 956  ( 956 )   Summary  = 6474  ( 6474 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 956  ( 956 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2681  ( 2681 )
-TOLERANCE   : MaxTol   = 0.008481946718  ( 0.008481946718 )  AvgTol   =  0.0001073574929  (  0.0001044251274 )
+TOLERANCE   : MaxTol   = 0.008481946718  (  0.01167681549 )  AvgTol   =  0.0001210014254  (  0.0003580069299 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/E2 b/tests/de/step_4/E2
index 654a57efaa..cdd9ab3429 100644
--- a/tests/de/step_4/E2
+++ b/tests/de/step_4/E2
@@ -5,9 +5,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 41 )  Summary  = 1  ( 41 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 183  ( 183 )   Summary  = 1129  ( 1129 )
-STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 183  ( 183 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 451  ( 451 )
-TOLERANCE   : MaxTol   = 0.005574366633  ( 0.005574366525 )  AvgTol   =  0.001085607716  (  0.001089613543 )
+NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 183  ( 183 )   Summary  = 1130  ( 1129 )
+STATSHAPE   : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 183  ( 183 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 452  ( 451 )
+TOLERANCE   : MaxTol   = 0.005574366633  ( 0.008564797627 )  AvgTol   =  0.001164173051  (   0.00186707582 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 2  ( 2 )   ColorLabels = 4  ( 4 )   LayerLabels = 4  ( 4 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_4/E3 b/tests/de/step_4/E3
index ee4af6ef71..9a71ad6466 100644
--- a/tests/de/step_4/E3
+++ b/tests/de/step_4/E3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 8 )  Summary  = 1  ( 8 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 621  ( 621 )   Summary  = 3645  ( 3645 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 621  ( 621 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1508  ( 1508 )
-TOLERANCE   : MaxTol   = 0.003228376485  (  0.06828121929 )  AvgTol   =  0.0002204490951  (  0.0004136533175 )
+TOLERANCE   : MaxTol   = 0.009440276946  (  0.06828121929 )  AvgTol   =  0.002406489515  (  0.006125964434 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/E6 b/tests/de/step_4/E6
index e98ad831d4..1ec267a108 100644
--- a/tests/de/step_4/E6
+++ b/tests/de/step_4/E6
@@ -7,7 +7,7 @@ set filename trj12_b3-ac-214.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 27  ( 108 )  Summary  = 27  ( 108 )
-CHECKSHAPE  : Wires    = 3  ( 3 )  Faces    = 3  ( 3 )  Shells   = 1  ( 1 )   Solids   = 1 ( 1 )
+CHECKSHAPE  : Wires    = 3  ( 4 )  Faces    = 3  ( 4 )  Shells   = 1  ( 1 )   Solids   = 1 ( 1 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1173  ( 1173 )   Summary  = 7998  ( 8005 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1173  ( 1173 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3392  ( 3399 )
 TOLERANCE   : MaxTol   =    7.063782203  (    7.063782203 )  AvgTol   =  0.002932793725  (  0.002941805253 )
diff --git a/tests/de/step_4/E8 b/tests/de/step_4/E8
index 551d4cf7ba..a42f98cd34 100644
--- a/tests/de/step_4/E8
+++ b/tests/de/step_4/E8
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 0 )  Summary  = 2  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 22  ( 22 )  Shell    = 22  ( 22 )  Face     = 1355  ( 1355 )   Summary  = 9094  ( 9094 )
 STATSHAPE   : Solid    = 24  ( 24 )  Shell    = 24  ( 24 )  Face     = 1388  ( 1388 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3746  ( 3746 )
-TOLERANCE   : MaxTol   = 0.001929504374  ( 0.001929504374 )  AvgTol   =  7.011820246e-006  (  7.01182817e-006 )
+TOLERANCE   : MaxTol   = 0.001976478297  (  0.01468477155 )  AvgTol   =  1.143821627e-005  (  6.778351767e-005 )
 LABELS      : N0Labels = 21  ( 21 )  N1Labels = 22  ( 22 )  N2Labels = 0  ( 0 )   TotalLabels = 43  ( 43 )   NameLabels = 43  ( 43 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/E9 b/tests/de/step_4/E9
index 375ed1c094..d245be8e3d 100644
--- a/tests/de/step_4/E9
+++ b/tests/de/step_4/E9
@@ -5,9 +5,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 20 )  Summary  = 4  ( 20 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 13  ( 13 )  Shell    = 13  ( 13 )  Face     = 801  ( 801 )   Summary  = 4582  ( 4580 )
-STATSHAPE   : Solid    = 32  ( 32 )  Shell    = 32  ( 32 )  Face     = 840  ( 840 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1835  ( 1833 )
-TOLERANCE   : MaxTol   = 0.000994818338  ( 0.0009948282861 )  AvgTol   =  7.81087616e-006  (  7.816444503e-006 )
+NBSHAPES    : Solid    = 13  ( 13 )  Shell    = 13  ( 13 )  Face     = 801  ( 801 )   Summary  = 4580  ( 4580 )
+STATSHAPE   : Solid    = 32  ( 32 )  Shell    = 32  ( 32 )  Face     = 840  ( 840 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1833  ( 1833 )
+TOLERANCE   : MaxTol   = 0.000994818338  ( 0.001450971274 )  AvgTol   =  8.127480807e-006  (  2.899963831e-005 )
 LABELS      : N0Labels = 21  ( 21 )  N1Labels = 39  ( 39 )  N2Labels = 0  ( 0 )   TotalLabels = 60  ( 60 )   NameLabels = 60  ( 60 )   ColorLabels = 13  ( 13 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 21  ( 21 )  Volume   = 21  ( 21 )  Area     = 21  ( 21 )
 NCOLORS     : NColors  = 7  ( 7 )
diff --git a/tests/de/step_4/F1 b/tests/de/step_4/F1
index b6c6cad0a3..67b964e478 100644
--- a/tests/de/step_4/F1
+++ b/tests/de/step_4/F1
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 23 )  Summary  = 2  ( 23 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 5  ( 5 )  Face     = 784  ( 784 )   Summary  = 4701  ( 4701 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 5  ( 5 )  Face     = 784  ( 784 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1925  ( 1925 )
-TOLERANCE   : MaxTol   =  0.02086436459  (  0.02086436459 )  AvgTol   =  0.002823994995  (  0.002818906511 )
+TOLERANCE   : MaxTol   =  0.02086436459  (  0.02261143715 )  AvgTol   =  0.003291519582  (  0.004212332857 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/G3 b/tests/de/step_4/G3
index 3d7fdf4ce1..453264d5e0 100644
--- a/tests/de/step_4/G3
+++ b/tests/de/step_4/G3
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 28 )  Summary  = 1  ( 28 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 5  ( 5 )  Shell    = 5  ( 5 )  Face     = 116  ( 116 )   Summary  = 595  ( 595 )
 STATSHAPE   : Solid    = 5  ( 5 )  Shell    = 5  ( 5 )  Face     = 116  ( 116 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 224  ( 224 )
-TOLERANCE   : MaxTol   = 0.003174825282  (  0.00317482528 )  AvgTol   =  0.0006647149041  (  0.0006661597539 )
+TOLERANCE   : MaxTol   = 0.003174825282  ( 0.008013510512 )  AvgTol   =  0.0008311294237  (  0.001823513991 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 5  ( 5 )  N2Labels = 0  ( 0 )   TotalLabels = 6  ( 6 )   NameLabels = 1  ( 1 )   ColorLabels = 5  ( 5 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_4/G4 b/tests/de/step_4/G4
index a1ca90fbb7..361f81fd28 100644
--- a/tests/de/step_4/G4
+++ b/tests/de/step_4/G4
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 28 )  Summary  = 1  ( 28 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 5  ( 5 )  Shell    = 5  ( 5 )  Face     = 116  ( 116 )   Summary  = 595  ( 595 )
 STATSHAPE   : Solid    = 5  ( 5 )  Shell    = 5  ( 5 )  Face     = 116  ( 116 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 224  ( 224 )
-TOLERANCE   : MaxTol   = 0.001062703295  ( 0.001062703292 )  AvgTol   =  0.0001903680252  (  0.0001918127936 )
+TOLERANCE   : MaxTol   = 0.001062703295  ( 0.003953957958 )  AvgTol   =  0.0002444882442  (  0.0005511075925 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 5  ( 5 )  N2Labels = 0  ( 0 )   TotalLabels = 6  ( 6 )   NameLabels = 1  ( 1 )   ColorLabels = 5  ( 5 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_4/G5 b/tests/de/step_4/G5
index 3afe5543fd..d319370878 100644
--- a/tests/de/step_4/G5
+++ b/tests/de/step_4/G5
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 58  ( 27 )  Summary  = 58  ( 27 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 7  ( 7 )  Shell    = 7  ( 7 )  Face     = 780  ( 780 )   Summary  = 4769  ( 4769 )
 STATSHAPE   : Solid    = 21  ( 21 )  Shell    = 21  ( 21 )  Face     = 920  ( 920 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1970  ( 1970 )
-TOLERANCE   : MaxTol   = 0.002209209821  ( 0.002209209821 )  AvgTol   =  0.0001089153771  (  0.0001089325994 )
+TOLERANCE   : MaxTol   =  0.01997667502  (  0.04427257303 )  AvgTol   =  0.001806728967  (  0.006835266532 )
 LABELS      : N0Labels = 9  ( 9 )  N1Labels = 22  ( 22 )  N2Labels = 0  ( 0 )   TotalLabels = 31  ( 31 )   NameLabels = 31  ( 31 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/G7 b/tests/de/step_4/G7
index 92da668d93..f1575c325c 100644
--- a/tests/de/step_4/G7
+++ b/tests/de/step_4/G7
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 set LinuxDiff 2
@@ -10,8 +9,8 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 5  ( 43 )  Summary  = 5  ( 43 )
 CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2523  ( 2523 )   Summary  = 16185  ( 16187 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2523  ( 2523 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 6806  ( 6808 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2523  ( 2523 )   Summary  = 16185  ( 16185 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2523  ( 2523 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 6806  ( 6806 )
 TOLERANCE   : MaxTol   =    9.829787663  (    7.812889886 )  AvgTol   =   0.01764242132  (   0.01681498017 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
diff --git a/tests/de/step_4/G8 b/tests/de/step_4/G8
index 12868a44f9..f97483d13c 100644
--- a/tests/de/step_4/G8
+++ b/tests/de/step_4/G8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename bm4_sd_seal_b.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 146  ( 11 )  Summary  = 146  ( 11
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 540  ( 540 )   Summary  = 2968  ( 2968 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 540  ( 540 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1202  ( 1202 )
-TOLERANCE   : MaxTol   = 6.82509241e-006  ( 6.825090868e-006 )  AvgTol   =  8.413455292e-007  (  8.416840454e-007 )
+TOLERANCE   : MaxTol   = 6.82509241e-006  ( 0.0002065359589 )  AvgTol   =  8.53535451e-007  (  7.209454306e-006 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/H1 b/tests/de/step_4/H1
index b9f5f7f80e..cf5bc49f62 100644
--- a/tests/de/step_4/H1
+++ b/tests/de/step_4/H1
@@ -1,5 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
+puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 
 
 set filename Inventor_Engine.stp
@@ -7,10 +7,10 @@ set filename Inventor_Engine.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 448  ( 560 )  Summary  = 448  ( 560 )
-CHECKSHAPE  : Wires    = 3  ( 3 )  Faces    = 3  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 47  ( 47 )  Shell    = 47  ( 47 )  Face     = 4455  ( 4455 )   Summary  = 27797  ( 27799 )
-STATSHAPE   : Solid    = 80  ( 80 )  Shell    = 80  ( 80 )  Face     = 5359  ( 5359 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 11462  ( 11464 )
-TOLERANCE   : MaxTol   =      0.8136128  (      0.8136128 )  AvgTol   =  0.0007561422842  (  0.0007592268611 )
+CHECKSHAPE  : Wires    = 9  ( 6 )  Faces    = 9  ( 6 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+NBSHAPES    : Solid    = 47  ( 47 )  Shell    = 47  ( 47 )  Face     = 4455  ( 4455 )   Summary  = 27804  ( 27803 )
+STATSHAPE   : Solid    = 80  ( 80 )  Shell    = 80  ( 80 )  Face     = 5359  ( 5359 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 11467  ( 11467 )
+TOLERANCE   : MaxTol   =    2.429208989  (    2.450580634 )  AvgTol   =  0.003235414897  (  0.002917423634 )
 LABELS      : N0Labels = 52  ( 52 )  N1Labels = 86  ( 86 )  N2Labels = 0  ( 0 )   TotalLabels = 138  ( 138 )   NameLabels = 136  ( 136 )   ColorLabels = 47  ( 47 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 11  ( 11 )
diff --git a/tests/de/step_4/H3 b/tests/de/step_4/H3
index 78e408d3ca..48ebe32733 100644
--- a/tests/de/step_4/H3
+++ b/tests/de/step_4/H3
@@ -5,9 +5,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 57  ( 113 )  Summary  = 57  ( 113 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 528  ( 528 )   Summary  = 3347  ( 3347 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 528  ( 528 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1405  ( 1405 )
-TOLERANCE   : MaxTol   =   0.1201139499  (   0.1201139499 )  AvgTol   =  0.001379723391  (  0.001384670358 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 528  ( 528 )   Summary  = 3346  ( 3346 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 528  ( 528 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1404  ( 1404 )
+TOLERANCE   : MaxTol   =   0.1201139499  (   0.1201139499 )  AvgTol   =  0.001743497401  (  0.001912088277 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/H4 b/tests/de/step_4/H4
index 0104940dea..1960b00768 100644
--- a/tests/de/step_4/H4
+++ b/tests/de/step_4/H4
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 34  ( 124 )  Summary  = 34  ( 124
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2256  ( 2256 )   Summary  = 14108  ( 14108 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2256  ( 2256 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 5915  ( 5915 )
-TOLERANCE   : MaxTol   =   0.2529794249  (   0.2529794249 )  AvgTol   =   0.01190535765  (   0.01190568661 )
+TOLERANCE   : MaxTol   =   0.2529794249  (   0.2529794249 )  AvgTol   =    0.0126158781  (   0.01261497345 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 5366  ( 5366 )  N2Labels = 0  ( 0 )   TotalLabels = 5367  ( 5367 )   NameLabels = 1  ( 1 )   ColorLabels = 5367  ( 5367 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/step_4/H5 b/tests/de/step_4/H5
index 78ffe06da9..e42a76e2d9 100644
--- a/tests/de/step_4/H5
+++ b/tests/de/step_4/H5
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 8 )  Summary  = 8  ( 8 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 523  ( 523 )   Summary  = 3681  ( 3681 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 523  ( 523 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1541  ( 1541 )
-TOLERANCE   : MaxTol   =  0.01219759888  (  0.02668085138 )  AvgTol   =   0.00158102557  (  0.002374353417 )
+TOLERANCE   : MaxTol   =  0.01992087066  (  0.05869739556 )  AvgTol   =  0.003202413767  (  0.008376755892 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 347  ( 347 )  N2Labels = 0  ( 0 )   TotalLabels = 348  ( 348 )   NameLabels = 1  ( 1 )   ColorLabels = 348  ( 348 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/step_4/H7 b/tests/de/step_4/H7
index 92a84514be..b50286fa44 100644
--- a/tests/de/step_4/H7
+++ b/tests/de/step_4/H7
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 24  ( 35 )  Summary  = 24  ( 35 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 808  ( 808 )   Summary  = 5106  ( 5106 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 808  ( 808 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2103  ( 2103 )
-TOLERANCE   : MaxTol   = 0.004098271686  ( 0.004098271686 )  AvgTol   =  0.0001631121394  (  0.0001631269749 )
+TOLERANCE   : MaxTol   = 0.004098271686  ( 0.009717043682 )  AvgTol   =  0.0001699689926  (  0.000401998914 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/H8 b/tests/de/step_4/H8
index a8c2b87873..b36604096d 100644
--- a/tests/de/step_4/H8
+++ b/tests/de/step_4/H8
@@ -5,9 +5,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 31 )  Summary  = 6  ( 31 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1048  ( 1048 )   Summary  = 7158  ( 7158 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1048  ( 1048 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3011  ( 3011 )
-TOLERANCE   : MaxTol   =   0.2096553196  (   0.2096553196 )  AvgTol   =  0.0001363015085  (  0.0001365184997 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1049  ( 1049 )   Summary  = 7165  ( 7163 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1049  ( 1049 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3015  ( 3013 )
+TOLERANCE   : MaxTol   =   0.2096553196  (   0.2096553196 )  AvgTol   =  0.0006174123099  (  0.006216471924 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/I1 b/tests/de/step_4/I1
index e8bb3466e8..a6871bf3f9 100644
--- a/tests/de/step_4/I1
+++ b/tests/de/step_4/I1
@@ -9,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 207  ( 290 )  Summary  = 207  ( 29
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 3  ( 3 )  Face     = 773  ( 773 )   Summary  = 4593  ( 4592 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 3  ( 3 )  Face     = 773  ( 773 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1942  ( 1941 )
-TOLERANCE   : MaxTol   =  0.05634911309  (  0.05634912743 )  AvgTol   =  0.001751485937  (  0.001777891629 )
+TOLERANCE   : MaxTol   =  0.05634911309  (  0.05634912759 )  AvgTol   =  0.001986523285  (  0.002335236954 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/I2 b/tests/de/step_4/I2
index 2d42a10667..7f1bc14cd4 100644
--- a/tests/de/step_4/I2
+++ b/tests/de/step_4/I2
@@ -5,9 +5,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 325  ( 349 )  Summary  = 325  ( 349 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1858  ( 1858 )   Summary  = 12119  ( 12119 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1858  ( 1858 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 5030  ( 5030 )
-TOLERANCE   : MaxTol   = 0.009518071089  ( 0.009517975925 )  AvgTol   =  0.0007802764376  (  0.0007803790317 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1858  ( 1858 )   Summary  = 12120  ( 12119 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1858  ( 1858 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 5031  ( 5030 )
+TOLERANCE   : MaxTol   = 0.009518071089  ( 0.009998449827 )  AvgTol   =  0.0009555906781  (   0.00143467031 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 858  ( 858 )  N2Labels = 0  ( 0 )   TotalLabels = 859  ( 859 )   NameLabels = 1  ( 1 )   ColorLabels = 859  ( 859 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_5/A1 b/tests/de/step_5/A1
index e357f2126a..f7edc0f686 100755
--- a/tests/de/step_5/A1
+++ b/tests/de/step_5/A1
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 114  ( 619 )  Summary  = 114  ( 61
 CHECKSHAPE  : Wires    = 16  ( 17 )  Faces    = 18  ( 19 )  Shells   = 1  ( 1 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 22  ( 22 )  Shell    = 24  ( 24 )  Face     = 1520  ( 1520 )   Summary  = 11223  ( 11206 )
 STATSHAPE   : Solid    = 22  ( 22 )  Shell    = 24  ( 24 )  Face     = 1520  ( 1520 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 4792  ( 4781 )
-TOLERANCE   : MaxTol   =    12.54913924  (    7.159520237 )  AvgTol   =   0.04169462776  (   0.03222638333 )
+TOLERANCE   : MaxTol   =    12.54913924  (    7.159520237 )  AvgTol   =   0.04320092698  (    0.0322263844 )
 LABELS      : N0Labels = 25  ( 25 )  N1Labels = 23  ( 23 )  N2Labels = 0  ( 0 )   TotalLabels = 48  ( 48 )   NameLabels = 48  ( 48 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_5/A2 b/tests/de/step_5/A2
index bdd06271a2..8c92233463 100644
--- a/tests/de/step_5/A2
+++ b/tests/de/step_5/A2
@@ -8,9 +8,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 323  ( 263 )  Summary  = 323  ( 263 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2278  ( 2278 )   Summary  = 14219  ( 14212 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2278  ( 2278 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 5964  ( 5957 )
-TOLERANCE   : MaxTol   = 0.005454457468  ( 0.005454457467 )  AvgTol   =  0.0004112220229  (  0.0004105811714 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2278  ( 2278 )   Summary  = 14216  ( 14212 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2278  ( 2278 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 5961  ( 5957 )
+TOLERANCE   : MaxTol   = 0.005454457084  ( 0.009853899986 )  AvgTol   =  0.0004504506414  (  0.001189530258 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 5448  ( 5448 )  N2Labels = 0  ( 0 )   TotalLabels = 5449  ( 5449 )   NameLabels = 1  ( 1 )   ColorLabels = 5449  ( 5449 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/step_5/A3 b/tests/de/step_5/A3
index 70ff1394fd..afb49702c6 100644
--- a/tests/de/step_5/A3
+++ b/tests/de/step_5/A3
@@ -5,9 +5,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 8 )  Summary  = 8  ( 8 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 523  ( 523 )   Summary  = 3682  ( 3681 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 523  ( 523 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1542  ( 1541 )
-TOLERANCE   : MaxTol   =  0.01219759888  (  0.02668085138 )  AvgTol   =  0.001581478301  (  0.002374353417 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 523  ( 523 )   Summary  = 3681  ( 3681 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 523  ( 523 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1541  ( 1541 )
+TOLERANCE   : MaxTol   =  0.01992087066  (  0.05869739556 )  AvgTol   =  0.003263131163  (  0.008376755893 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 347  ( 347 )  N2Labels = 0  ( 0 )   TotalLabels = 348  ( 348 )   NameLabels = 1  ( 1 )   ColorLabels = 348  ( 348 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/step_5/A4 b/tests/de/step_5/A4
index 14b8c1b443..776d188162 100644
--- a/tests/de/step_5/A4
+++ b/tests/de/step_5/A4
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename wgehaeuse_solid.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 88  ( 70 )  Summary  = 88  ( 70 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 37  ( 37 )  Shell    = 58  ( 58 )  Face     = 2694  ( 2694 )   Summary  = 15919  ( 15919 )
 STATSHAPE   : Solid    = 81  ( 81 )  Shell    = 104  ( 104 )  Face     = 3190  ( 3190 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 6451  ( 6451 )
-TOLERANCE   : MaxTol   =  0.07893772536  (  0.07893770763 )  AvgTol   =  0.0001930293361  (  0.0002388152386 )
+TOLERANCE   : MaxTol   =  0.07893772536  (  0.07893770763 )  AvgTol   =   0.00122544179  (   0.00660493083 )
 LABELS      : N0Labels = 37  ( 37 )  N1Labels = 76  ( 76 )  N2Labels = 0  ( 0 )   TotalLabels = 113  ( 113 )   NameLabels = 113  ( 113 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_5/A5 b/tests/de/step_5/A5
index 6913e5c639..32245c46af 100644
--- a/tests/de/step_5/A5
+++ b/tests/de/step_5/A5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename r0801_id.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 220  ( 206 )  Summary  = 220  ( 20
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1327  ( 1327 )   Summary  = 9260  ( 9174 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1327  ( 1327 )   FreeWire = 0  ( 0 )   FreeEdge  = 84 ( 84 )   SharedEdge = 3872  ( 3871 )
-TOLERANCE   : MaxTol   =   0.0796871773  (  0.07968717732 )  AvgTol   =  0.0006261194411  (  0.0006235910117 )
+TOLERANCE   : MaxTol   =   0.0796871773  (  0.07968717732 )  AvgTol   =  0.0006766809625  (  0.001248001549 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 3707  ( 3707 )  N2Labels = 0  ( 0 )   TotalLabels = 3710  ( 3710 )   NameLabels = 5  ( 5 )   ColorLabels = 3706  ( 3706 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 8  ( 8 )
diff --git a/tests/de/step_5/A7 b/tests/de/step_5/A7
index b79794807b..1d34a91a41 100644
--- a/tests/de/step_5/A7
+++ b/tests/de/step_5/A7
@@ -5,9 +5,9 @@ set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 44  ( 491 )  Summary  = 44  ( 491 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 81  ( 81 )  Shell    = 82  ( 82 )  Face     = 2729  ( 2729 )   Summary  = 17298  ( 17298 )
-STATSHAPE   : Solid    = 99  ( 99 )  Shell    = 100  ( 100 )  Face     = 3044  ( 3044 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 6924  ( 6924 )
-TOLERANCE   : MaxTol   = 0.009468939314  (  0.02905820302 )  AvgTol   =  0.000265260034  (  0.0002778661191 )
+NBSHAPES    : Solid    = 81  ( 81 )  Shell    = 82  ( 82 )  Face     = 2729  ( 2729 )   Summary  = 17300  ( 17300 )
+STATSHAPE   : Solid    = 99  ( 99 )  Shell    = 100  ( 100 )  Face     = 3044  ( 3044 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 6925  ( 6925 )
+TOLERANCE   : MaxTol   = 0.009468939314  (  0.02905820302 )  AvgTol   =  0.0002800110602  (  0.0005350104835 )
 LABELS      : N0Labels = 91  ( 91 )  N1Labels = 102  ( 102 )  N2Labels = 0  ( 0 )   TotalLabels = 193  ( 193 )   NameLabels = 193  ( 193 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 91  ( 91 )  Volume   = 91  ( 91 )  Area     = 91  ( 91 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_5/B2 b/tests/de/step_5/B2
index fe7a549efc..0f7c9535d2 100644
--- a/tests/de/step_5/B2
+++ b/tests/de/step_5/B2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 
 
 set filename tr10_r0601_id.stp
@@ -10,7 +9,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 220  ( 206 )  Summary  = 220  ( 20
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1327  ( 1327 )   Summary  = 9260  ( 9174 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1327  ( 1327 )   FreeWire = 0  ( 0 )   FreeEdge  = 84 ( 84 )   SharedEdge = 3872  ( 3871 )
-TOLERANCE   : MaxTol   =   0.0796871773  (  0.07968717732 )  AvgTol   =  0.0006261194411  (  0.0006235910117 )
+TOLERANCE   : MaxTol   =   0.0796871773  (  0.07968717732 )  AvgTol   =  0.0006764981779  (  0.001240885709 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 3707  ( 3707 )  N2Labels = 0  ( 0 )   TotalLabels = 3710  ( 3710 )   NameLabels = 5  ( 5 )   ColorLabels = 3706  ( 3706 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 8  ( 8 )
diff --git a/tests/xcaf/brep_to_stp_add_CL/I6 b/tests/xcaf/brep_to_stp_add_CL/I6
index f80ef5672e..8f21cf278c 100644
--- a/tests/xcaf/brep_to_stp_add_CL/I6
+++ b/tests/xcaf/brep_to_stp_add_CL/I6
@@ -4,14 +4,10 @@ puts "TODO OCC23213 ALL: Error : Compared documents have different LAYERS for th
 
 puts "TODO OCC23213 ALL: Error : Compared documents have different LAYERS for the shape located on 0:1:1:7 label"
 
-puts "TODO OCC23213 ALL: Error : Compared documents have different LAYERS for the shape located on 0:1:1:12 label"
-
 puts "TODO OCC23213 ALL: Error : Compared documents have different LAYERS for the shape located on 0:1:1:15 label"
 
 puts "TODO OCC23213 ALL: Error : Compared documents have different LAYERS for the shape located on 0:1:1:18 label"
 
-puts "TODO OCC23213 ALL: Error : Compared documents have different LAYERS for the shape located on 0:1:1:23 label"
-
 puts "TODO OCC23213 ALL: Error : errors occur during test"
 
 restore [locate_data_file xx.brep] Shape1