diff --git a/src/Interface/Interface_CheckTool.cxx b/src/Interface/Interface_CheckTool.cxx
index e7fa126e75..077c7de29a 100644
--- a/src/Interface/Interface_CheckTool.cxx
+++ b/src/Interface/Interface_CheckTool.cxx
@@ -267,18 +267,18 @@ Interface_CheckIterator Interface_CheckTool::CompleteCheckList ()
     try {
       OCC_CATCH_SIGNALS
       for (i = n0; i <= nb; i ++) {
-	ach->Clear();
-	ent = model->Value(i);
-	ach->SetEntity(ent);
-	if (model->IsReportEntity(i)) {
-	  ach = model->ReportEntity(i)->Check();  // INCLUT Unknown
-	  if (ach->HasFailed())      // FAIL : pas de Check semantique
-	    {  res.Add(ach,i);  thestat |= 12;  continue;  }
-	}
-	if (!model->HasSemanticChecks()) FillCheck(ent,theshare,ach);
-	else ach->GetMessages (model->Check (i,Standard_False));
-	if (ach->HasFailed() || ach->HasWarnings())
-	  { res.Add(ach,i); if (ach->HasFailed())  thestat |= 12; }
+        ach->Clear();
+        ent = model->Value(i);
+        ach->SetEntity(ent);
+        if (model->IsReportEntity(i)) {
+          ach = model->ReportEntity(i)->Check();  // INCLUT Unknown
+          if (ach->HasFailed())      // FAIL : pas de Check semantique
+          {  res.Add(ach,i);  ach = new Interface_Check;  thestat |= 12;  continue;  }
+        }
+        if (!model->HasSemanticChecks()) FillCheck(ent,theshare,ach);
+        else ach->GetMessages (model->Check (i,Standard_False));
+        if (ach->HasFailed() || ach->HasWarnings())
+        { res.Add(ach,i);  ach = new Interface_Check;  if (ach->HasFailed())  thestat |= 12; }
       }
       n0 = nb+1;
     }
diff --git a/tests/bugs/xde/bug25176 b/tests/bugs/xde/bug25176
new file mode 100644
index 0000000000..be599fdcef
--- /dev/null
+++ b/tests/bugs/xde/bug25176
@@ -0,0 +1,20 @@
+puts "=========="
+puts "OCC25176"
+puts "=========="
+puts ""
+######################################################################
+# STEP Reader - no error report if referenced entity has wrong type
+######################################################################
+
+
+stepread [locate_data_file bug25176_occ25176.stp] step *
+
+decho off
+set Log [data c]
+decho on
+
+if {![regexp {F:APPLICATION_PROTOCOL_DEFINITION: Parameter n0.4} $Log]} {
+  puts "Error: wrong report on wrong type entity"
+} else {
+  puts "OK: correct report on wrong type entity"
+}
diff --git a/tests/de/iges_1/G7 b/tests/de/iges_1/G7
index 7050274b31..1c133d7e9a 100644
--- a/tests/de/iges_1/G7
+++ b/tests/de/iges_1/G7
@@ -2,12 +2,12 @@
 set filename frame.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 5003 )  Warnings = 0  ( 0 )  Summary  = 0  ( 5003 )
+DATA        : Faulties = 0  ( 9875 )  Warnings = 0  ( 2629 )  Summary  = 0  ( 12504 )
 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    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 2830  ( 2830 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 0  ( 0 )   FreeEdge  = 944 ( 944 )   SharedEdge = 944  ( 944 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 944  ( 944 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 944  ( 944 )   NameLabels = 944  ( 944 )   ColorLabels = 944  ( 944 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/iges_1/I5 b/tests/de/iges_1/I5
index fc3b21b529..e10327a1ca 100644
--- a/tests/de/iges_1/I5
+++ b/tests/de/iges_1/I5
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename BUC61004-1.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 4 )  Warnings = 0  ( 0 )  Summary  = 0  ( 4 )
 TPSTAT      : Faulties = 0  ( 4 )  Warnings = 0  ( 312 )  Summary  = 0  ( 316 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 241  ( 241 )   Summary  = 9983  ( 9983 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 241  ( 241 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 4776  ( 4776 )
-TOLERANCE   : MaxTol   = 9.452110694e-006  (         1e-005 )  AvgTol   =  1.744349671e-007  (  8.133454698e-006 )
+TOLERANCE   : MaxTol   = 9.452110694e-06  (          1e-05 )  AvgTol   =  1.744349671e-07  (  8.133454698e-06 )
 LABELS      : N0Labels = 241  ( 241 )  N1Labels = 0  ( 83 )  N2Labels = 0  ( 0 )   TotalLabels = 241  ( 324 )   NameLabels = 241  ( 241 )   ColorLabels = 241  ( 324 )   LayerLabels = 241  ( 324 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/iges_1/I6 b/tests/de/iges_1/I6
index 573f2a6b66..e35df2a43b 100644
--- a/tests/de/iges_1/I6
+++ b/tests/de/iges_1/I6
@@ -5,7 +5,7 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename BUC61004-2.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 1 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 0  ( 1 )  Warnings = 8  ( 427 )  Summary  = 8  ( 428 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 180  ( 180 )   Summary  = 19884  ( 19884 )
diff --git a/tests/de/iges_1/J9 b/tests/de/iges_1/J9
index cfbb818ddd..8e5158b6a7 100644
--- a/tests/de/iges_1/J9
+++ b/tests/de/iges_1/J9
@@ -5,8 +5,8 @@ puts "TODO CR23096 ALL: TPSTAT : Faulty"
 set filename CTS21655.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 1 )  Summary  = 0  ( 1 )
-TPSTAT      : Faulties = 0  ( 28 )  Warnings = 115  ( 7 )  Summary  = 115  ( 35 )
+DATA        : Faulties = 0  ( 12 )  Warnings = 0  ( 1 )  Summary  = 0  ( 13 )
+TPSTAT      : Faulties = 0  ( 28 )  Warnings = 116  ( 7 )  Summary  = 116  ( 35 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 1 )   Solids   = 0 ( 1 )
 NBSHAPES    : Solid    = 0  ( 18 )  Shell    = 0  ( 18 )  Face     = 1190  ( 1190 )   Summary  = 15075  ( 7693 )
 STATSHAPE   : Solid    = 0  ( 18 )  Shell    = 0  ( 18 )  Face     = 1190  ( 1190 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 6284  ( 3134 )
diff --git a/tests/de/iges_1/O6 b/tests/de/iges_1/O6
index 287857539c..af83f06563 100644
--- a/tests/de/iges_1/O6
+++ b/tests/de/iges_1/O6
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename USA60023-2.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 TPSTAT      : Faulties = 0  ( 1 )  Warnings = 0  ( 16 )  Summary  = 0  ( 17 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 14893  ( 15168 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 16  ( 16 )   FreeEdge  = 5288 ( 5288 )   SharedEdge = 5288  ( 5288 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 4160  ( 4160 )  N1Labels = 286  ( 562 )  N2Labels = 0  ( 0 )   TotalLabels = 4446  ( 4722 )   NameLabels = 4160  ( 4160 )   ColorLabels = 3040  ( 3061 )   LayerLabels = 4382  ( 4402 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/iges_1/O7 b/tests/de/iges_1/O7
index cab4dcf2c7..a5832da16a 100644
--- a/tests/de/iges_1/O7
+++ b/tests/de/iges_1/O7
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename USA60023-3.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 68 )  Summary  = 0  ( 68 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 12439  ( 12441 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 68  ( 68 )   FreeEdge  = 4391 ( 4391 )   SharedEdge = 4391  ( 4391 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 3170  ( 3170 )  N1Labels = 524  ( 526 )  N2Labels = 0  ( 0 )   TotalLabels = 3694  ( 3696 )   NameLabels = 3170  ( 3170 )   ColorLabels = 2514  ( 2564 )   LayerLabels = 3596  ( 3662 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/iges_1/O8 b/tests/de/iges_1/O8
index 5bab6c3da0..f7865f9397 100644
--- a/tests/de/iges_1/O8
+++ b/tests/de/iges_1/O8
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename USA60023-4.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 0  ( 39 )  Warnings = 0  ( 12 )  Summary  = 0  ( 51 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 14914  ( 15469 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 9  ( 9 )   FreeEdge  = 5039 ( 5039 )   SharedEdge = 5039  ( 5039 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 4555  ( 4555 )  N1Labels = 328  ( 884 )  N2Labels = 0  ( 0 )   TotalLabels = 4883  ( 5439 )   NameLabels = 4555  ( 4555 )   ColorLabels = 3752  ( 4340 )   LayerLabels = 4851  ( 4868 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/iges_1/O9 b/tests/de/iges_1/O9
index e0d6de6511..4ac1f5a867 100644
--- a/tests/de/iges_1/O9
+++ b/tests/de/iges_1/O9
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename USA60023-5.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 0  ( 34 )  Warnings = 0  ( 14 )  Summary  = 0  ( 48 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 10899  ( 10899 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 13  ( 13 )   FreeEdge  = 3713 ( 3713 )   SharedEdge = 3713  ( 3713 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 3397  ( 3397 )  N1Labels = 134  ( 134 )  N2Labels = 0  ( 0 )   TotalLabels = 3531  ( 3531 )   NameLabels = 3397  ( 3397 )   ColorLabels = 2538  ( 2578 )   LayerLabels = 3467  ( 3500 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/iges_1/P1 b/tests/de/iges_1/P1
index c8f0b23720..1f4bc874d0 100644
--- a/tests/de/iges_1/P1
+++ b/tests/de/iges_1/P1
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename USA60023-6.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 TPSTAT      : Faulties = 0  ( 44 )  Warnings = 0  ( 24 )  Summary  = 0  ( 68 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 9878  ( 9879 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 17  ( 17 )   FreeEdge  = 3356 ( 3356 )   SharedEdge = 3356  ( 3356 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 2998  ( 2998 )  N1Labels = 195  ( 202 )  N2Labels = 0  ( 0 )   TotalLabels = 3193  ( 3200 )   NameLabels = 2998  ( 2998 )   ColorLabels = 2187  ( 2225 )   LayerLabels = 3162  ( 3184 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/iges_1/Q2 b/tests/de/iges_1/Q2
index b697ded41a..307f22dbd6 100644
--- a/tests/de/iges_1/Q2
+++ b/tests/de/iges_1/Q2
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename ims014.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 26 )  Warnings = 0  ( 0 )  Summary  = 0  ( 26 )
+DATA        : Faulties = 0  ( 1096 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1096 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 15 )  Summary  = 0  ( 15 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 106  ( 106 )   Summary  = 2199  ( 2199 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 106  ( 106 )   FreeWire = 0  ( 0 )   FreeEdge  = 272 ( 272 )   SharedEdge = 864  ( 864 )
-TOLERANCE   : MaxTol   =   0.2569678523  (   0.2569678511 )  AvgTol   =  0.002441727967  (  0.002442511333 )
+TOLERANCE   : MaxTol   =   0.2569678523  (   0.2569678511 )  AvgTol   =  0.002441727474  (  0.002442511333 )
 LABELS      : N0Labels = 378  ( 378 )  N1Labels = 0  ( 74 )  N2Labels = 0  ( 0 )   TotalLabels = 378  ( 452 )   NameLabels = 378  ( 378 )   ColorLabels = 374  ( 452 )   LayerLabels = 374  ( 452 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/iges_1/R1 b/tests/de/iges_1/R1
index 5d7a777bc4..ace596dea5 100755
--- a/tests/de/iges_1/R1
+++ b/tests/de/iges_1/R1
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
@@ -6,12 +7,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename BUC50003.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 2  ( 0 )  Warnings = 17  ( 320 )  Summary  = 19  ( 320 )
+DATA        : Faulties = 1  ( 0 )  Warnings = 0  ( 0 )  Summary  = 1  ( 0 )
+TPSTAT      : Faulties = 2  ( 0 )  Warnings = 18  ( 320 )  Summary  = 20  ( 320 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 135  ( 135 )   Summary  = 2223  ( 2223 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 135  ( 135 )   FreeWire = 0  ( 0 )   FreeEdge  = 3 ( 3 )   SharedEdge = 974  ( 974 )
-TOLERANCE   : MaxTol   =   0.9794163281  (    12.54323842 )  AvgTol   =    0.0205777427  (    0.1726497742 )
+TOLERANCE   : MaxTol   =   0.9794163281  (    12.54323842 )  AvgTol   =   0.02057774141  (    0.1726497742 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 138  ( 1011 )  N2Labels = 0  ( 0 )   TotalLabels = 139  ( 1012 )   NameLabels = 139  ( 205 )   ColorLabels = 138  ( 1011 )   LayerLabels = 138  ( 1011 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/iges_1/R6 b/tests/de/iges_1/R6
index 5dd3232d52..279c9591e1 100755
--- a/tests/de/iges_1/R6
+++ b/tests/de/iges_1/R6
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
@@ -6,7 +7,7 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename polyrepro_13juin.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 20  ( 0 )  Warnings = 0  ( 0 )  Summary  = 20  ( 0 )
 TPSTAT      : Faulties = 40  ( 181 )  Warnings = 83  ( 1136 )  Summary  = 123  ( 1317 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 527  ( 527 )   Summary  = 10204  ( 10203 )
diff --git a/tests/de/iges_2/A2 b/tests/de/iges_2/A2
index 7eaf8900f4..70231b197c 100755
--- a/tests/de/iges_2/A2
+++ b/tests/de/iges_2/A2
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
@@ -7,7 +8,7 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename CTS17804.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 1  ( 0 )  Warnings = 0  ( 450 )  Summary  = 1  ( 450 )
 TPSTAT      : Faulties = 2  ( 0 )  Warnings = 38  ( 278 )  Summary  = 40  ( 278 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 218  ( 218 )   Summary  = 2957  ( 2963 )
diff --git a/tests/de/iges_2/B9 b/tests/de/iges_2/B9
index cebe631951..bcc2feb6ae 100644
--- a/tests/de/iges_2/B9
+++ b/tests/de/iges_2/B9
@@ -7,7 +7,7 @@ puts "TODO CR23096 ALL: COLORS : Faulty"
 set filename totale.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 1 )  Summary  = 0  ( 2 )
+DATA        : Faulties = 0  ( 7 )  Warnings = 0  ( 1 )  Summary  = 0  ( 8 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 357  ( 599 )  Summary  = 357  ( 599 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 926  ( 926 )   Summary  = 11269  ( 11272 )
diff --git a/tests/de/iges_2/C7 b/tests/de/iges_2/C7
index 13f1f209fb..db3bfe0154 100755
--- a/tests/de/iges_2/C7
+++ b/tests/de/iges_2/C7
@@ -6,7 +6,7 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename Rich.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 29 )  Warnings = 0  ( 2 )  Summary  = 0  ( 31 )
+DATA        : Faulties = 1  ( 126 )  Warnings = 0  ( 7 )  Summary  = 1  ( 133 )
 TPSTAT      : Faulties = 2  ( 212 )  Warnings = 6  ( 559 )  Summary  = 8  ( 771 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 9  ( 9 )   Summary  = 20802  ( 16067 )
diff --git a/tests/de/iges_2/C9 b/tests/de/iges_2/C9
index 42a890be7f..cb284fa2b9 100755
--- a/tests/de/iges_2/C9
+++ b/tests/de/iges_2/C9
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
@@ -6,12 +7,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename ball_bearing.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 2  ( 0 )  Warnings = 0  ( 0 )  Summary  = 2  ( 0 )
 TPSTAT      : Faulties = 4  ( 0 )  Warnings = 0  ( 3 )  Summary  = 4  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 15  ( 15 )   Summary  = 320  ( 320 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 15  ( 15 )   FreeWire = 1  ( 1 )   FreeEdge  = 55 ( 55 )   SharedEdge = 117  ( 117 )
-TOLERANCE   : MaxTol   = 0.0006252987008  ( 0.0006252359927 )  AvgTol   =  2.234790875e-05  (  1.469671889e-05 )
+TOLERANCE   : MaxTol   = 0.0006252983686  ( 0.0006252359927 )  AvgTol   =  2.234812266e-05  (  1.469671889e-05 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 68  ( 137 )  N2Labels = 0  ( 0 )   TotalLabels = 69  ( 138 )   NameLabels = 69  ( 76 )   ColorLabels = 68  ( 137 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/iges_2/D1 b/tests/de/iges_2/D1
index 38bffc55c5..fde9bd9633 100755
--- a/tests/de/iges_2/D1
+++ b/tests/de/iges_2/D1
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
@@ -6,12 +7,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename support_rampe.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 2  ( 0 )  Warnings = 0  ( 0 )  Summary  = 2  ( 0 )
 TPSTAT      : Faulties = 4  ( 2 )  Warnings = 0  ( 170 )  Summary  = 4  ( 172 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 169  ( 169 )   Summary  = 5348  ( 5348 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 169  ( 169 )   FreeWire = 49  ( 49 )   FreeEdge  = 945 ( 945 )   SharedEdge = 2041  ( 2041 )
-TOLERANCE   : MaxTol   =   0.1765497108  (   0.1765497101 )  AvgTol   =  0.0004116969822  (  0.0004153236787 )
+TOLERANCE   : MaxTol   =   0.1765497108  (   0.1765497101 )  AvgTol   =  0.0004116969813  (  0.0004153236787 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 981  ( 2195 )  N2Labels = 0  ( 0 )   TotalLabels = 982  ( 2196 )   NameLabels = 982  ( 1142 )   ColorLabels = 981  ( 2195 )   LayerLabels = 981  ( 2195 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/iges_2/D3 b/tests/de/iges_2/D3
index e529c2b43f..713b80ffd7 100644
--- a/tests/de/iges_2/D3
+++ b/tests/de/iges_2/D3
@@ -6,12 +6,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename UKI60107-5.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 12 )  Warnings = 0  ( 0 )  Summary  = 0  ( 12 )
 TPSTAT      : Faulties = 2  ( 0 )  Warnings = 64  ( 134 )  Summary  = 66  ( 134 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 93  ( 93 )   Summary  = 16847  ( 16847 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 93  ( 93 )   FreeWire = 2  ( 2 )   FreeEdge  = 419 ( 419 )   SharedEdge = 8137  ( 8137 )
-TOLERANCE   : MaxTol   = 7.725102137e-006  (         1e-005 )  AvgTol   =  2.26272257e-007  (  9.344523316e-006 )
+TOLERANCE   : MaxTol   = 7.725102137e-06  (          1e-05 )  AvgTol   =  2.262722986e-07  (  9.344523316e-06 )
 LABELS      : N0Labels = 513  ( 513 )  N1Labels = 0  ( 15 )  N2Labels = 0  ( 0 )   TotalLabels = 513  ( 528 )   NameLabels = 513  ( 513 )   ColorLabels = 402  ( 422 )   LayerLabels = 508  ( 528 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/iges_2/D7 b/tests/de/iges_2/D7
index 74adbba418..13557bbaa3 100644
--- a/tests/de/iges_2/D7
+++ b/tests/de/iges_2/D7
@@ -6,12 +6,12 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename USA60023-1.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 0 )  Summary  = 0  ( 3 )
 TPSTAT      : Faulties = 0  ( 90 )  Warnings = 0  ( 67 )  Summary  = 0  ( 157 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 10500  ( 10502 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 22  ( 22 )   FreeEdge  = 3530 ( 3530 )   SharedEdge = 3530  ( 3530 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 2969  ( 2969 )  N1Labels = 535  ( 419 )  N2Labels = 0  ( 0 )   TotalLabels = 3504  ( 3388 )   NameLabels = 2969  ( 2969 )   ColorLabels = 2305  ( 2287 )   LayerLabels = 3288  ( 3308 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/iges_2/F1 b/tests/de/iges_2/F1
index 892de4600e..894310e62e 100755
--- a/tests/de/iges_2/F1
+++ b/tests/de/iges_2/F1
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
@@ -8,7 +9,7 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename BUC50029.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 22  ( 0 )  Warnings = 0  ( 0 )  Summary  = 22  ( 0 )
 TPSTAT      : Faulties = 44  ( 0 )  Warnings = 169  ( 1291 )  Summary  = 213  ( 1291 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 270  ( 270 )   Summary  = 8171  ( 8283 )
diff --git a/tests/de/iges_2/F4 b/tests/de/iges_2/F4
index 030d77b60b..4ab80df393 100755
--- a/tests/de/iges_2/F4
+++ b/tests/de/iges_2/F4
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 
@@ -6,7 +7,7 @@ set LinuxDiff 2
 set filename buc60894.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 15  ( 0 )  Warnings = 0  ( 0 )  Summary  = 15  ( 0 )
 TPSTAT      : Faulties = 30  ( 36 )  Warnings = 559  ( 1854 )  Summary  = 589  ( 1890 )
 CHECKSHAPE  : Wires    = 5  ( 6 )  Faces    = 5  ( 6 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3499  ( 3499 )   Summary  = 43148  ( 43109 )
diff --git a/tests/de/iges_2/F5 b/tests/de/iges_2/F5
index c5ae8b9f30..1f04e654a2 100755
--- a/tests/de/iges_2/F5
+++ b/tests/de/iges_2/F5
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
@@ -7,12 +8,12 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename BUC60898.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 3  ( 0 )  Warnings = 0  ( 0 )  Summary  = 3  ( 0 )
 TPSTAT      : Faulties = 6  ( 126 )  Warnings = 18  ( 675 )  Summary  = 24  ( 801 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 91  ( 91 )   Summary  = 24023  ( 23781 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 91  ( 91 )   FreeWire = 304  ( 372 )   FreeEdge  = 7210 ( 7210 )   SharedEdge = 10377  ( 10271 )
-TOLERANCE   : MaxTol   =   0.0779303086  (  0.07793030858 )  AvgTol   =  6.701253424e-05  (  0.0001033335359 )
+TOLERANCE   : MaxTol   =   0.0779303086  (  0.07793030858 )  AvgTol   =  6.701253429e-05  (  0.0001033335359 )
 LABELS      : N0Labels = 4  ( 38 )  N1Labels = 2509  ( 4250 )  N2Labels = 0  ( 0 )   TotalLabels = 2513  ( 4288 )   NameLabels = 2357  ( 2884 )   ColorLabels = 2509  ( 4215 )   LayerLabels = 249  ( 515 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 7 )
diff --git a/tests/de/iges_2/F6 b/tests/de/iges_2/F6
index 2c1691993e..901ed32ec0 100755
--- a/tests/de/iges_2/F6
+++ b/tests/de/iges_2/F6
@@ -7,12 +7,12 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename BUC61004-4.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
+DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 0  ( 146 )  Warnings = 0  ( 153 )  Summary  = 0  ( 299 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 923  ( 934 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 7  ( 7 )   FreeEdge  = 315 ( 315 )   SharedEdge = 315  ( 315 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 5  ( 16 )  N1Labels = 284  ( 298 )  N2Labels = 0  ( 0 )   TotalLabels = 289  ( 314 )   NameLabels = 5  ( 27 )   ColorLabels = 284  ( 309 )   LayerLabels = 124  ( 309 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 5 )
diff --git a/tests/de/iges_2/F8 b/tests/de/iges_2/F8
index c6be8a6a04..29b9ce4ebc 100755
--- a/tests/de/iges_2/F8
+++ b/tests/de/iges_2/F8
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
@@ -8,7 +9,7 @@ puts "TODO CR23096 ALL: COLORS : Faulty"
 set filename CTS17802.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 5  ( 0 )  Warnings = 0  ( 194 )  Summary  = 5  ( 194 )
 TPSTAT      : Faulties = 10  ( 1 )  Warnings = 27  ( 137 )  Summary  = 37  ( 138 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 107  ( 107 )   Summary  = 2280  ( 2286 )
diff --git a/tests/de/iges_2/G9 b/tests/de/iges_2/G9
index 05a81dba9d..b1d385b639 100755
--- a/tests/de/iges_2/G9
+++ b/tests/de/iges_2/G9
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
@@ -6,12 +7,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename sabena.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 14  ( 0 )  Warnings = 0  ( 0 )  Summary  = 14  ( 0 )
 TPSTAT      : Faulties = 28  ( 16 )  Warnings = 44  ( 2964 )  Summary  = 72  ( 2980 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2639  ( 2634 )   Summary  = 64362  ( 64317 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 2639  ( 2639 )   FreeWire = 1027  ( 1027 )   FreeEdge  = 10489 ( 10489 )   SharedEdge = 24209  ( 24190 )
-TOLERANCE   : MaxTol   =  0.05705560511  (  0.05705560511 )  AvgTol   =  0.0002546035328  (  0.0002529561285 )
+TOLERANCE   : MaxTol   =  0.05705560511  (  0.05705560511 )  AvgTol   =  0.0002545958154  (  0.0002529561285 )
 LABELS      : N0Labels = 54  ( 54 )  N1Labels = 10590  ( 27120 )  N2Labels = 0  ( 0 )   TotalLabels = 10644  ( 27174 )   NameLabels = 10644  ( 13414 )   ColorLabels = 10590  ( 27172 )   LayerLabels = 7  ( 18 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 8  ( 8 )
diff --git a/tests/de/iges_2/H2 b/tests/de/iges_2/H2
index 6d83db3f9a..160e866477 100644
--- a/tests/de/iges_2/H2
+++ b/tests/de/iges_2/H2
@@ -7,12 +7,12 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename So5571b.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 139 )  Summary  = 0  ( 139 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 39929  ( 39929 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 139  ( 139 )   FreeEdge  = 19825 ( 19825 )   SharedEdge = 19825  ( 19825 )
-TOLERANCE   : MaxTol   = 1.000100004e-007  ( 1.000100004e-007 )  AvgTol   =  1.000000175e-007  (  1.000000178e-007 )
+TOLERANCE   : MaxTol   = 1.000100004e-07  ( 1.000100004e-07 )  AvgTol   =  1.000000175e-07  (  1.000000178e-07 )
 LABELS      : N0Labels = 139  ( 139 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 139  ( 139 )   NameLabels = 139  ( 139 )   ColorLabels = 0  ( 139 )   LayerLabels = 0  ( 139 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 1 )
diff --git a/tests/de/iges_2/H3 b/tests/de/iges_2/H3
index 9fbbb2576d..c0a953f1fc 100755
--- a/tests/de/iges_2/H3
+++ b/tests/de/iges_2/H3
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
@@ -8,9 +9,9 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename UKI60028-1.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 4  ( 0 )  Warnings = 0  ( 0 )  Summary  = 4  ( 0 )
 TPSTAT      : Faulties = 8  ( 150 )  Warnings = 41  ( 785 )  Summary  = 49  ( 935 )
-CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 159  ( 159 )   Summary  = 7582  ( 7684 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 159  ( 159 )   FreeWire = 189  ( 284 )   FreeEdge  = 1726 ( 1726 )   SharedEdge = 3035  ( 3035 )
 TOLERANCE   : MaxTol   =   0.6023944505  (   0.6023945025 )  AvgTol   =  0.007299249683  (    0.0087526096 )
diff --git a/tests/de/iges_2/H4 b/tests/de/iges_2/H4
index 0fddf2eb96..ffa3e44023 100755
--- a/tests/de/iges_2/H4
+++ b/tests/de/iges_2/H4
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
@@ -8,7 +9,7 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename UKI60028-2.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 8  ( 0 )  Warnings = 0  ( 0 )  Summary  = 8  ( 0 )
 TPSTAT      : Faulties = 16  ( 149 )  Warnings = 60  ( 1008 )  Summary  = 76  ( 1157 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 124  ( 124 )   Summary  = 7690  ( 7731 )
diff --git a/tests/de/iges_2/H5 b/tests/de/iges_2/H5
index 11bd6552d0..17c77f3c85 100755
--- a/tests/de/iges_2/H5
+++ b/tests/de/iges_2/H5
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
@@ -8,7 +9,7 @@ set LinuxDiff 1
 set filename UKI60107-3.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 1  ( 0 )  Warnings = 0  ( 0 )  Summary  = 1  ( 0 )
 TPSTAT      : Faulties = 2  ( 0 )  Warnings = 20  ( 331 )  Summary  = 22  ( 331 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 149  ( 149 )   Summary  = 2607  ( 2609 )
diff --git a/tests/de/iges_2/H7 b/tests/de/iges_2/H7
index 02f911ddef..9ce9535a6a 100644
--- a/tests/de/iges_2/H7
+++ b/tests/de/iges_2/H7
@@ -7,7 +7,7 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename UKI60876.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 7 )  Warnings = 0  ( 0 )  Summary  = 0  ( 7 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 128  ( 287 )  Summary  = 128  ( 287 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 373  ( 373 )   Summary  = 8508  ( 8508 )
diff --git a/tests/de/iges_2/I5 b/tests/de/iges_2/I5
index 395e6a9586..ae1843f15f 100755
--- a/tests/de/iges_2/I5
+++ b/tests/de/iges_2/I5
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 
@@ -6,12 +7,12 @@ puts "TODO CR23096 ALL: COLORS : Faulty"
 set filename ims013.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 19  ( 0 )  Warnings = 0  ( 0 )  Summary  = 19  ( 0 )
 TPSTAT      : Faulties = 38  ( 160 )  Warnings = 0  ( 780 )  Summary  = 38  ( 940 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 854  ( 702 )   Summary  = 25375  ( 23837 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 854  ( 854 )   FreeWire = 9  ( 31 )   FreeEdge  = 3865 ( 3865 )   SharedEdge = 9820  ( 9202 )
-TOLERANCE   : MaxTol   =   0.9589015104  (   0.9589015104 )  AvgTol   =   0.01827504091  (   0.01834335655 )
+TOLERANCE   : MaxTol   =   0.9589015104  (   0.9589015104 )  AvgTol   =   0.01827507861  (   0.01834335655 )
 LABELS      : N0Labels = 33  ( 33 )  N1Labels = 4502  ( 6695 )  N2Labels = 0  ( 0 )   TotalLabels = 4535  ( 6728 )   NameLabels = 4535  ( 4624 )   ColorLabels = 4522  ( 6715 )   LayerLabels = 4281  ( 6430 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 8  ( 9 )
diff --git a/tests/de/iges_2/I8 b/tests/de/iges_2/I8
index ce1aa19d47..fd83ed6635 100755
--- a/tests/de/iges_2/I8
+++ b/tests/de/iges_2/I8
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
@@ -9,7 +10,7 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename BUC60000.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 12  ( 0 )  Warnings = 0  ( 0 )  Summary  = 12  ( 0 )
 TPSTAT      : Faulties = 24  ( 0 )  Warnings = 24  ( 558 )  Summary  = 48  ( 558 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 186  ( 186 )   Summary  = 9601  ( 9691 )
diff --git a/tests/de/iges_3/A1 b/tests/de/iges_3/A1
index 6d0c885f96..cad08bca68 100644
--- a/tests/de/iges_3/A1
+++ b/tests/de/iges_3/A1
@@ -8,7 +8,7 @@ puts "TODO CR23096 ALL: COLORS : Faulty"
 set filename PUNZONE.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 1 )  Summary  = 0  ( 2 )
+DATA        : Faulties = 0  ( 7 )  Warnings = 0  ( 1 )  Summary  = 0  ( 8 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1002  ( 2771 )  Summary  = 1002  ( 2771 )
 CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 4  ( 4 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 1127  ( 1125 )   Summary  = 44255  ( 44256 )
diff --git a/tests/de/iges_3/A2 b/tests/de/iges_3/A2
index 49eb2bd9d3..cbe6f05678 100755
--- a/tests/de/iges_3/A2
+++ b/tests/de/iges_3/A2
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
@@ -9,7 +10,7 @@ set LinuxDiff 5
 set filename UKI60094.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 2  ( 0 )  Warnings = 0  ( 0 )  Summary  = 2  ( 0 )
 TPSTAT      : Faulties = 4  ( 33 )  Warnings = 125  ( 319 )  Summary  = 129  ( 352 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 2  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 420  ( 159 )   Summary  = 7849  ( 4452 )
diff --git a/tests/de/iges_3/A3 b/tests/de/iges_3/A3
index 2fcb9f2bad..ee8fb41456 100755
--- a/tests/de/iges_3/A3
+++ b/tests/de/iges_3/A3
@@ -1,23 +1,21 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
-
-puts "TODO CR25275 DEBUG_OCC24121 Debian60-64: Error : 1 differences with reference data found :" 
-
 set LinuxDiff 1
 set filename UKI60107-6.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 477 )  Warnings = 0  ( 0 )  Summary  = 0  ( 477 )
+DATA        : Faulties = 1  ( 0 )  Warnings = 0  ( 239 )  Summary  = 1  ( 239 )
 TPSTAT      : Faulties = 2  ( 0 )  Warnings = 15  ( 316 )  Summary  = 17  ( 316 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 79  ( 79 )   Summary  = 3800  ( 3951 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 79  ( 79 )   FreeWire = 79  ( 230 )   FreeEdge  = 865 ( 865 )   SharedEdge = 1481  ( 1481 )
-TOLERANCE   : MaxTol   =  0.06847151249  (   0.8635005927 )  AvgTol   =  0.001337103007  (  0.003525405269 )
+TOLERANCE   : MaxTol   =  0.06847151261  (   0.8635005927 )  AvgTol   =   0.00133710651  (  0.003525405269 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 596  ( 1119 )  N2Labels = 0  ( 0 )   TotalLabels = 597  ( 1120 )   NameLabels = 597  ( 745 )   ColorLabels = 596  ( 1119 )   LayerLabels = 577  ( 1100 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 7 )
diff --git a/tests/de/iges_3/A4 b/tests/de/iges_3/A4
index 9fcc24c500..1a7947685e 100755
--- a/tests/de/iges_3/A4
+++ b/tests/de/iges_3/A4
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
@@ -9,13 +10,13 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename BUC40132.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 6  ( 0 )  Warnings = 0  ( 0 )  Summary  = 6  ( 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  = 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 )
+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.00803262355  (  0.008257993798 )
+LABELS      : N0Labels = 27  ( 27 )  N1Labels = 2100  ( 6099 )  N2Labels = 0  ( 0 )   TotalLabels = 2127  ( 6126 )   NameLabels = 2127  ( 2596 )   ColorLabels = 2114  ( 6125 )   LayerLabels = 2114  ( 6125 )
 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 fa27c7ab92..0de91af8e3 100755
--- a/tests/de/iges_3/A6
+++ b/tests/de/iges_3/A6
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
@@ -8,7 +9,7 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename catia01_s.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 8  ( 0 )  Warnings = 0  ( 0 )  Summary  = 8  ( 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  = 3870  ( 3869 )
diff --git a/tests/de/iges_3/A8 b/tests/de/iges_3/A8
index b2d78d628b..54a4e08482 100755
--- a/tests/de/iges_3/A8
+++ b/tests/de/iges_3/A8
@@ -1,4 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
+puts "TODO CR23096 ALL: DATA : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
@@ -6,12 +7,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename VERSEUSE.igs
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 1  ( 0 )  Warnings = 0  ( 0 )  Summary  = 1  ( 0 )
 TPSTAT      : Faulties = 2  ( 19 )  Warnings = 97  ( 1126 )  Summary  = 99  ( 1145 )
 CHECKSHAPE  : Wires    = 0  ( 1 )  Faces    = 0  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 436  ( 436 )   Summary  = 7823  ( 7826 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 436  ( 436 )   FreeWire = 15  ( 15 )   FreeEdge  = 208 ( 208 )   SharedEdge = 3430  ( 3431 )
-TOLERANCE   : MaxTol   =   0.8904045146  (   0.8904045345 )  AvgTol   =   0.01244629531  (   0.01247379594 )
+TOLERANCE   : MaxTol   =   0.8904045146  (   0.8904045345 )  AvgTol   =   0.01244625407  (   0.01247379594 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 501  ( 2306 )  N2Labels = 0  ( 0 )   TotalLabels = 502  ( 2307 )   NameLabels = 502  ( 770 )   ColorLabels = 501  ( 2306 )   LayerLabels = 443  ( 2228 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/step_1/A1 b/tests/de/step_1/A1
index 0b02ed1498..ae3201d2d4 100644
--- a/tests/de/step_1/A1
+++ b/tests/de/step_1/A1
@@ -6,12 +6,12 @@ set ProductMode OFF
 set filename model_214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 3 )  Summary  = 0  ( 4 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 3 )  Summary  = 2  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 15  ( 0 )  Face     = 15  ( 15 )   Summary  = 187  ( 174 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 15  ( 0 )  Face     = 15  ( 15 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 71  ( 71 )
-TOLERANCE   : MaxTol   =         1e-007  (    1.0001e-007 )  AvgTol   =          1e-007  (  1.000029825e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (     1.0001e-07 )  AvgTol   =           1e-07  (  1.000029825e-07 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 15  ( 15 )  N2Labels = 0  ( 0 )   TotalLabels = 16  ( 16 )   NameLabels = 1  ( 1 )   ColorLabels = 15  ( 15 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/A2 b/tests/de/step_1/A2
index dd55279d37..8f1fac1461 100644
--- a/tests/de/step_1/A2
+++ b/tests/de/step_1/A2
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename tr9_r0701-db.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 914 )  Warnings = 0  ( 0 )  Summary  = 0  ( 914 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 30  ( 30 )  Summary  = 30  ( 30 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 35  ( 35 )   Summary  = 223  ( 223 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 35  ( 35 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 82  ( 82 )
-TOLERANCE   : MaxTol   = 4.199313252e-005  ( 4.297107017e-005 )  AvgTol   =  1.375200154e-005  (  1.381138283e-005 )
+TOLERANCE   : MaxTol   = 4.199313252e-05  ( 4.297107017e-05 )  AvgTol   =  1.375200154e-05  (  1.381138283e-05 )
 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/C6 b/tests/de/step_1/C6
index c80124b37f..9e394c5b35 100644
--- a/tests/de/step_1/C6
+++ b/tests/de/step_1/C6
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: STATSHAPE : Faulty"
 set filename PRO7755.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 1 )  Summary  = 0  ( 2 )
 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    = 14  ( 10 )  Face     = 14  ( 14 )   Summary  = 184  ( 155 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 14  ( 10 )  Face     = 14  ( 14 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 56  ( 50 )
-TOLERANCE   : MaxTol   = 0.0001957201735  ( 0.005490898223 )  AvgTol   =  3.286972717e-005  (  0.0004776973929 )
+TOLERANCE   : MaxTol   = 0.0001957201735  ( 0.005490898223 )  AvgTol   =  3.286972717e-05  (  0.0004776973929 )
 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/C8 b/tests/de/step_1/C8
index 2d99e2522b..6372e0d259 100644
--- a/tests/de/step_1/C8
+++ b/tests/de/step_1/C8
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LAYERS : Faulty"
 set filename tr10_r0701_db.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 918 )  Warnings = 0  ( 0 )  Summary  = 0  ( 918 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 30  ( 30 )  Summary  = 30  ( 30 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 35  ( 35 )   Summary  = 223  ( 223 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 35  ( 35 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 82  ( 82 )
-TOLERANCE   : MaxTol   = 4.199313252e-005  ( 4.297107017e-005 )  AvgTol   =  1.375200154e-005  (  1.381138283e-005 )
+TOLERANCE   : MaxTol   = 4.199313252e-05  ( 4.297107017e-05 )  AvgTol   =  1.375200154e-05  (  1.381138283e-05 )
 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/D8 b/tests/de/step_1/D8
index f8e7b344c1..32420e11b3 100644
--- a/tests/de/step_1/D8
+++ b/tests/de/step_1/D8
@@ -6,7 +6,7 @@ puts "TODO CR23096 ALL: STATSHAPE : Faulty"
 set filename bm1_db_fuel.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 1 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 5  ( 3 )  Summary  = 5  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 10  ( 4 )  Face     = 10  ( 10 )   Summary  = 488  ( 391 )
diff --git a/tests/de/step_1/E3 b/tests/de/step_1/E3
index e7cce727ca..21885a7bc9 100644
--- a/tests/de/step_1/E3
+++ b/tests/de/step_1/E3
@@ -6,12 +6,12 @@ set LinuxDiff 2
 set filename bm1_sy_exhaust.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 19 )  Warnings = 0  ( 2 )  Summary  = 0  ( 21 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 21  ( 12 )  Summary  = 21  ( 12 )
 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 )
+TOLERANCE   : MaxTol   = 6.104502198e-06  (          1e-05 )  AvgTol   =  9.28336616e-07  (  2.903661931e-06 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 31  ( 31 )  N2Labels = 0  ( 0 )   TotalLabels = 35  ( 35 )   NameLabels = 7  ( 7 )   ColorLabels = 28  ( 28 )   LayerLabels = 28  ( 28 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/E6 b/tests/de/step_1/E6
index 5c819e7004..8b628a7777 100755
--- a/tests/de/step_1/E6
+++ b/tests/de/step_1/E6
@@ -1,9 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-
 set filename trj4_s1-ai-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 54 )  Warnings = 0  ( 0 )  Summary  = 0  ( 54 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 51 )  Summary  = 2  ( 51 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 8  ( 8 )  Shell    = 10  ( 10 )  Face     = 108  ( 108 )   Summary  = 603  ( 603 )
diff --git a/tests/de/step_1/G5 b/tests/de/step_1/G5
index f2e58cc993..6ffa03e7f1 100644
--- a/tests/de/step_1/G5
+++ b/tests/de/step_1/G5
@@ -3,10 +3,11 @@ puts "TODO CR23096 ALL: TPSTAT : Faulty"
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
+
 set filename trj3_s1-db-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 18 )  Warnings = 0  ( 0 )  Summary  = 0  ( 18 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 36  ( 12 )  Summary  = 36  ( 12 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 9  ( 9 )  Shell    = 9  ( 9 )  Face     = 152  ( 152 )   Summary  = 998  ( 998 )
diff --git a/tests/de/step_1/H6 b/tests/de/step_1/H6
index 5e75947d59..fcafc35a48 100644
--- a/tests/de/step_1/H6
+++ b/tests/de/step_1/H6
@@ -2,12 +2,12 @@
 set filename PRO10361.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 8 )  Warnings = 0  ( 0 )  Summary  = 0  ( 8 )
 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     = 56  ( 56 )   Summary  = 370  ( 370 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 56  ( 56 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 151  ( 151 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 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/H9 b/tests/de/step_1/H9
index ed235fe6db..08cbacc0fa 100644
--- a/tests/de/step_1/H9
+++ b/tests/de/step_1/H9
@@ -2,7 +2,7 @@
 set filename PRO5974.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 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     = 12  ( 12 )   Summary  = 108  ( 108 )
diff --git a/tests/de/step_1/I3 b/tests/de/step_1/I3
index 9d4131414e..73d16dc83d 100644
--- a/tests/de/step_1/I3
+++ b/tests/de/step_1/I3
@@ -2,12 +2,12 @@
 set filename PRO9239.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 8 )  Warnings = 0  ( 0 )  Summary  = 0  ( 8 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 13 )  Summary  = 8  ( 13 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 3  ( 3 )  Face     = 22  ( 22 )   Summary  = 149  ( 149 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 3  ( 3 )  Face     = 22  ( 22 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 61  ( 61 )
-TOLERANCE   : MaxTol   = 9.264087353e-006  ( 9.591855965e-006 )  AvgTol   =  1.179688295e-006  (  1.221596404e-006 )
+TOLERANCE   : MaxTol   = 9.264087353e-06  ( 9.591855965e-06 )  AvgTol   =  1.179688295e-06  (  1.221596404e-06 )
 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/I4 b/tests/de/step_1/I4
index 74807aa15c..0d4a079cf2 100644
--- a/tests/de/step_1/I4
+++ b/tests/de/step_1/I4
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: NBSHAPES : Faulty"
 set filename PRO9240.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 6 )  Warnings = 0  ( 0 )  Summary  = 0  ( 6 )
+DATA        : Faulties = 0  ( 30 )  Warnings = 0  ( 0 )  Summary  = 0  ( 30 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 14  ( 51 )  Summary  = 14  ( 51 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 7  ( 7 )  Shell    = 7  ( 7 )  Face     = 35  ( 35 )   Summary  = 200  ( 204 )
 STATSHAPE   : Solid    = 7  ( 7 )  Shell    = 7  ( 7 )  Face     = 35  ( 35 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 73  ( 77 )
-TOLERANCE   : MaxTol   = 1.923934361e-006  ( 1.923934702e-006 )  AvgTol   =  8.837706424e-007  (  8.927244379e-007 )
+TOLERANCE   : MaxTol   = 1.923934361e-06  ( 1.923934702e-06 )  AvgTol   =  8.837706424e-07  (  8.927244379e-07 )
 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/I9 b/tests/de/step_1/I9
index 03d77055dc..9289c3df4b 100644
--- a/tests/de/step_1/I9
+++ b/tests/de/step_1/I9
@@ -2,12 +2,12 @@
 set filename abs1.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 11 )  Warnings = 0  ( 0 )  Summary  = 0  ( 11 )
 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     = 60  ( 60 )   Summary  = 367  ( 367 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 60  ( 60 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 142  ( 142 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000056326e-007  (  1.000056326e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000056326e-07  (  1.000056326e-07 )
 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/J1 b/tests/de/step_1/J1
index d912197433..319c867a63 100644
--- a/tests/de/step_1/J1
+++ b/tests/de/step_1/J1
@@ -2,12 +2,12 @@
 set filename absmix.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 17 )  Warnings = 0  ( 0 )  Summary  = 0  ( 17 )
 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    = 2  ( 2 )  Face     = 70  ( 70 )   Summary  = 415  ( 415 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 70  ( 70 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 157  ( 157 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000053123e-007  (  1.000053123e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000053123e-07  (  1.000053123e-07 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 2  ( 2 )   NameLabels = 2  ( 2 )   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/J7 b/tests/de/step_1/J7
index b5dd7d683c..e4e717fe51 100644
--- a/tests/de/step_1/J7
+++ b/tests/de/step_1/J7
@@ -2,7 +2,7 @@
 set filename bm1_sy_fuel.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 2 )  Summary  = 0  ( 5 )
 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    = 0  ( 0 )  Shell    = 6  ( 6 )  Face     = 6  ( 6 )   Summary  = 84  ( 79 )
diff --git a/tests/de/step_1/J8 b/tests/de/step_1/J8
index a1b7819dd4..ef72437008 100644
--- a/tests/de/step_1/J8
+++ b/tests/de/step_1/J8
@@ -6,7 +6,7 @@ puts "TODO CR23096 ALL: NBSHAPES : Faulty"
 set filename bm1_sy_lever.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 2 )  Summary  = 0  ( 5 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 11  ( 9 )  Summary  = 11  ( 9 )
 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 )
diff --git a/tests/de/step_1/J9 b/tests/de/step_1/J9
index 26dd39b404..60e247a775 100644
--- a/tests/de/step_1/J9
+++ b/tests/de/step_1/J9
@@ -2,7 +2,7 @@
 set filename bm1_sy_t4.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 2 )  Summary  = 0  ( 5 )
 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    = 6  ( 6 )  Face     = 6  ( 6 )   Summary  = 102  ( 96 )
diff --git a/tests/de/step_1/P8 b/tests/de/step_1/P8
index 2e1a634d89..06f51b2f7d 100644
--- a/tests/de/step_1/P8
+++ b/tests/de/step_1/P8
@@ -2,7 +2,7 @@
 set filename ec_exhaust-A.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 12 )  Warnings = 0  ( 0 )  Summary  = 0  ( 12 )
 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     = 46  ( 46 )   Summary  = 267  ( 267 )
diff --git a/tests/de/step_1/P9 b/tests/de/step_1/P9
index 0fdb1cef37..3761d903ae 100644
--- a/tests/de/step_1/P9
+++ b/tests/de/step_1/P9
@@ -2,12 +2,12 @@
 set filename f3.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 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     = 1  ( 1 )   Summary  = 140  ( 140 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 67  ( 67 )
-TOLERANCE   : MaxTol   = 9.838731639e-007  ( 2.031518087e-006 )  AvgTol   =  2.18321254e-007  (  3.43946687e-007 )
+TOLERANCE   : MaxTol   = 9.838731639e-07  ( 2.031518087e-06 )  AvgTol   =  2.18321254e-07  (  3.43946687e-07 )
 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/Q1 b/tests/de/step_1/Q1
index d30bc4c5a4..2607c5a809 100644
--- a/tests/de/step_1/Q1
+++ b/tests/de/step_1/Q1
@@ -2,12 +2,12 @@
 set filename f65.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 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     = 1  ( 1 )   Summary  = 114  ( 114 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 54  ( 54 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 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 ed847eba12..8e95ed59c1 100644
--- a/tests/de/step_1/R7
+++ b/tests/de/step_1/R7
@@ -2,12 +2,12 @@
 set filename r_87-ug.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 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   =    0.018462436  (  0.04645590147 )  AvgTol   =  0.001814589324  (  0.007120077124 )
+TOLERANCE   : MaxTol   = 8.886924154e-05  ( 8.886893947e-05 )  AvgTol   =  2.639044083e-05  (  2.639042883e-05 )
 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/R9 b/tests/de/step_1/R9
index 555fb66d3c..3ce172db0e 100644
--- a/tests/de/step_1/R9
+++ b/tests/de/step_1/R9
@@ -2,7 +2,7 @@
 set filename stepBF3.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 26 )  Warnings = 0  ( 0 )  Summary  = 0  ( 26 )
 TPSTAT      : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 1  ( 1 )
diff --git a/tests/de/step_1/T1 b/tests/de/step_1/T1
index 50c513a54e..e6c9f2af96 100644
--- a/tests/de/step_1/T1
+++ b/tests/de/step_1/T1
@@ -2,12 +2,12 @@
 set filename tr9_r0201-pe-adjusted.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 8 )  Warnings = 0  ( 0 )  Summary  = 0  ( 8 )
+DATA        : Faulties = 0  ( 803 )  Warnings = 0  ( 0 )  Summary  = 0  ( 803 )
 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     = 35  ( 35 )   Summary  = 223  ( 223 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 35  ( 35 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 82  ( 82 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.000033397e-007  (  1.000033397e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =  1.000033397e-07  (  1.000033397e-07 )
 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/U7 b/tests/de/step_1/U7
index 4deabf184a..24d091a533 100644
--- a/tests/de/step_1/U7
+++ b/tests/de/step_1/U7
@@ -2,7 +2,7 @@
 set filename trj3_s1-ac-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 21 )  Warnings = 0  ( 0 )  Summary  = 0  ( 21 )
 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    = 8  ( 8 )  Shell    = 8  ( 8 )  Face     = 100  ( 100 )   Summary  = 647  ( 647 )
diff --git a/tests/de/step_1/V5 b/tests/de/step_1/V5
index e491c61abf..b31700f434 100644
--- a/tests/de/step_1/V5
+++ b/tests/de/step_1/V5
@@ -2,12 +2,12 @@
 set filename trj3_s1-tc-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 7 )  Warnings = 0  ( 0 )  Summary  = 0  ( 7 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 16  ( 21 )  Summary  = 16  ( 21 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 8  ( 8 )  Shell    = 8  ( 8 )  Face     = 145  ( 145 )   Summary  = 848  ( 848 )
 STATSHAPE   : Solid    = 11  ( 11 )  Shell    = 11  ( 11 )  Face     = 189  ( 189 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 332  ( 332 )
-TOLERANCE   : MaxTol   = 6.105713512e-005  ( 6.105713512e-005 )  AvgTol   =  1.161749271e-006  (  1.160147409e-006 )
+TOLERANCE   : MaxTol   = 6.105713512e-05  ( 6.105713512e-05 )  AvgTol   =  1.161749271e-06  (  1.160147409e-06 )
 LABELS      : N0Labels = 13  ( 13 )  N1Labels = 19  ( 19 )  N2Labels = 0  ( 0 )   TotalLabels = 32  ( 32 )   NameLabels = 27  ( 27 )   ColorLabels = 13  ( 13 )   LayerLabels = 8  ( 8 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/W5 b/tests/de/step_1/W5
index d3f2a2533e..0f1150dceb 100644
--- a/tests/de/step_1/W5
+++ b/tests/de/step_1/W5
@@ -2,12 +2,12 @@
 set filename trj4_s1-ac-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 21 )  Warnings = 0  ( 0 )  Summary  = 0  ( 21 )
 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    = 8  ( 8 )  Shell    = 8  ( 8 )  Face     = 100  ( 100 )   Summary  = 647  ( 647 )
 STATSHAPE   : Solid    = 11  ( 11 )  Shell    = 11  ( 11 )  Face     = 138  ( 138 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 252  ( 252 )
-TOLERANCE   : MaxTol   = 0.001628351892  ( 0.001628351886 )  AvgTol   =  4.341878168e-005  (  4.34187816e-005 )
+TOLERANCE   : MaxTol   = 0.001628351892  ( 0.001628351886 )  AvgTol   =  4.341878168e-05  (  4.34187816e-05 )
 LABELS      : N0Labels = 13  ( 13 )  N1Labels = 14  ( 14 )  N2Labels = 0  ( 0 )   TotalLabels = 27  ( 27 )   NameLabels = 27  ( 27 )   ColorLabels = 8  ( 8 )   LayerLabels = 8  ( 8 )
 PROPS       : Centroid = 13  ( 13 )  Volume   = 13  ( 13 )  Area     = 13  ( 13 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/X8 b/tests/de/step_1/X8
index 09cbccce7a..eacbee73ad 100644
--- a/tests/de/step_1/X8
+++ b/tests/de/step_1/X8
@@ -2,12 +2,12 @@
 set filename trj5_s1-ac-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 21 )  Warnings = 0  ( 0 )  Summary  = 0  ( 21 )
 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    = 8  ( 8 )  Shell    = 8  ( 8 )  Face     = 100  ( 100 )   Summary  = 647  ( 647 )
 STATSHAPE   : Solid    = 11  ( 11 )  Shell    = 11  ( 11 )  Face     = 138  ( 138 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 252  ( 252 )
-TOLERANCE   : MaxTol   = 0.0006410834224  ( 0.0006410834197 )  AvgTol   =  1.715299862e-005  (  1.715299856e-005 )
+TOLERANCE   : MaxTol   = 0.0006410834224  ( 0.0006410834197 )  AvgTol   =  1.715299862e-05  (  1.715299856e-05 )
 LABELS      : N0Labels = 13  ( 13 )  N1Labels = 14  ( 14 )  N2Labels = 0  ( 0 )   TotalLabels = 27  ( 27 )   NameLabels = 27  ( 27 )   ColorLabels = 8  ( 8 )   LayerLabels = 8  ( 8 )
 PROPS       : Centroid = 13  ( 13 )  Volume   = 13  ( 13 )  Area     = 13  ( 13 )
 NCOLORS     : NColors  = 8  ( 8 )
diff --git a/tests/de/step_1/ZC5 b/tests/de/step_1/ZC5
index a7728eaf6b..a732e832c3 100644
--- a/tests/de/step_1/ZC5
+++ b/tests/de/step_1/ZC5
@@ -2,7 +2,7 @@
 set filename ro2.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 14  ( 14 )  Summary  = 14  ( 14 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 16  ( 16 )   Summary  = 83  ( 83 )
diff --git a/tests/de/step_1/ZC9 b/tests/de/step_1/ZC9
index 461c78e8f5..9a4d280c82 100644
--- a/tests/de/step_1/ZC9
+++ b/tests/de/step_1/ZC9
@@ -6,12 +6,12 @@ set ProductMode OFF
 set filename BUC60809.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 51  ( 9 )  Summary  = 51  ( 9 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 15  ( 15 )  Shell    = 16  ( 16 )  Face     = 159  ( 159 )   Summary  = 890  ( 890 )
 STATSHAPE   : Solid    = 15  ( 15 )  Shell    = 16  ( 16 )  Face     = 159  ( 159 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 342  ( 342 )
-TOLERANCE   : MaxTol   = 7.482128955e-007  (         1e-005 )  AvgTol   =  1.53886857e-007  (  5.228475349e-007 )
+TOLERANCE   : MaxTol   = 7.482128955e-07  (          1e-05 )  AvgTol   =  1.53886857e-07  (  5.228475349e-07 )
 LABELS      : N0Labels = 15  ( 15 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 15  ( 15 )   NameLabels = 15  ( 15 )   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/ZD1 b/tests/de/step_1/ZD1
index 00e65247be..68fb33d823 100644
--- a/tests/de/step_1/ZD1
+++ b/tests/de/step_1/ZD1
@@ -2,7 +2,7 @@
 set filename mat.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
+DATA        : Faulties = 0  ( 200 )  Warnings = 0  ( 0 )  Summary  = 0  ( 200 )
 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    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 14  ( 14 )
diff --git a/tests/de/step_1/ZD3 b/tests/de/step_1/ZD3
index d30479ab52..07acc8930d 100644
--- a/tests/de/step_1/ZD3
+++ b/tests/de/step_1/ZD3
@@ -6,12 +6,12 @@ set ProductMode OFF
 set filename PRO20361-1.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 4 )  Warnings = 0  ( 0 )  Summary  = 0  ( 4 )
 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     = 1  ( 1 )   Summary  = 7  ( 7 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2  ( 2 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 1  ( 2 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 2 )   NameLabels = 1  ( 2 )   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/ZD4 b/tests/de/step_1/ZD4
index 18291a0c5f..623beade97 100644
--- a/tests/de/step_1/ZD4
+++ b/tests/de/step_1/ZD4
@@ -6,12 +6,12 @@ set ProductMode OFF
 set filename PRO20361-3.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 4 )  Warnings = 0  ( 0 )  Summary  = 0  ( 4 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 3 )  Summary  = 0  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 6  ( 6 )   Summary  = 34  ( 34 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 6  ( 6 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 12  ( 12 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.000041026e-007  (  1.000041026e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =  1.000041026e-07  (  1.000041026e-07 )
 LABELS      : N0Labels = 1  ( 2 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 2 )   NameLabels = 1  ( 2 )   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/ZD5 b/tests/de/step_1/ZD5
index 5ee605db1c..04e38917c4 100644
--- a/tests/de/step_1/ZD5
+++ b/tests/de/step_1/ZD5
@@ -2,12 +2,12 @@
 set filename ass-test1.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 85 )  Warnings = 0  ( 0 )  Summary  = 0  ( 85 )
 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    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 41  ( 41 )   Summary  = 272  ( 272 )
 STATSHAPE   : Solid    = 9  ( 9 )  Shell    = 9  ( 9 )  Face     = 223  ( 223 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 111  ( 111 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 9  ( 9 )  N2Labels = 0  ( 0 )   TotalLabels = 12  ( 12 )   NameLabels = 12  ( 12 )   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/ZD6 b/tests/de/step_1/ZD6
index f9bef9494c..f6d27c39e1 100644
--- a/tests/de/step_1/ZD6
+++ b/tests/de/step_1/ZD6
@@ -6,12 +6,12 @@ set ProductMode OFF
 set filename tr8_as_sd_sw.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
+DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 5 )  Summary  = 0  ( 8 )
 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    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 15  ( 15 )   Summary  = 88  ( 88 )
 STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 15  ( 15 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 30  ( 30 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000061539e-007  (  1.000061539e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000061539e-07  (  1.000061539e-07 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 4 )   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/ZE7 b/tests/de/step_1/ZE7
index 2dde88d86a..a2d09d67c9 100644
--- a/tests/de/step_1/ZE7
+++ b/tests/de/step_1/ZE7
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename trj7_c2-tc-203.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 10 )  Warnings = 0  ( 0 )  Summary  = 0  ( 10 )
 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     = 1  ( 1 )   Summary  = 28  ( 28 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 1 ( 1 )   SharedEdge = 11  ( 11 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.000044118e-007  (  1.000044118e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =  1.000044118e-07  (  1.000044118e-07 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 6 )   NameLabels = 5  ( 5 )   ColorLabels = 2  ( 2 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/ZE8 b/tests/de/step_1/ZE8
index 9945f2fef5..3ddfeaf1d4 100644
--- a/tests/de/step_1/ZE8
+++ b/tests/de/step_1/ZE8
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: STATSHAPE : Faulty"
 set filename trj7_c2-td-203.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 12 )  Warnings = 0  ( 0 )  Summary  = 0  ( 12 )
 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    = 4  ( 0 )  Face     = 4  ( 4 )   Summary  = 127  ( 103 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 4  ( 0 )  Face     = 4  ( 4 )   FreeWire = 0  ( 0 )   FreeEdge  = 20 ( 20 )   SharedEdge = 36  ( 36 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 26  ( 26 )  N2Labels = 0  ( 0 )   TotalLabels = 29  ( 29 )   NameLabels = 5  ( 5 )   ColorLabels = 24  ( 24 )   LayerLabels = 4  ( 4 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 7  ( 7 )
diff --git a/tests/de/step_1/ZE9 b/tests/de/step_1/ZE9
index d0f0bea11c..17f0fba568 100644
--- a/tests/de/step_1/ZE9
+++ b/tests/de/step_1/ZE9
@@ -6,12 +6,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename trj7_c2-pe-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 18 )  Warnings = 0  ( 0 )  Summary  = 0  ( 18 )
 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     = 1  ( 1 )   Summary  = 16  ( 17 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 1  ( 1 )   FreeWire = 0  ( 1 )   FreeEdge  = 1 ( 1 )   SharedEdge = 5  ( 5 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.0000375e-007  (  1.0000375e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =   1.0000375e-07  (   1.0000375e-07 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 3  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 6  ( 7 )   NameLabels = 5  ( 5 )   ColorLabels = 2  ( 2 )   LayerLabels = 2  ( 2 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/ZF1 b/tests/de/step_1/ZF1
index 79567688cc..29e9fdd7aa 100644
--- a/tests/de/step_1/ZF1
+++ b/tests/de/step_1/ZF1
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename trj9_c2-tu-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 7 )  Warnings = 0  ( 0 )  Summary  = 0  ( 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     = 1  ( 1 )   Summary  = 28  ( 28 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 1 ( 1 )   SharedEdge = 11  ( 11 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.000044118e-007  (  1.000044118e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =  1.000044118e-07  (  1.000044118e-07 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 2  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 3  ( 4 )   NameLabels = 1  ( 1 )   ColorLabels = 2  ( 2 )   LayerLabels = 2  ( 2 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/ZF6 b/tests/de/step_1/ZF6
index 0707bdb9a6..0e6e06b7df 100644
--- a/tests/de/step_1/ZF6
+++ b/tests/de/step_1/ZF6
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: COLORS : Faulty"
 set filename trj2_io1-pe-203.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 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     = 29  ( 29 )   Summary  = 193  ( 193 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 29  ( 29 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 70  ( 70 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.000039198e-007  (  1.000039198e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =  1.000039198e-07  (  1.000039198e-07 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 3  ( 3 )   NameLabels = 1  ( 1 )   ColorLabels = 3  ( 3 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 1  ( 2 )
diff --git a/tests/de/step_1/ZF9 b/tests/de/step_1/ZF9
index 7131038d97..6584ce8f3b 100644
--- a/tests/de/step_1/ZF9
+++ b/tests/de/step_1/ZF9
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename trj9_c2-sy-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 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     = 1  ( 1 )   Summary  = 16  ( 16 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 1 ( 1 )   SharedEdge = 5  ( 5 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.0000375e-007  (  1.0000375e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =   1.0000375e-07  (   1.0000375e-07 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 2  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 3  ( 4 )   NameLabels = 1  ( 1 )   ColorLabels = 2  ( 2 )   LayerLabels = 2  ( 2 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/ZG6 b/tests/de/step_1/ZG6
index 6ffed3297e..8db8fa70da 100644
--- a/tests/de/step_1/ZG6
+++ b/tests/de/step_1/ZG6
@@ -5,7 +5,7 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename trj4_xr1-pe-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 7 )  Warnings = 0  ( 0 )  Summary  = 0  ( 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    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 10  ( 10 )
diff --git a/tests/de/step_1/ZH3 b/tests/de/step_1/ZH3
index 1f4dc99a2c..4d07aa2910 100644
--- a/tests/de/step_1/ZH3
+++ b/tests/de/step_1/ZH3
@@ -6,12 +6,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename trj7_c2-ac-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 10 )  Warnings = 0  ( 0 )  Summary  = 0  ( 10 )
 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  = 16  ( 16 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 0 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 1 ( 1 )   SharedEdge = 5  ( 5 )
-TOLERANCE   : MaxTol   =         1e-007  ( 1.000100004e-007 )  AvgTol   =          1e-007  (  1.000012501e-007 )
+TOLERANCE   : MaxTol   =          1e-07  ( 1.000100004e-07 )  AvgTol   =           1e-07  (  1.000012501e-07 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 3  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 6  ( 7 )   NameLabels = 5  ( 5 )   ColorLabels = 2  ( 2 )   LayerLabels = 2  ( 2 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/ZH4 b/tests/de/step_1/ZH4
index 3768eb996f..04f42c6d5d 100644
--- a/tests/de/step_1/ZH4
+++ b/tests/de/step_1/ZH4
@@ -6,12 +6,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename trj8_c2-ac-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 10 )  Warnings = 0  ( 0 )  Summary  = 0  ( 10 )
 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  = 16  ( 16 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 0 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 1 ( 1 )   SharedEdge = 5  ( 5 )
-TOLERANCE   : MaxTol   =         1e-007  ( 1.000100004e-007 )  AvgTol   =          1e-007  (  1.000012501e-007 )
+TOLERANCE   : MaxTol   =          1e-07  ( 1.000100004e-07 )  AvgTol   =           1e-07  (  1.000012501e-07 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 3  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 6  ( 7 )   NameLabels = 5  ( 5 )   ColorLabels = 2  ( 2 )   LayerLabels = 2  ( 2 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/ZI9 b/tests/de/step_1/ZI9
index 554a3dee4f..217dd0f97b 100644
--- a/tests/de/step_1/ZI9
+++ b/tests/de/step_1/ZI9
@@ -2,12 +2,12 @@
 set filename abs2.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 6 )  Warnings = 0  ( 0 )  Summary  = 0  ( 6 )
 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     = 10  ( 10 )   Summary  = 48  ( 48 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 10  ( 10 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 15  ( 15 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =   1.000024e-007  (   1.000024e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =    1.000024e-07  (    1.000024e-07 )
 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/ZP2 b/tests/de/step_1/ZP2
index c4106ed2ea..2165698460 100644
--- a/tests/de/step_1/ZP2
+++ b/tests/de/step_1/ZP2
@@ -2,12 +2,12 @@
 set filename tr9_3dt-sd.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
+DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 0 )  Summary  = 0  ( 3 )
 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     = 6  ( 6 )   Summary  = 34  ( 34 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 6  ( 6 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 12  ( 12 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.00009231e-007  (  1.00009231e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.00009231e-07  (  1.00009231e-07 )
 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/ZP3 b/tests/de/step_1/ZP3
index 484879296c..f314d7d4c0 100644
--- a/tests/de/step_1/ZP3
+++ b/tests/de/step_1/ZP3
@@ -2,12 +2,12 @@
 set filename tr9_asd-db.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 52 )  Warnings = 0  ( 0 )  Summary  = 0  ( 52 )
 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    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 49  ( 37 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 0  ( 0 )   FreeEdge  = 12 ( 12 )   SharedEdge = 12  ( 12 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 12  ( 12 )  N2Labels = 0  ( 0 )   TotalLabels = 13  ( 13 )   NameLabels = 1  ( 1 )   ColorLabels = 12  ( 12 )   LayerLabels = 12  ( 12 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZP8 b/tests/de/step_1/ZP8
index 2c4b3025d5..d0b97e5cb4 100644
--- a/tests/de/step_1/ZP8
+++ b/tests/de/step_1/ZP8
@@ -2,12 +2,12 @@
 set filename tr9_exd-db.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 18 )  Warnings = 0  ( 0 )  Summary  = 0  ( 18 )
 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    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 49  ( 37 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 0  ( 0 )   FreeEdge  = 12 ( 12 )   SharedEdge = 12  ( 12 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 12  ( 12 )  N2Labels = 0  ( 0 )   TotalLabels = 13  ( 13 )   NameLabels = 1  ( 1 )   ColorLabels = 12  ( 12 )   LayerLabels = 12  ( 12 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZP9 b/tests/de/step_1/ZP9
index f12667abc1..cf2c0f2cea 100644
--- a/tests/de/step_1/ZP9
+++ b/tests/de/step_1/ZP9
@@ -2,12 +2,12 @@
 set filename trj10_ch1-id-chs.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 4 )  Warnings = 0  ( 0 )  Summary  = 0  ( 4 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 3  ( 3 )  Summary  = 3  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 12  ( 12 )   Summary  = 73  ( 73 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 12  ( 12 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 28  ( 28 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 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/ZQ1 b/tests/de/step_1/ZQ1
index 83775ee5cd..19fd545fa2 100644
--- a/tests/de/step_1/ZQ1
+++ b/tests/de/step_1/ZQ1
@@ -2,12 +2,12 @@
 set filename trj10_ch1-tu-203.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 4 )  Warnings = 0  ( 0 )  Summary  = 0  ( 4 )
 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     = 0  ( 0 )   Summary  = 2  ( 2 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 0  ( 0 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 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/ZQ2 b/tests/de/step_1/ZQ2
index f251e543ba..13592457fe 100644
--- a/tests/de/step_1/ZQ2
+++ b/tests/de/step_1/ZQ2
@@ -2,12 +2,12 @@
 set filename trj12_gd1-id-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 2 )  Summary  = 0  ( 3 )
 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    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 7  ( 7 )   Summary  = 43  ( 43 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 7  ( 7 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 15  ( 15 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 6  ( 6 )  N2Labels = 0  ( 0 )   TotalLabels = 7  ( 7 )   NameLabels = 1  ( 1 )   ColorLabels = 4  ( 4 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/ZQ7 b/tests/de/step_1/ZQ7
index 55373a2d0f..7efe57a6a9 100644
--- a/tests/de/step_1/ZQ7
+++ b/tests/de/step_1/ZQ7
@@ -2,12 +2,12 @@
 set filename trj2_d2-db-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 178 )  Warnings = 0  ( 0 )  Summary  = 0  ( 178 )
 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     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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/ZQ8 b/tests/de/step_1/ZQ8
index a34a73af7f..f2a1bfce24 100644
--- a/tests/de/step_1/ZQ8
+++ b/tests/de/step_1/ZQ8
@@ -2,12 +2,12 @@
 set filename trj2_io1-ac-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 19 )  Warnings = 0  ( 0 )  Summary  = 0  ( 19 )
 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     = 29  ( 29 )   Summary  = 194  ( 194 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 29  ( 29 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 70  ( 70 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.000039198e-007  (  1.000039198e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =  1.000039198e-07  (  1.000039198e-07 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 1  ( 1 )  N2Labels = 0  ( 0 )   TotalLabels = 3  ( 3 )   NameLabels = 3  ( 3 )   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/ZR4 b/tests/de/step_1/ZR4
index ace69ebc85..e0caac89c8 100644
--- a/tests/de/step_1/ZR4
+++ b/tests/de/step_1/ZR4
@@ -2,12 +2,12 @@
 set filename trj2_io1-tc-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 7 )  Warnings = 0  ( 0 )  Summary  = 0  ( 7 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 16 )  Summary  = 0  ( 16 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 29  ( 29 )   Summary  = 193  ( 193 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 29  ( 29 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 70  ( 70 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.000039198e-007  (  1.000039198e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =  1.000039198e-07  (  1.000039198e-07 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 32  ( 32 )  N2Labels = 0  ( 0 )   TotalLabels = 33  ( 33 )   NameLabels = 1  ( 1 )   ColorLabels = 33  ( 33 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/ZS1 b/tests/de/step_1/ZS1
index 51a1db4319..41590fad0f 100644
--- a/tests/de/step_1/ZS1
+++ b/tests/de/step_1/ZS1
@@ -2,12 +2,12 @@
 set filename trj3_d1-pe-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 8 )  Warnings = 0  ( 0 )  Summary  = 0  ( 8 )
 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     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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/ZS2 b/tests/de/step_1/ZS2
index 5268538c19..fb26331df3 100644
--- a/tests/de/step_1/ZS2
+++ b/tests/de/step_1/ZS2
@@ -2,12 +2,12 @@
 set filename trj3_d1-tc-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 6 )  Warnings = 0  ( 0 )  Summary  = 0  ( 6 )
+DATA        : Faulties = 0  ( 11 )  Warnings = 0  ( 0 )  Summary  = 0  ( 11 )
 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    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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_1/ZS3 b/tests/de/step_1/ZS3
index 3f29c70321..04b9eaafd1 100644
--- a/tests/de/step_1/ZS3
+++ b/tests/de/step_1/ZS3
@@ -2,12 +2,12 @@
 set filename trj3_t2-db-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 16 )  Warnings = 0  ( 8 )  Summary  = 0  ( 24 )
 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    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 16  ( 16 )   Summary  = 95  ( 95 )
 STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 16  ( 16 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 34  ( 34 )
-TOLERANCE   : MaxTol   = 2.387546294e-005  ( 2.441868743e-005 )  AvgTol   =  6.169696469e-006  (  6.250926656e-006 )
+TOLERANCE   : MaxTol   = 2.387546294e-05  ( 2.441868743e-05 )  AvgTol   =  6.169696469e-06  (  6.250926656e-06 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   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/ZS4 b/tests/de/step_1/ZS4
index 58cc715741..f0796dc3dd 100644
--- a/tests/de/step_1/ZS4
+++ b/tests/de/step_1/ZS4
@@ -2,12 +2,12 @@
 set filename trj4_d2-pe-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 27 )  Warnings = 0  ( 0 )  Summary  = 0  ( 27 )
 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     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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/ZS5 b/tests/de/step_1/ZS5
index 3a28405cf6..07590fc2bd 100644
--- a/tests/de/step_1/ZS5
+++ b/tests/de/step_1/ZS5
@@ -2,12 +2,12 @@
 set filename trj4_d2-tc-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 6 )  Warnings = 0  ( 0 )  Summary  = 0  ( 6 )
+DATA        : Faulties = 0  ( 38 )  Warnings = 0  ( 0 )  Summary  = 0  ( 38 )
 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    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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_1/ZS7 b/tests/de/step_1/ZS7
index 8b02ace6ac..74188ed999 100644
--- a/tests/de/step_1/ZS7
+++ b/tests/de/step_1/ZS7
@@ -2,12 +2,12 @@
 set filename trj5_d3-pe-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 27 )  Warnings = 0  ( 0 )  Summary  = 0  ( 27 )
 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     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 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/ZS8 b/tests/de/step_1/ZS8
index 3611086fd8..e9bb180356 100644
--- a/tests/de/step_1/ZS8
+++ b/tests/de/step_1/ZS8
@@ -2,12 +2,12 @@
 set filename trj5_d3-tc-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 34 )  Warnings = 0  ( 0 )  Summary  = 0  ( 34 )
 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    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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_1/ZT5 b/tests/de/step_1/ZT5
index feacd0407e..35147559e6 100644
--- a/tests/de/step_1/ZT5
+++ b/tests/de/step_1/ZT5
@@ -2,12 +2,12 @@
 set filename trj6_c1-pe-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 19 )  Warnings = 0  ( 0 )  Summary  = 0  ( 19 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 4 )  Summary  = 0  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 7  ( 7 )   Summary  = 68  ( 65 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 7  ( 7 )   FreeWire = 0  ( 3 )   FreeEdge  = 6 ( 6 )   SharedEdge = 22  ( 22 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.001604854e-007 )  AvgTol   =  1.000071561e-007  (  1.00013885e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.001604854e-07 )  AvgTol   =  1.000071561e-07  (  1.00013885e-07 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 8  ( 8 )  N2Labels = 0  ( 0 )   TotalLabels = 12  ( 12 )   NameLabels = 7  ( 7 )   ColorLabels = 7  ( 7 )   LayerLabels = 3  ( 3 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 2  ( 2 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/step_1/ZT6 b/tests/de/step_1/ZT6
index 860f2c79ac..eeddf2c205 100644
--- a/tests/de/step_1/ZT6
+++ b/tests/de/step_1/ZT6
@@ -2,12 +2,12 @@
 set filename trj6_c1-sd-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 0 )  Summary  = 0  ( 3 )
+DATA        : Faulties = 0  ( 18 )  Warnings = 0  ( 0 )  Summary  = 0  ( 18 )
 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     = 7  ( 7 )   Summary  = 51  ( 51 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 7  ( 7 )   FreeWire = 0  ( 0 )   FreeEdge  = 1 ( 1 )   SharedEdge = 17  ( 17 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000082981e-007  (  1.000082981e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000082981e-07  (  1.000082981e-07 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 4  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 9  ( 9 )   NameLabels = 7  ( 7 )   ColorLabels = 5  ( 5 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/step_1/ZU1 b/tests/de/step_1/ZU1
index 809b558826..e1d5a6c203 100644
--- a/tests/de/step_1/ZU1
+++ b/tests/de/step_1/ZU1
@@ -2,12 +2,12 @@
 set filename trj6_d3-pe-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 30 )  Warnings = 0  ( 0 )  Summary  = 0  ( 30 )
 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     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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/ZU6 b/tests/de/step_1/ZU6
index 80820e4e2c..b2b338c3c0 100644
--- a/tests/de/step_1/ZU6
+++ b/tests/de/step_1/ZU6
@@ -2,12 +2,12 @@
 set filename trj7_c2-sd-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 18 )  Warnings = 0  ( 0 )  Summary  = 0  ( 18 )
 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     = 1  ( 1 )   Summary  = 17  ( 17 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 1 ( 1 )   SharedEdge = 5  ( 5 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.0000375e-007  (  1.0000375e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =   1.0000375e-07  (   1.0000375e-07 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 7  ( 7 )   NameLabels = 6  ( 6 )   ColorLabels = 3  ( 3 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/ZU7 b/tests/de/step_1/ZU7
index 2ecb65c3a8..be9b7e0aa0 100644
--- a/tests/de/step_1/ZU7
+++ b/tests/de/step_1/ZU7
@@ -2,12 +2,12 @@
 set filename trj7_c2-tu-203.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 8 )  Warnings = 0  ( 0 )  Summary  = 0  ( 8 )
 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     = 1  ( 1 )   Summary  = 21  ( 19 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 2 ( 2 )   SharedEdge = 6  ( 6 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 4  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 7  ( 7 )   NameLabels = 5  ( 5 )   ColorLabels = 3  ( 3 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_1/ZV4 b/tests/de/step_1/ZV4
index 7a5ada9638..9c20170f09 100644
--- a/tests/de/step_1/ZV4
+++ b/tests/de/step_1/ZV4
@@ -2,12 +2,12 @@
 set filename trj8_c2-id-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 7 )  Warnings = 0  ( 0 )  Summary  = 0  ( 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     = 1  ( 1 )   Summary  = 16  ( 16 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 1 ( 1 )   SharedEdge = 5  ( 5 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 3  ( 3 )   NameLabels = 1  ( 1 )   ColorLabels = 2  ( 2 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/ZV6 b/tests/de/step_1/ZV6
index cae21bb5ab..2e5ee6f809 100644
--- a/tests/de/step_1/ZV6
+++ b/tests/de/step_1/ZV6
@@ -2,12 +2,12 @@
 set filename trj8_c2-tu-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 7 )  Warnings = 0  ( 0 )  Summary  = 0  ( 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     = 1  ( 1 )   Summary  = 28  ( 28 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 1  ( 1 )   FreeWire = 0  ( 0 )   FreeEdge  = 1 ( 1 )   SharedEdge = 11  ( 11 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.000044118e-007  (  1.000044118e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =  1.000044118e-07  (  1.000044118e-07 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 3  ( 3 )   NameLabels = 1  ( 1 )   ColorLabels = 2  ( 2 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/ZW2 b/tests/de/step_1/ZW2
index 711cec2db5..b1cd88f525 100644
--- a/tests/de/step_1/ZW2
+++ b/tests/de/step_1/ZW2
@@ -2,12 +2,12 @@
 set filename trj9_io1-tu-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 0 )  Summary  = 0  ( 3 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 16 )  Summary  = 0  ( 16 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 29  ( 29 )   Summary  = 193  ( 193 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 29  ( 29 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 70  ( 70 )
-TOLERANCE   : MaxTol   =   1.00005e-007  (   1.00005e-007 )  AvgTol   =  1.000039198e-007  (  1.000039198e-007 )
+TOLERANCE   : MaxTol   =    1.00005e-07  (    1.00005e-07 )  AvgTol   =  1.000039198e-07  (  1.000039198e-07 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 3  ( 3 )   NameLabels = 1  ( 1 )   ColorLabels = 3  ( 3 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_1/ZW6 b/tests/de/step_1/ZW6
index 44d66186ca..43d3107645 100644
--- a/tests/de/step_1/ZW6
+++ b/tests/de/step_1/ZW6
@@ -2,12 +2,12 @@
 set filename tr9_3dt-ct.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 1 )  Summary  = 0  ( 3 )
 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     = 6  ( 6 )   Summary  = 34  ( 34 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 6  ( 6 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 12  ( 12 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.00009231e-007  (  1.00009231e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.00009231e-07  (  1.00009231e-07 )
 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/ZW7 b/tests/de/step_1/ZW7
index 93be8738db..7de6e11d4a 100644
--- a/tests/de/step_1/ZW7
+++ b/tests/de/step_1/ZW7
@@ -2,12 +2,12 @@
 set filename tr9_3dt-tc.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 0 )  Summary  = 0  ( 3 )
 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     = 6  ( 6 )   Summary  = 34  ( 34 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 6  ( 6 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 12  ( 12 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.00009231e-007  (  1.00009231e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.00009231e-07  (  1.00009231e-07 )
 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/ZW8 b/tests/de/step_1/ZW8
index f831f6646e..9e1f28c0dd 100644
--- a/tests/de/step_1/ZW8
+++ b/tests/de/step_1/ZW8
@@ -2,12 +2,12 @@
 set filename tr9_3dt-td.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 0 )  Summary  = 0  ( 3 )
 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     = 6  ( 6 )   Summary  = 34  ( 34 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 6  ( 6 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 12  ( 12 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.00009231e-007  (  1.00009231e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.00009231e-07  (  1.00009231e-07 )
 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/ZX3 b/tests/de/step_1/ZX3
index d508c9b92c..bfa6f5cfd5 100644
--- a/tests/de/step_1/ZX3
+++ b/tests/de/step_1/ZX3
@@ -2,12 +2,12 @@
 set filename brep_wv2.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 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    = 3  ( 3 )  Face     = 18  ( 18 )   Summary  = 100  ( 100 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 18  ( 18 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 36  ( 36 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.00009231e-007  (  1.00009231e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.00009231e-07  (  1.00009231e-07 )
 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/ZX4 b/tests/de/step_1/ZX4
index cae4911230..5ca40e2877 100644
--- a/tests/de/step_1/ZX4
+++ b/tests/de/step_1/ZX4
@@ -2,12 +2,12 @@
 set filename trj2_f1-db-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 26 )  Warnings = 0  ( 7 )  Summary  = 0  ( 33 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 6 )  Summary  = 6  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 12  ( 12 )   Summary  = 74  ( 74 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 12  ( 12 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 28  ( 28 )
-TOLERANCE   : MaxTol   = 2.387951736e-005  ( 2.442241729e-005 )  AvgTol   =  7.483015831e-006  (  7.582855671e-006 )
+TOLERANCE   : MaxTol   = 2.387951736e-05  ( 2.442241729e-05 )  AvgTol   =  7.483015831e-06  (  7.582855671e-06 )
 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/ZX7 b/tests/de/step_1/ZX7
index fced9ce97f..861a64aaf4 100644
--- a/tests/de/step_1/ZX7
+++ b/tests/de/step_1/ZX7
@@ -2,12 +2,12 @@
 set filename trj3_d1-db-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 44 )  Warnings = 0  ( 0 )  Summary  = 0  ( 44 )
 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     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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/ZX8 b/tests/de/step_1/ZX8
index 27ce20c047..524ee5373f 100644
--- a/tests/de/step_1/ZX8
+++ b/tests/de/step_1/ZX8
@@ -2,12 +2,12 @@
 set filename trj4_d2-db-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 63 )  Warnings = 0  ( 0 )  Summary  = 0  ( 63 )
 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     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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/ZX9 b/tests/de/step_1/ZX9
index bdb58dacf7..47cc0dc472 100644
--- a/tests/de/step_1/ZX9
+++ b/tests/de/step_1/ZX9
@@ -2,12 +2,12 @@
 set filename trj4_d2-tu-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 6 )  Warnings = 0  ( 0 )  Summary  = 0  ( 6 )
+DATA        : Faulties = 0  ( 28 )  Warnings = 0  ( 0 )  Summary  = 0  ( 28 )
 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     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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/ZY2 b/tests/de/step_1/ZY2
index da45427e15..b86895de20 100644
--- a/tests/de/step_1/ZY2
+++ b/tests/de/step_1/ZY2
@@ -2,12 +2,12 @@
 set filename trj5_d3-db-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 64 )  Warnings = 0  ( 0 )  Summary  = 0  ( 64 )
 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     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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/ZY3 b/tests/de/step_1/ZY3
index b1bc028387..f797ca4142 100644
--- a/tests/de/step_1/ZY3
+++ b/tests/de/step_1/ZY3
@@ -2,12 +2,12 @@
 set filename trj5_d3-tu-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 26 )  Warnings = 0  ( 0 )  Summary  = 0  ( 26 )
 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     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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/ZY6 b/tests/de/step_1/ZY6
index 074340237b..82ba7950cb 100644
--- a/tests/de/step_1/ZY6
+++ b/tests/de/step_1/ZY6
@@ -2,12 +2,12 @@
 set filename tr10_3dtxt_1_sd.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 0 )  Summary  = 0  ( 3 )
+DATA        : Faulties = 0  ( 8 )  Warnings = 0  ( 0 )  Summary  = 0  ( 8 )
 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     = 6  ( 6 )   Summary  = 34  ( 34 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 6  ( 6 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 12  ( 12 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.00009231e-007  (  1.00009231e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.00009231e-07  (  1.00009231e-07 )
 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/ZY7 b/tests/de/step_1/ZY7
index 0bc6c6491b..f12dd473fa 100644
--- a/tests/de/step_1/ZY7
+++ b/tests/de/step_1/ZY7
@@ -2,12 +2,12 @@
 set filename tr10_3dtxt_2_sd.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 3 )  Warnings = 0  ( 0 )  Summary  = 0  ( 3 )
+DATA        : Faulties = 0  ( 10 )  Warnings = 0  ( 0 )  Summary  = 0  ( 10 )
 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     = 6  ( 6 )   Summary  = 34  ( 34 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 6  ( 6 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 12  ( 12 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.00009231e-007  (  1.00009231e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.00009231e-07  (  1.00009231e-07 )
 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/ZY8 b/tests/de/step_1/ZY8
index 6e9121e91f..421e9812ee 100644
--- a/tests/de/step_1/ZY8
+++ b/tests/de/step_1/ZY8
@@ -2,12 +2,12 @@
 set filename trj6_d3-db-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 63 )  Warnings = 0  ( 0 )  Summary  = 0  ( 63 )
 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     = 9  ( 9 )   Summary  = 55  ( 55 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 9  ( 9 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 21  ( 21 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.000093336e-007  (  1.000093336e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.000093336e-07  (  1.000093336e-07 )
 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/ZZ7 b/tests/de/step_1/ZZ7
index d33e9d165d..d40bf679d1 100644
--- a/tests/de/step_1/ZZ7
+++ b/tests/de/step_1/ZZ7
@@ -6,7 +6,7 @@ puts "TODO CR23096 ALL: PROPS : Faulty"
 set filename s1-pe-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 9 )  Warnings = 0  ( 0 )  Summary  = 0  ( 9 )
 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    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 13  ( 13 )
diff --git a/tests/de/step_2/A1 b/tests/de/step_2/A1
index 8224020e0e..bd0cb9c166 100644
--- a/tests/de/step_2/A1
+++ b/tests/de/step_2/A1
@@ -6,12 +6,12 @@ set ProductMode OFF
 set filename PRO20361-2.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 51 )  Summary  = 0  ( 51 )
+DATA        : Faulties = 0  ( 4 )  Warnings = 0  ( 0 )  Summary  = 0  ( 4 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 3 )  Summary  = 0  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 48  ( 48 )  Face     = 48  ( 48 )   Summary  = 705  ( 705 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 48  ( 48 )  Face     = 48  ( 48 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 266  ( 266 )
-TOLERANCE   : MaxTol   = 0.001635034952  ( 0.001635034951 )  AvgTol   =  1.541289792e-005  (  1.541289793e-005 )
+TOLERANCE   : MaxTol   = 0.001635034952  ( 0.001635034951 )  AvgTol   =  1.541289792e-05  (  1.541289793e-05 )
 LABELS      : N0Labels = 1  ( 2 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 2 )   NameLabels = 1  ( 2 )   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/A2 b/tests/de/step_2/A2
index 595dd900b1..9f57242421 100644
--- a/tests/de/step_2/A2
+++ b/tests/de/step_2/A2
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: TPSTAT : Faulty"
 set filename ass-tol2.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
+DATA        : Faulties = 0  ( 200 )  Warnings = 0  ( 0 )  Summary  = 0  ( 200 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 155  ( 30 )  Summary  = 155  ( 30 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 17  ( 17 )  Shell    = 17  ( 17 )  Face     = 366  ( 366 )   Summary  = 2774  ( 2752 )
 STATSHAPE   : Solid    = 23  ( 23 )  Shell    = 23  ( 23 )  Face     = 402  ( 402 )   FreeWire = 0  ( 0 )   FreeEdge  = 21 ( 21 )   SharedEdge = 1095  ( 1095 )
-TOLERANCE   : MaxTol   = 0.0009825722198  ( 0.0009825722195 )  AvgTol   =  5.215035253e-005  (  5.153575432e-005 )
+TOLERANCE   : MaxTol   = 0.0009825722198  ( 0.0009825722195 )  AvgTol   =  5.215035253e-05  (  5.153575432e-05 )
 LABELS      : N0Labels = 14  ( 14 )  N1Labels = 19  ( 19 )  N2Labels = 0  ( 0 )   TotalLabels = 33  ( 33 )   NameLabels = 33  ( 33 )   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/A6 b/tests/de/step_2/A6
index 5c84c98b1f..21695dfdc9 100644
--- a/tests/de/step_2/A6
+++ b/tests/de/step_2/A6
@@ -5,7 +5,7 @@ puts "TODO CR23096 ALL: NBSHAPES : Faulty"
 set filename t3d_opt.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 84 )  Warnings = 0  ( 0 )  Summary  = 0  ( 84 )
+DATA        : Faulties = 0  ( 126 )  Warnings = 0  ( 210 )  Summary  = 0  ( 336 )
 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  = 1477  ( 1508 )
diff --git a/tests/de/step_2/A7 b/tests/de/step_2/A7
index 38f1ec1dd3..ba2cfc520c 100644
--- a/tests/de/step_2/A7
+++ b/tests/de/step_2/A7
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename trj5_pm3-ac-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 20  ( 31 )  Summary  = 20  ( 31 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 49  ( 49 )  Shell    = 49  ( 49 )  Face     = 615  ( 615 )   Summary  = 4330  ( 4234 )
 STATSHAPE   : Solid    = 88  ( 88 )  Shell    = 88  ( 88 )  Face     = 1079  ( 1079 )   FreeWire = 0  ( 0 )   FreeEdge  = 96 ( 96 )   SharedEdge = 1611  ( 1611 )
-TOLERANCE   : MaxTol   = 0.007650852625  (  0.00792935897 )  AvgTol   =  8.776936133e-005  (  8.913893466e-005 )
+TOLERANCE   : MaxTol   = 0.007650852625  (  0.00792935897 )  AvgTol   =  8.776936133e-05  (  8.913893466e-05 )
 LABELS      : N0Labels = 78  ( 78 )  N1Labels = 196  ( 202 )  N2Labels = 0  ( 0 )   TotalLabels = 274  ( 280 )   NameLabels = 178  ( 178 )   ColorLabels = 145  ( 145 )   LayerLabels = 145  ( 151 )
 PROPS       : Centroid = 74  ( 74 )  Volume   = 74  ( 74 )  Area     = 74  ( 74 )
 NCOLORS     : NColors  = 16  ( 16 )
diff --git a/tests/de/step_2/C7 b/tests/de/step_2/C7
index 3b77904f61..2391605651 100644
--- a/tests/de/step_2/C7
+++ b/tests/de/step_2/C7
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename r0401_sd.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 740 )  Warnings = 0  ( 0 )  Summary  = 0  ( 740 )
 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    = 2  ( 2 )  Shell    = 4  ( 4 )  Face     = 234  ( 234 )   Summary  = 2951  ( 2581 )
 STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 4  ( 4 )  Face     = 234  ( 234 )   FreeWire = 0  ( 0 )   FreeEdge  = 370 ( 370 )   SharedEdge = 957  ( 957 )
-TOLERANCE   : MaxTol   = 7.686750629e-007  ( 7.686674478e-007 )  AvgTol   =  1.10062468e-007  (  1.100624453e-007 )
+TOLERANCE   : MaxTol   = 7.686750629e-07  ( 7.686674478e-07 )  AvgTol   =  1.10062468e-07  (  1.100624453e-07 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 385  ( 15 )  N2Labels = 0  ( 0 )   TotalLabels = 390  ( 20 )   NameLabels = 9  ( 9 )   ColorLabels = 384  ( 15 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/step_2/E2 b/tests/de/step_2/E2
index 37508463c7..d85bd1933d 100644
--- a/tests/de/step_2/E2
+++ b/tests/de/step_2/E2
@@ -6,12 +6,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename trj7_pm5-ac-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 92 )  Warnings = 0  ( 0 )  Summary  = 0  ( 92 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 11  ( 13 )  Summary  = 11  ( 13 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 11  ( 11 )  Shell    = 12  ( 11 )  Face     = 641  ( 641 )   Summary  = 4041  ( 4041 )
 STATSHAPE   : Solid    = 11  ( 11 )  Shell    = 12  ( 11 )  Face     = 641  ( 641 )   FreeWire = 0  ( 0 )   FreeEdge  = 1 ( 1 )   SharedEdge = 1643  ( 1643 )
-TOLERANCE   : MaxTol   = 1.000100003e-007  ( 1.000100003e-007 )  AvgTol   =  1.00004229e-007  (  1.00004229e-007 )
+TOLERANCE   : MaxTol   = 1.000100003e-07  ( 1.000100003e-07 )  AvgTol   =  1.00004229e-07  (  1.00004229e-07 )
 LABELS      : N0Labels = 20  ( 20 )  N1Labels = 29  ( 30 )  N2Labels = 0  ( 0 )   TotalLabels = 49  ( 50 )   NameLabels = 48  ( 48 )   ColorLabels = 13  ( 13 )   LayerLabels = 13  ( 13 )
 PROPS       : Centroid = 17  ( 17 )  Volume   = 17  ( 17 )  Area     = 17  ( 17 )
 NCOLORS     : NColors  = 7  ( 7 )
diff --git a/tests/de/step_2/F6 b/tests/de/step_2/F6
index 6e07146691..ea0614506b 100644
--- a/tests/de/step_2/F6
+++ b/tests/de/step_2/F6
@@ -2,7 +2,7 @@
 set filename BUC61003-1.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 346 )  Warnings = 0  ( 0 )  Summary  = 0  ( 346 )
+DATA        : Faulties = 0  ( 348 )  Warnings = 0  ( 1037 )  Summary  = 0  ( 1385 )
 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     = 472  ( 472 )   Summary  = 2616  ( 2616 )
diff --git a/tests/de/step_2/F7 b/tests/de/step_2/F7
index e5744ad47f..91b356b81c 100644
--- a/tests/de/step_2/F7
+++ b/tests/de/step_2/F7
@@ -2,7 +2,7 @@
 set filename BUC61003-2.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 10 )  Warnings = 0  ( 0 )  Summary  = 0  ( 10 )
+DATA        : Faulties = 0  ( 12 )  Warnings = 0  ( 29 )  Summary  = 0  ( 41 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 30  ( 42 )  Summary  = 30  ( 42 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 26  ( 26 )   Summary  = 199  ( 199 )
diff --git a/tests/de/step_2/G6 b/tests/de/step_2/G6
index 4747911e17..c437d5dc9b 100644
--- a/tests/de/step_2/G6
+++ b/tests/de/step_2/G6
@@ -2,12 +2,12 @@
 set filename PRO10360.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 6 )  Warnings = 0  ( 0 )  Summary  = 0  ( 6 )
+DATA        : Faulties = 0  ( 30 )  Warnings = 0  ( 0 )  Summary  = 0  ( 30 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 45 )  Summary  = 9  ( 45 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 5  ( 5 )  Shell    = 6  ( 6 )  Face     = 78  ( 78 )   Summary  = 468  ( 468 )
 STATSHAPE   : Solid    = 5  ( 5 )  Shell    = 6  ( 6 )  Face     = 78  ( 78 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 179  ( 179 )
-TOLERANCE   : MaxTol   = 1.742202567e-005  ( 0.0003632648967 )  AvgTol   =  9.910714408e-007  (  6.746245548e-006 )
+TOLERANCE   : MaxTol   = 1.742202567e-05  ( 0.0003632648967 )  AvgTol   =  9.91071441e-07  (  6.746245548e-06 )
 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/H1 b/tests/de/step_2/H1
index 3a958fcac0..dca3050140 100644
--- a/tests/de/step_2/H1
+++ b/tests/de/step_2/H1
@@ -2,12 +2,12 @@
 set filename PRO7073.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 123 )  Warnings = 0  ( 0 )  Summary  = 0  ( 123 )
 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.1618955924  (   0.3526187023 )  AvgTol   =   0.03794615013  (   0.05391633347 )
+TOLERANCE   : MaxTol   =  0.05706634351  (  0.05706634351 )  AvgTol   =   0.01188180152  (   0.01188858328 )
 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/I1 b/tests/de/step_2/I1
index 8c21f160a2..237e6fe2e3 100644
--- a/tests/de/step_2/I1
+++ b/tests/de/step_2/I1
@@ -2,12 +2,12 @@
 set filename absmx.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 17 )  Warnings = 0  ( 0 )  Summary  = 0  ( 17 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 17  ( 17 )  Summary  = 17  ( 17 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 70  ( 70 )   Summary  = 415  ( 415 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 70  ( 70 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 157  ( 157 )
-TOLERANCE   : MaxTol   =         1e-007  (         1e-007 )  AvgTol   =          1e-007  (          1e-007 )
+TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 2  ( 2 )   NameLabels = 2  ( 2 )   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/I2 b/tests/de/step_2/I2
index 133a636bfb..82b1282c4f 100644
--- a/tests/de/step_2/I2
+++ b/tests/de/step_2/I2
@@ -2,12 +2,12 @@
 set filename absmx2.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 17 )  Warnings = 0  ( 0 )  Summary  = 0  ( 17 )
 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    = 2  ( 2 )  Face     = 70  ( 70 )   Summary  = 425  ( 425 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 70  ( 70 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 162  ( 162 )
-TOLERANCE   : MaxTol   = 8.362307401e-006  ( 1.048889537e-005 )  AvgTol   =  1.956621381e-007  (  2.202233081e-007 )
+TOLERANCE   : MaxTol   = 8.362307401e-06  ( 1.048889537e-05 )  AvgTol   =  1.956621381e-07  (  2.202233081e-07 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 2  ( 2 )   NameLabels = 2  ( 2 )   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/I3 b/tests/de/step_2/I3
index 3e0af9683a..04b8688378 100644
--- a/tests/de/step_2/I3
+++ b/tests/de/step_2/I3
@@ -2,12 +2,12 @@
 set filename absmxn.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 17 )  Warnings = 0  ( 0 )  Summary  = 0  ( 17 )
 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    = 2  ( 2 )  Face     = 70  ( 70 )   Summary  = 425  ( 425 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 2  ( 2 )  Face     = 70  ( 70 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 162  ( 162 )
-TOLERANCE   : MaxTol   = 8.362307401e-006  ( 1.048889537e-005 )  AvgTol   =  1.956621381e-007  (  2.202233081e-007 )
+TOLERANCE   : MaxTol   = 8.362307401e-06  ( 1.048889537e-05 )  AvgTol   =  1.956621381e-07  (  2.202233081e-07 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 2  ( 2 )   NameLabels = 2  ( 2 )   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/N3 b/tests/de/step_2/N3
index 8e1258914e..b84e396311 100644
--- a/tests/de/step_2/N3
+++ b/tests/de/step_2/N3
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: TPSTAT : Faulty"
 set filename ec_turbine-A.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 7 )  Warnings = 0  ( 0 )  Summary  = 0  ( 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    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 53  ( 53 )   Summary  = 315  ( 314 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 53  ( 53 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 131  ( 130 )
-TOLERANCE   : MaxTol   = 3.83146359e-005  ( 4.239045465e-005 )  AvgTol   =  6.991592063e-006  (  7.802264042e-006 )
+TOLERANCE   : MaxTol   = 3.83146359e-05  ( 4.239045465e-05 )  AvgTol   =  6.991592063e-06  (  7.802264042e-06 )
 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/Q7 b/tests/de/step_2/Q7
index f0eba095e9..1152ef38c6 100644
--- a/tests/de/step_2/Q7
+++ b/tests/de/step_2/Q7
@@ -2,12 +2,12 @@
 set filename t3m.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 10 )  Warnings = 0  ( 0 )  Summary  = 0  ( 10 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 10  ( 10 )  Summary  = 10  ( 10 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 71  ( 71 )   Summary  = 449  ( 449 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 71  ( 71 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 179  ( 179 )
-TOLERANCE   : MaxTol   = 6.768863095e-006  ( 6.768863095e-006 )  AvgTol   =  3.117603961e-007  (  3.162986721e-007 )
+TOLERANCE   : MaxTol   = 6.768863095e-06  ( 6.768863095e-06 )  AvgTol   =  3.117603961e-07  (  3.162986721e-07 )
 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/Y5 b/tests/de/step_2/Y5
index 9025f8359e..a36b39e710 100644
--- a/tests/de/step_2/Y5
+++ b/tests/de/step_2/Y5
@@ -6,7 +6,7 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename BUC60810.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 9 )  Warnings = 0  ( 0 )  Summary  = 0  ( 9 )
 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    = 10  ( 10 )  Shell    = 12  ( 12 )  Face     = 269  ( 269 )   Summary  = 1638  ( 1636 )
diff --git a/tests/de/step_3/A2 b/tests/de/step_3/A2
index cf9265c2a1..adbde44c47 100644
--- a/tests/de/step_3/A2
+++ b/tests/de/step_3/A2
@@ -2,12 +2,12 @@
 set filename TUBE1.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1435 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1435 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 1047 )  Summary  = 0  ( 1047 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 211  ( 211 )  Shell    = 212  ( 212 )  Face     = 1585  ( 1585 )   Summary  = 8951  ( 8951 )
 STATSHAPE   : Solid    = 211  ( 211 )  Shell    = 212  ( 212 )  Face     = 1585  ( 1585 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3084  ( 3084 )
-TOLERANCE   : MaxTol   = 0.003688364238  ( 0.003688364252 )  AvgTol   =  2.561768589e-005  (  2.887753385e-005 )
+TOLERANCE   : MaxTol   = 0.003688364238  ( 0.003688364252 )  AvgTol   =  2.561768589e-05  (  2.887753385e-05 )
 LABELS      : N0Labels = 206  ( 206 )  N1Labels = 205  ( 205 )  N2Labels = 0  ( 0 )   TotalLabels = 411  ( 411 )   NameLabels = 411  ( 411 )   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/C3 b/tests/de/step_3/C3
index 67b2143195..7a938af727 100644
--- a/tests/de/step_3/C3
+++ b/tests/de/step_3/C3
@@ -6,12 +6,12 @@ puts "TODO CR23096 ALL: STATSHAPE : Faulty"
 set filename tr10_r0501_db.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 61 )  Warnings = 0  ( 0 )  Summary  = 0  ( 61 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 170  ( 3 )  Summary  = 170  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 4252  ( 61 )  Face     = 4252  ( 4252 )   Summary  = 46793  ( 42467 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 4252  ( 61 )  Face     = 4252  ( 4252 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 17171  ( 17171 )
-TOLERANCE   : MaxTol   =  0.01863822385  (  0.02412563428 )  AvgTol   =  2.362737276e-005  (  0.0001293920562 )
+TOLERANCE   : MaxTol   =  0.01863822385  (  0.02412563428 )  AvgTol   =  2.362737276e-05  (  0.0001293920562 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 4313  ( 4313 )  N2Labels = 0  ( 0 )   TotalLabels = 4314  ( 4314 )   NameLabels = 1  ( 1 )   ColorLabels = 4242  ( 4242 )   LayerLabels = 4252  ( 4252 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_3/C4 b/tests/de/step_3/C4
index 8a07fee4c5..6eb5ff55a7 100644
--- a/tests/de/step_3/C4
+++ b/tests/de/step_3/C4
@@ -5,12 +5,12 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 set filename UKI60591.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 6 )  Warnings = 0  ( 0 )  Summary  = 0  ( 6 )
 TPSTAT      : Faulties = 0  ( 6 )  Warnings = 16  ( 35 )  Summary  = 16  ( 41 )
 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 )
+TOLERANCE   : MaxTol   =   0.2224706003  (   0.2224706003 )  AvgTol   =  0.003966127037  (  0.003995856355 )
 LABELS      : N0Labels = 28  ( 28 )  N1Labels = 32  ( 23 )  N2Labels = 0  ( 0 )   TotalLabels = 60  ( 51 )   NameLabels = 51  ( 51 )   ColorLabels = 27  ( 22 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_3/C7 b/tests/de/step_3/C7
index ca48215652..338f2ceabc 100644
--- a/tests/de/step_3/C7
+++ b/tests/de/step_3/C7
@@ -6,7 +6,7 @@ puts "TODO CR23096 ALL: STATSHAPE : Faulty"
 set filename bm1_db_exhaust.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 1 )  Warnings = 0  ( 1 )  Summary  = 0  ( 2 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 6 )  Summary  = 9  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 11  ( 3 )  Face     = 48  ( 48 )   Summary  = 891  ( 868 )
diff --git a/tests/de/step_4/A6 b/tests/de/step_4/A6
index 6d6736f707..ba126401a9 100644
--- a/tests/de/step_4/A6
+++ b/tests/de/step_4/A6
@@ -2,7 +2,7 @@
 set filename BUC61003-4.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 230 )  Warnings = 0  ( 0 )  Summary  = 0  ( 230 )
+DATA        : Faulties = 0  ( 232 )  Warnings = 0  ( 681 )  Summary  = 0  ( 913 )
 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    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 350  ( 350 )   Summary  = 2203  ( 2203 )
diff --git a/tests/de/step_4/G6 b/tests/de/step_4/G6
index 017a1c3825..85dc441760 100644
--- a/tests/de/step_4/G6
+++ b/tests/de/step_4/G6
@@ -2,7 +2,7 @@
 set filename BUC61003-3.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 406 )  Warnings = 0  ( 0 )  Summary  = 0  ( 406 )
+DATA        : Faulties = 0  ( 408 )  Warnings = 0  ( 1209 )  Summary  = 0  ( 1617 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 108  ( 168 )  Summary  = 108  ( 168 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 34  ( 34 )  Shell    = 34  ( 34 )  Face     = 3882  ( 3882 )   Summary  = 23997  ( 23997 )
diff --git a/tests/de/step_4/H3 b/tests/de/step_4/H3
index 48ebe32733..8a5612249a 100644
--- a/tests/de/step_4/H3
+++ b/tests/de/step_4/H3
@@ -2,7 +2,7 @@
 set filename trj10_pm8-ct-214.stp
 
 set ref_data {
-DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
+DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 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  = 3346  ( 3346 )