diff --git a/tests/de/end b/tests/de/end
index 1c96dcd23f..2a4709e7ed 100644
--- a/tests/de/end
+++ b/tests/de/end
@@ -33,8 +33,8 @@ set MaxTol_Second 0; set AvgTol_Second 0
 set sol_First 0; set she_First 0; set fac_First 0; set fwir_First 0; set fedg_First 0; set sedg_First 0
 set sol_Second 0; set she_Second 0; set fac_Second 0; set fwir_Second 0; set fedg_Second 0; set sedg_Second 0
 ############################################# NBSHAPES #############
-set fa_First 0; set sh_First 0; set so_First 0; set co_First 0; set shpp_First 0
-set fa_Second 0; set sh_Second 0; set so_Second 0; set co_Second 0; set shpp_Second 0
+set fa_First 0; set sh_First 0; set so_First 0; set co_First 0; set shpp_First 0;
+set fa_Second 0; set sh_Second 0; set so_Second 0; set co_Second 0; set shpp_Second 0;
 ###################################### CHECKSHAPE ##################
 set chwi_First 0; set chfa_First 0; set chsh_First 0; set chso_First 0
 set chwi_Second 0; set chfa_Second 0; set chsh_Second 0; set chso_Second 0
@@ -408,8 +408,6 @@ if { $mist < 1 } {
     set dat_check "DATA : OK"
     set tpst_check "TPSTAT : OK"
     set check_check "CHECKSHAPE : OK"
-    set nbsh_check "NBSHAPES : OK"
-    set ststh_check "STATSHAPE : OK"
     set toler_check "TOLERANCE : OK"
     set lbls_check "LABELS : OK"
     set prps_check "PROPS : OK"
@@ -419,46 +417,64 @@ if { $mist < 1 } {
     if { $dcomp_First <  $dcomp_Second ||  $dfal_First < $dfal_Second } {
 	set dat_check "DATA : Faulty"
 	append todo_msg $todo_mask $dat_check $end_line
+        append dat_check { (increase number of}
+        if { $dcomp_First <  $dcomp_Second } { append dat_check { warnings} }
+        if { $dfal_First < $dfal_Second } { append dat_check { faulties} }
+        append dat_check ")"
     }
-    if { $fal_First < $fal_Second || $war_First < $war_Second } {
-       	
+    if { $fal_First < $fal_Second} {       	
 	set tpst_check "TPSTAT : Faulty"
 	append todo_msg $todo_mask $tpst_check $end_line
+        append tpst_check { (increase number of faulties)}
     } 
     if { $chwi_First < $chwi_Second || $chfa_First < $chfa_Second || $chsh_First < $chsh_Second || $chso_First < $chso_Second } {
 	set check_check "CHECKSHAPE : Faulty" 
 	append todo_msg $todo_mask $check_check $end_line
-    }
-    if { ($isIGES == 0 && $shpp_First > $shpp_Second) || 
-         ($isIGES == 1 && ($shpp_First - $co_First) > ($shpp_Second - $co_Second))} {
-	set nbsh_check "NBSHAPES : Faulty" 
-	append todo_msg $todo_mask $nbsh_check $end_line
-    }
-    if { $sol_First < $sol_Second || $she_First < $she_Second || $fac_First < $fac_Second || $fwir_First < $fwir_Second || $fedg_First < $fedg_Second} {
-	set ststh_check "STATSHAPE : Faulty"
-	append todo_msg $todo_mask $ststh_check $end_line
+        append check_check { (increase number of non-valid}
+        if { $chwi_First < $chwi_Second } { append check_check { wires} }
+        if { $chfa_First < $chfa_Second } { append check_check { faces} }
+        if { $chsh_First < $chsh_Second } { append check_check { shels} }
+        if { $chso_First < $chso_Second } { append check_check { solids} }
+        append check_check ")"
+         
     }
    
     if { ([expr 1.*($MaxTol_Second - $MaxTol_First)] > [expr 0.0001 * $MaxTol_First] && [expr 1. * abs($MaxTol_First-$MaxTol_Second)] > 0.0000001) || ($MaxTol_Second == 0 && $MaxTol_First > 0)} {
 	set toler_check "TOLERANCE : Faulty"
 	append todo_msg $todo_mask $toler_check $end_line
+        append toler_check { (increase tolerance from } $MaxTol_First { to } $MaxTol_Second {)}
     }
     
     if { $nblev0_First != $nblev0_Second || $nblev1_First != $nblev1_Second || $nblev2_First != $nblev2_Second || $nblev_total_First != $nblev_total_Second || $nbshname_First != $nbshname_Second || $nbshcolor_First != $nbshcolor_Second || $nbshlayer_First != $nbshlayer_Second } {
 	set lbls_check "LABELS : Faulty"
 	append todo_msg $todo_mask $lbls_check $end_line
+        append lbls_check { (number of labels}
+        if { $nblev0_First != $nblev0_Second } { append lbls_check { level_0} }
+        if { $nblev1_First != $nblev1_Second } { append lbls_check { level_1} }
+        if { $nblev2_First != $nblev2_Second } { append lbls_check { level_2} }
+        if { $nbshname_First != $nbshname_Second } { append lbls_check { with_names} }
+        if { $nbshcolor_First != $nbshcolor_Second } { append lbls_check { with_colors} }
+        if { $nbshlayer_First != $nbshlayer_Second } { append lbls_check { with_layers} }
+        append lbls_check { are not equal)}
     }
     if { $nbcentroid_First != $nbcentroid_Second || $nbvolume_First != $nbvolume_Second || $nbarea_First != $nbarea_Second } {
 	set prps_check "PROPS : Faulty"
 	append todo_msg $todo_mask $prps_check $end_line
+        append prps_check { (number of}
+        if { $nbcentroid_First != $nbcentroid_Second } { append prps_check { centroids} }
+        if { $nbvolume_First != $nbvolume_Second } { append prps_check { volumes} }
+        if { $nbarea_First != $nbarea_Second } { append prps_check { areas} }
+        append prps_check { are not equal)}
     }
     if { $nbcolor_First != $nbcolor_Second } {
 	set clrs_check "COLORS : Faulty"
 	append todo_msg $todo_mask $clrs_check $end_line
+        append clrs_check { (number of colors are not equal)}
     }
     if { $nblayer_First != $nblayer_Second } {
 	set lrs_check "LAYERS : Faulty"
 	append todo_msg $todo_mask $lrs_check $end_line
+        append lrs_check { (number of layers are not equal)}
     }
 }
 
@@ -521,8 +537,6 @@ if {$mist == 1 }  {
 	    puts $dat_check
 	    puts $tpst_check
 	    puts $check_check
-	    puts $nbsh_check
-	    puts $ststh_check
 	    puts $toler_check
 	    puts $lbls_check
 	    puts $prps_check
diff --git a/tests/de/iges_1/A4 b/tests/de/iges_1/A4
index 9856e59bff..23bfa8dd53 100644
--- a/tests/de/iges_1/A4
+++ b/tests/de/iges_1/A4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename matinf.igs
 
 set ref_data {
diff --git a/tests/de/iges_1/A5 b/tests/de/iges_1/A5
index 723b60ada9..6b9c42d58c 100644
--- a/tests/de/iges_1/A5
+++ b/tests/de/iges_1/A5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename poininfo.igs
 
 set ref_data {
diff --git a/tests/de/iges_1/A6 b/tests/de/iges_1/A6
index bb9e033049..7a80733bd7 100644
--- a/tests/de/iges_1/A6
+++ b/tests/de/iges_1/A6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename s01.igs
 
 set ref_data {
diff --git a/tests/de/iges_1/B6 b/tests/de/iges_1/B6
index f3f810553d..b02f969f51 100644
--- a/tests/de/iges_1/B6
+++ b/tests/de/iges_1/B6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename CTS18314.igs
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 10 )  Warnings = 308  ( 102 )  Summary  = 308  ( 1
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 2 )   Solids   = 0 ( 2 )
 NBSHAPES    : Solid    = 0  ( 30 )  Shell    = 0  ( 30 )  Face     = 390  ( 390 )   Summary  = 4699  ( 2569 )
 STATSHAPE   : Solid    = 0  ( 30 )  Shell    = 0  ( 30 )  Face     = 390  ( 390 )   FreeWire = 0  ( 0 )   FreeEdge  = 50 ( 50 )   SharedEdge = 1908  ( 994 )
-TOLERANCE   : MaxTol   =  0.03576190045  (  0.03576190009 )  AvgTol   =  8.616971914e-005  (  0.0003710077648 )
+TOLERANCE   : MaxTol   =  0.03576190045  (  0.03576190009 )  AvgTol   =  8.616971914e-005  (  0.000371007765 )
 LABELS      : N0Labels = 108  ( 108 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 108  ( 108 )   NameLabels = 108  ( 108 )   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/iges_1/B9 b/tests/de/iges_1/B9
index c1abf8de7e..c18d994952 100644
--- a/tests/de/iges_1/B9
+++ b/tests/de/iges_1/B9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename CTS18544.igs
 
 set ref_data {
diff --git a/tests/de/iges_1/D7 b/tests/de/iges_1/D7
index d915179800..c2d506d57b 100644
--- a/tests/de/iges_1/D7
+++ b/tests/de/iges_1/D7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename CTS21884.igs
 
 set ref_data {
diff --git a/tests/de/iges_1/F6 b/tests/de/iges_1/F6
index 54e288b494..55b9d2c5fa 100644
--- a/tests/de/iges_1/F6
+++ b/tests/de/iges_1/F6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename TEC0278.igs
 
 set ref_data {
diff --git a/tests/de/iges_1/F9 b/tests/de/iges_1/F9
index e274f35697..986afa0d93 100644
--- a/tests/de/iges_1/F9
+++ b/tests/de/iges_1/F9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename UKI60095.igs
 
 set ref_data {
diff --git a/tests/de/iges_1/H5 b/tests/de/iges_1/H5
index 87aaf83bd1..49d8307bf6 100644
--- a/tests/de/iges_1/H5
+++ b/tests/de/iges_1/H5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
diff --git a/tests/de/iges_1/H6 b/tests/de/iges_1/H6
index e11d8e689a..389c086a41 100644
--- a/tests/de/iges_1/H6
+++ b/tests/de/iges_1/H6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
diff --git a/tests/de/iges_1/H7 b/tests/de/iges_1/H7
index f918e5f664..68e3d4bbf1 100644
--- a/tests/de/iges_1/H7
+++ b/tests/de/iges_1/H7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/I1 b/tests/de/iges_1/I1
index 418dd9db8c..1562e219b6 100644
--- a/tests/de/iges_1/I1
+++ b/tests/de/iges_1/I1
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/I2 b/tests/de/iges_1/I2
index 90b3812538..a3def60633 100644
--- a/tests/de/iges_1/I2
+++ b/tests/de/iges_1/I2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/I8 b/tests/de/iges_1/I8
index 3d89b31e5a..c3f3f5d37c 100644
--- a/tests/de/iges_1/I8
+++ b/tests/de/iges_1/I8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/J7 b/tests/de/iges_1/J7
index 5a9b6035b6..8b3de5669a 100644
--- a/tests/de/iges_1/J7
+++ b/tests/de/iges_1/J7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/J8 b/tests/de/iges_1/J8
index b32ea67526..9abe17d258 100644
--- a/tests/de/iges_1/J8
+++ b/tests/de/iges_1/J8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/J9 b/tests/de/iges_1/J9
index 7fae5a3b8d..77e5df085c 100644
--- a/tests/de/iges_1/J9
+++ b/tests/de/iges_1/J9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 
 
diff --git a/tests/de/iges_1/K5 b/tests/de/iges_1/K5
index 6933c14c43..cd25d7c816 100644
--- a/tests/de/iges_1/K5
+++ b/tests/de/iges_1/K5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/K9 b/tests/de/iges_1/K9
index 27e3a80efa..430b2f4895 100644
--- a/tests/de/iges_1/K9
+++ b/tests/de/iges_1/K9
@@ -1,14 +1,14 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 Windows: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty" 
-puts "TODO CR23096 Mandriva2010: TOLERANCE : Faulty"
 puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty"
 
+puts "TODO CR23096 Mandriva2010: TOLERANCE : Faulty " 
+
+puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
+
 set LinuxDiff 3
-set LinuxFaulties {STATSHAPE TOLERANCE}
+set LinuxFaulties {TOLERANCE}
 set filename Inner.igs
 
 set ref_data {
@@ -17,7 +17,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 17  ( 867 )  Summary  = 17  ( 867
 CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 392  ( 392 )   Summary  = 10888  ( 10908 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 392  ( 392 )   FreeWire = 97  ( 121 )   FreeEdge  = 1546 ( 1546 )   SharedEdge = 4314  ( 4310 )
-TOLERANCE   : MaxTol   =   0.9393822539  (   0.9393822539 )  AvgTol   =   0.01467424646  (   0.01255966391 )
+TOLERANCE   : MaxTol   =   0.9393822539  (   0.9393822539 )  AvgTol   =   0.01467424666  (   0.01255966411 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 1695  ( 3509 )  N2Labels = 0  ( 0 )   TotalLabels = 1696  ( 3510 )   NameLabels = 1696  ( 1972 )   ColorLabels = 1695  ( 3509 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/iges_1/M1 b/tests/de/iges_1/M1
index d5f8c9bf59..f28661e21c 100644
--- a/tests/de/iges_1/M1
+++ b/tests/de/iges_1/M1
@@ -1,8 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 Windows: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO ?CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :"
+puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :" 
 
 set LinuxDiff 4
 set filename y306351fM.igs
diff --git a/tests/de/iges_1/M2 b/tests/de/iges_1/M2
index 80e47ef868..ffde8936ef 100644
--- a/tests/de/iges_1/M2
+++ b/tests/de/iges_1/M2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -7,11 +6,11 @@ set filename Caliper.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 70  ( 489 )  Summary  = 70  ( 489 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 70  ( 488 )  Summary  = 70  ( 488 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 215  ( 215 )   Summary  = 3771  ( 3779 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 215  ( 215 )   FreeWire = 0  ( 4 )   FreeEdge  = 8 ( 8 )   SharedEdge = 1666  ( 1670 )
-TOLERANCE   : MaxTol   =   0.6931734571  (   0.6931734576 )  AvgTol   =  0.009873021116  (  0.009847667242 )
+TOLERANCE   : MaxTol   =   0.6931734571  (   0.6931734576 )  AvgTol   =  0.009873021104  (  0.009847667242 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 223  ( 1190 )  N2Labels = 0  ( 0 )   TotalLabels = 224  ( 1191 )   NameLabels = 224  ( 332 )   ColorLabels = 223  ( 1190 )   LayerLabels = 223  ( 1190 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/iges_1/M6 b/tests/de/iges_1/M6
index e12927c48f..e6a5708f45 100644
--- a/tests/de/iges_1/M6
+++ b/tests/de/iges_1/M6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/M7 b/tests/de/iges_1/M7
index 8818cf2715..89e885e4b0 100644
--- a/tests/de/iges_1/M7
+++ b/tests/de/iges_1/M7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/N2 b/tests/de/iges_1/N2
index 37dca4c9ca..469ca6c00f 100644
--- a/tests/de/iges_1/N2
+++ b/tests/de/iges_1/N2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/N5 b/tests/de/iges_1/N5
index 804ddc46c3..eea45f9ecb 100644
--- a/tests/de/iges_1/N5
+++ b/tests/de/iges_1/N5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
@@ -8,11 +7,11 @@ set filename poteau.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 14  ( 424 )  Summary  = 14  ( 424 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 12  ( 425 )  Summary  = 12  ( 425 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 240  ( 240 )   Summary  = 7603  ( 7607 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 240  ( 240 )   FreeWire = 135  ( 139 )   FreeEdge  = 1262 ( 1262 )   SharedEdge = 3013  ( 3013 )
-TOLERANCE   : MaxTol   =  0.03614106862  (  0.03613204275 )  AvgTol   =  0.0001666738698  (  0.0001670422288 )
+TOLERANCE   : MaxTol   =  0.03614106862  (  0.03613204275 )  AvgTol   =  0.0001666598628  (  0.0001670566086 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 969  ( 3018 )  N2Labels = 0  ( 0 )   TotalLabels = 970  ( 3019 )   NameLabels = 970  ( 1302 )   ColorLabels = 969  ( 3018 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/iges_1/O4 b/tests/de/iges_1/O4
index 08a07fd19f..c981f2079b 100644
--- a/tests/de/iges_1/O4
+++ b/tests/de/iges_1/O4
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
diff --git a/tests/de/iges_1/P2 b/tests/de/iges_1/P2
index 4778cb97d0..8fe2b9e7f5 100644
--- a/tests/de/iges_1/P2
+++ b/tests/de/iges_1/P2
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/P4 b/tests/de/iges_1/P4
index 9b649646b3..35406d6355 100644
--- a/tests/de/iges_1/P4
+++ b/tests/de/iges_1/P4
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_1/P8 b/tests/de/iges_1/P8
index 5cc4026539..962b55dc4b 100644
--- a/tests/de/iges_1/P8
+++ b/tests/de/iges_1/P8
@@ -1,7 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :" 
 
 set LinuxDiff 2
 set filename ims001.igs
diff --git a/tests/de/iges_1/R5 b/tests/de/iges_1/R5
index 2de253fc08..bca5b39432 100644
--- a/tests/de/iges_1/R5
+++ b/tests/de/iges_1/R5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
diff --git a/tests/de/iges_2/A1 b/tests/de/iges_2/A1
index 42debde47a..ec08c07df5 100644
--- a/tests/de/iges_2/A1
+++ b/tests/de/iges_2/A1
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename CCI60011.igs
 
 set ref_data {
diff --git a/tests/de/iges_2/A2 b/tests/de/iges_2/A2
index 709b8e25c8..3ce3543e51 100644
--- a/tests/de/iges_2/A2
+++ b/tests/de/iges_2/A2
@@ -1,8 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
+
 set filename CTS17804.igs
 
 set ref_data {
diff --git a/tests/de/iges_2/A5 b/tests/de/iges_2/A5
index 052cb6676e..67baf32697 100644
--- a/tests/de/iges_2/A5
+++ b/tests/de/iges_2/A5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
diff --git a/tests/de/iges_2/A6 b/tests/de/iges_2/A6
index 3eb067b023..f9cb80a0ff 100644
--- a/tests/de/iges_2/A6
+++ b/tests/de/iges_2/A6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 
diff --git a/tests/de/iges_2/A7 b/tests/de/iges_2/A7
index 8f12e0c224..b7fa12cdcb 100644
--- a/tests/de/iges_2/A7
+++ b/tests/de/iges_2/A7
@@ -3,10 +3,8 @@ puts "TODO CR23096 ALL: CHECKSHAPE : Faulty"
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: NBSHAPES : Faulty" 
 
 set LinuxDiff 2
-set LinuxFaulties {NBSHAPES}
 set filename CTS18547.igs
 
 set ref_data {
diff --git a/tests/de/iges_2/A9 b/tests/de/iges_2/A9
index 6c8bcf05b6..4f3a92a70a 100644
--- a/tests/de/iges_2/A9
+++ b/tests/de/iges_2/A9
@@ -1,7 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
 
 set LinuxDiff 3
 set filename Amino_172448-65210.igs
diff --git a/tests/de/iges_2/B1 b/tests/de/iges_2/B1
index 0636375b03..a962dcbc27 100644
--- a/tests/de/iges_2/B1
+++ b/tests/de/iges_2/B1
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_2/B2 b/tests/de/iges_2/B2
index 49ca52dcd6..b3708d03e4 100644
--- a/tests/de/iges_2/B2
+++ b/tests/de/iges_2/B2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 
diff --git a/tests/de/iges_2/B6 b/tests/de/iges_2/B6
index d388bf76ab..bc678f4f84 100644
--- a/tests/de/iges_2/B6
+++ b/tests/de/iges_2/B6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename D44-11325-6a.igs
 
 set ref_data {
diff --git a/tests/de/iges_2/B9 b/tests/de/iges_2/B9
index fba64170de..5b2e9cc575 100644
--- a/tests/de/iges_2/B9
+++ b/tests/de/iges_2/B9
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 
diff --git a/tests/de/iges_2/C2 b/tests/de/iges_2/C2
index b29f467b6e..6ad34c4f2b 100644
--- a/tests/de/iges_2/C2
+++ b/tests/de/iges_2/C2
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
@@ -13,7 +12,7 @@ TPSTAT      : Faulties = 2  ( 0 )  Warnings = 127  ( 295 )  Summary  = 129  ( 29
 CHECKSHAPE  : Wires    = 8  ( 13 )  Faces    = 8  ( 13 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 419  ( 419 )   Summary  = 5342  ( 5352 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 419  ( 419 )   FreeWire = 4  ( 4 )   FreeEdge  = 42 ( 42 )   SharedEdge = 2233  ( 2227 )
-TOLERANCE   : MaxTol   =    4.558918103  (    4.543567878 )  AvgTol   =   0.03221130666  (   0.03563725913 )
+TOLERANCE   : MaxTol   =    4.558918103  (    4.543567878 )  AvgTol   =   0.03221130662  (   0.03563725913 )
 LABELS      : N0Labels = 457  ( 457 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 457  ( 457 )   NameLabels = 457  ( 457 )   ColorLabels = 451  ( 455 )   LayerLabels = 453  ( 457 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/iges_2/C4 b/tests/de/iges_2/C4
index 55192b8547..114dd80fae 100644
--- a/tests/de/iges_2/C4
+++ b/tests/de/iges_2/C4
@@ -1,8 +1,9 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :" 
 
 set LinuxDiff 1
 set filename PRO14323.igs
diff --git a/tests/de/iges_2/C5 b/tests/de/iges_2/C5
index 13be1c651b..8c5ebe7622 100644
--- a/tests/de/iges_2/C5
+++ b/tests/de/iges_2/C5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
diff --git a/tests/de/iges_2/D2 b/tests/de/iges_2/D2
index ad84cd466a..9b9ce8ead3 100644
--- a/tests/de/iges_2/D2
+++ b/tests/de/iges_2/D2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename UK4.igs
 
 set ref_data {
diff --git a/tests/de/iges_2/D3 b/tests/de/iges_2/D3
index 83c70ffaa3..af52022f94 100644
--- a/tests/de/iges_2/D3
+++ b/tests/de/iges_2/D3
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/iges_2/D8 b/tests/de/iges_2/D8
index 3977cde8a7..5014ce0e90 100644
--- a/tests/de/iges_2/D8
+++ b/tests/de/iges_2/D8
@@ -2,10 +2,8 @@
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: NBSHAPES : Faulty"
 
 set LinuxDiff 3
-set LinuxFaulties {NBSHAPES}
 set filename USA60231.igs
 
 set ref_data {
diff --git a/tests/de/iges_2/E8 b/tests/de/iges_2/E8
index 6b346d13b5..48e9fe996f 100644
--- a/tests/de/iges_2/E8
+++ b/tests/de/iges_2/E8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
diff --git a/tests/de/iges_2/E9 b/tests/de/iges_2/E9
index 812a977ee4..7e978e063e 100644
--- a/tests/de/iges_2/E9
+++ b/tests/de/iges_2/E9
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 
 set filename modelinf.igs
diff --git a/tests/de/iges_2/F1 b/tests/de/iges_2/F1
index 950a44e730..c294bf0714 100644
--- a/tests/de/iges_2/F1
+++ b/tests/de/iges_2/F1
@@ -1,9 +1,9 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
+
 set filename BUC50029.igs
 
 set ref_data {
diff --git a/tests/de/iges_2/F2 b/tests/de/iges_2/F2
index 7bd3276127..61ad6a3f84 100644
--- a/tests/de/iges_2/F2
+++ b/tests/de/iges_2/F2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
diff --git a/tests/de/iges_2/F3 b/tests/de/iges_2/F3
index 884b2a46f3..1145d27706 100644
--- a/tests/de/iges_2/F3
+++ b/tests/de/iges_2/F3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
diff --git a/tests/de/iges_2/F4 b/tests/de/iges_2/F4
index 350484e2c0..3129d631df 100644
--- a/tests/de/iges_2/F4
+++ b/tests/de/iges_2/F4
@@ -1,9 +1,9 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 ALL: COLORS : Faulty"
-puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
+puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: COLORS : Faulty" 
+
+
+puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :" 
 
 set LinuxDiff 2
 set filename buc60894.igs
@@ -14,7 +14,7 @@ TPSTAT      : Faulties = 30  ( 36 )  Warnings = 528  ( 1854 )  Summary  = 558  (
 CHECKSHAPE  : Wires    = 7  ( 6 )  Faces    = 7  ( 6 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3500  ( 3499 )   Summary  = 43166  ( 43105 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3500  ( 3499 )   FreeWire = 0  ( 0 )   FreeEdge  = 164 ( 164 )   SharedEdge = 18147  ( 18117 )
-TOLERANCE   : MaxTol   =   0.9816000285  (    5.284023931 )  AvgTol   =   0.02459127692  (   0.02803193243 )
+TOLERANCE   : MaxTol   =   0.9816000285  (    5.284023931 )  AvgTol   =   0.02459127741  (   0.02803193293 )
 LABELS      : N0Labels = 12  ( 24 )  N1Labels = 3661  ( 3662 )  N2Labels = 0  ( 0 )   TotalLabels = 3673  ( 3686 )   NameLabels = 12  ( 3684 )   ColorLabels = 3661  ( 3662 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 10  ( 11 )
diff --git a/tests/de/iges_2/F5 b/tests/de/iges_2/F5
index dbbeab59b6..84d4c053e9 100644
--- a/tests/de/iges_2/F5
+++ b/tests/de/iges_2/F5
@@ -1,8 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-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 CR23096 ALL: LAYERS : Faulty" 
+
 
 set filename BUC60898.igs
 
@@ -12,7 +12,7 @@ TPSTAT      : Faulties = 6  ( 126 )  Warnings = 24  ( 678 )  Summary  = 30  ( 80
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 91  ( 91 )   Summary  = 23706  ( 23776 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 91  ( 91 )   FreeWire = 304  ( 372 )   FreeEdge  = 7104 ( 7104 )   SharedEdge = 10271  ( 10271 )
-TOLERANCE   : MaxTol   =   0.0779303086  (  0.07793030858 )  AvgTol   =  6.770070428e-005  (  0.0001043952529 )
+TOLERANCE   : MaxTol   =   0.0779303086  (  0.07793030858 )  AvgTol   =  6.769479039e-005  (  0.0001043952538 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2325  ( 4109 )  N2Labels = 0  ( 0 )   TotalLabels = 2328  ( 4112 )   NameLabels = 2328  ( 2708 )   ColorLabels = 2325  ( 4109 )   LayerLabels = 220  ( 409 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 7 )
diff --git a/tests/de/iges_2/F7 b/tests/de/iges_2/F7
index a5e13cb9ab..b9f04fb7a8 100644
--- a/tests/de/iges_2/F7
+++ b/tests/de/iges_2/F7
@@ -1,9 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :" 
 
 set LinuxDiff 1
 set filename CEA_cuve-V5.igs
@@ -14,7 +15,7 @@ TPSTAT      : Faulties = 0  ( 6 )  Warnings = 0  ( 6 )  Summary  = 0  ( 12 )
 CHECKSHAPE  : Wires    = 6  ( 3 )  Faces    = 6  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 114  ( 114 )   Summary  = 1231  ( 1240 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 114  ( 114 )   FreeWire = 2  ( 2 )   FreeEdge  = 17 ( 17 )   SharedEdge = 493  ( 496 )
-TOLERANCE   : MaxTol   =    1380.000139  ( 0.0004988991066 )  AvgTol   =     2.598883867  (  1.625255099e-005 )
+TOLERANCE   : MaxTol   =    1380.000139  ( 0.0004988991066 )  AvgTol   =     2.598883753  (  1.625257716e-005 )
 LABELS      : N0Labels = 122  ( 122 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 122  ( 122 )   NameLabels = 122  ( 122 )   ColorLabels = 120  ( 122 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/iges_2/F8 b/tests/de/iges_2/F8
index 02883ceeed..c1e5a8fdee 100644
--- a/tests/de/iges_2/F8
+++ b/tests/de/iges_2/F8
@@ -1,8 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 ALL: COLORS : Faulty"
+puts "TODO CR23096 ALL: COLORS : Faulty" 
+
 
 set filename CTS17802.igs
 
diff --git a/tests/de/iges_2/F9 b/tests/de/iges_2/F9
index 2fb9b40bab..b8467dc82f 100644
--- a/tests/de/iges_2/F9
+++ b/tests/de/iges_2/F9
@@ -1,8 +1,9 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :" 
 
 set LinuxDiff 1
 set filename 919-004-T03-04-CP-VL.igs
diff --git a/tests/de/iges_2/G1 b/tests/de/iges_2/G1
index 95d049341d..29bb54f670 100644
--- a/tests/de/iges_2/G1
+++ b/tests/de/iges_2/G1
@@ -1,12 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty"
+
+puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :" 
 
 set LinuxDiff 2
-set LinuxFaulties {STATSHAPE}
 set filename Henri.igs
 
 set ref_data {
diff --git a/tests/de/iges_2/G3 b/tests/de/iges_2/G3
index 3553ccfe06..83cc27cf37 100644
--- a/tests/de/iges_2/G3
+++ b/tests/de/iges_2/G3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
diff --git a/tests/de/iges_2/G4 b/tests/de/iges_2/G4
index 48d63f946d..c11efa41ad 100644
--- a/tests/de/iges_2/G4
+++ b/tests/de/iges_2/G4
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :"
+
+puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :" 
 
 set LinuxDiff 4
 set filename y306351f.igs
diff --git a/tests/de/iges_2/G7 b/tests/de/iges_2/G7
index dbbab90627..14f7da5d19 100644
--- a/tests/de/iges_2/G7
+++ b/tests/de/iges_2/G7
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 
diff --git a/tests/de/iges_2/H1 b/tests/de/iges_2/H1
index 9dd6c639e8..1243d99c3a 100644
--- a/tests/de/iges_2/H1
+++ b/tests/de/iges_2/H1
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 
 set filename waaier_para.igs
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 41  ( 617 )  Summary  = 41  ( 617
 CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 3  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 163  ( 162 )   Summary  = 4902  ( 4895 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 163  ( 162 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2290  ( 2288 )
-TOLERANCE   : MaxTol   =   0.9221218173  (   0.9410156556 )  AvgTol   =   0.01533181751  (   0.01464237243 )
+TOLERANCE   : MaxTol   =   0.9221218173  (   0.9410156556 )  AvgTol   =   0.01533181751  (   0.01464237244 )
 LABELS      : N0Labels = 162  ( 162 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 162  ( 162 )   NameLabels = 162  ( 162 )   ColorLabels = 162  ( 162 )   LayerLabels = 162  ( 162 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/iges_2/H3 b/tests/de/iges_2/H3
index d1564e6849..f4c8ff7ae9 100644
--- a/tests/de/iges_2/H3
+++ b/tests/de/iges_2/H3
@@ -1,8 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-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 CR23096 ALL: LAYERS : Faulty" 
+
 
 set filename UKI60028-1.igs
 
diff --git a/tests/de/iges_2/H4 b/tests/de/iges_2/H4
index 11de412989..82980b76db 100644
--- a/tests/de/iges_2/H4
+++ b/tests/de/iges_2/H4
@@ -1,9 +1,9 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
+
 set filename UKI60028-2.igs
 
 set ref_data {
diff --git a/tests/de/iges_2/H5 b/tests/de/iges_2/H5
index 873a1b72f3..78b6b21d8d 100644
--- a/tests/de/iges_2/H5
+++ b/tests/de/iges_2/H5
@@ -1,9 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 ALL: COLORS : Faulty"
-puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :"
+puts "TODO CR23096 ALL: COLORS : Faulty" 
+
+
+puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :" 
 
 set LinuxDiff 1
 set filename UKI60107-3.igs
diff --git a/tests/de/iges_2/H9 b/tests/de/iges_2/H9
index b5399bce12..0ed432461d 100644
--- a/tests/de/iges_2/H9
+++ b/tests/de/iges_2/H9
@@ -1,13 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO ?CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 ALL: COLORS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty"
+puts "TODO CR23096 ALL: LABELS : Faulty" puts "TODO CR23096 ALL: COLORS : Faulty" 
+
+puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :" 
 
 set LinuxDiff 4
-set LinuxFaulties {STATSHAPE}
 set filename coque-sup.igs
 
 set ref_data {
diff --git a/tests/de/iges_2/I1 b/tests/de/iges_2/I1
index 38a982fb4c..f116856c8d 100644
--- a/tests/de/iges_2/I1
+++ b/tests/de/iges_2/I1
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
diff --git a/tests/de/iges_2/I3 b/tests/de/iges_2/I3
index 1ac010a177..6507d837b5 100644
--- a/tests/de/iges_2/I3
+++ b/tests/de/iges_2/I3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
diff --git a/tests/de/iges_2/I6 b/tests/de/iges_2/I6
index f6aa062bb0..fd91e7a3d6 100644
--- a/tests/de/iges_2/I6
+++ b/tests/de/iges_2/I6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
@@ -13,7 +12,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 197 )  Summary  = 0  ( 197 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 49  ( 49 )   Summary  = 14672  ( 14688 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 49  ( 49 )   FreeWire = 146  ( 146 )   FreeEdge  = 6582 ( 6582 )   SharedEdge = 7155  ( 7155 )
-TOLERANCE   : MaxTol   =  0.03734358068  (  0.03734358027 )  AvgTol   =  0.0003212239844  (  0.0003202002016 )
+TOLERANCE   : MaxTol   =  0.03734358068  (  0.03734358027 )  AvgTol   =  0.0003212366204  (  0.0003202128311 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 158  ( 421 )  N2Labels = 0  ( 0 )   TotalLabels = 159  ( 422 )   NameLabels = 159  ( 334 )   ColorLabels = 158  ( 421 )   LayerLabels = 0  ( 96 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 4 )
diff --git a/tests/de/iges_2/I8 b/tests/de/iges_2/I8
index bb35d5c2bc..6ecebf74fc 100644
--- a/tests/de/iges_2/I8
+++ b/tests/de/iges_2/I8
@@ -1,9 +1,9 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
-puts "TODO CR23096 ALL: LAYERS : Faulty"
+puts "TODO CR23096 ALL: LAYERS : Faulty" 
+
 
 set filename BUC60000.igs
 
diff --git a/tests/de/iges_2/I9 b/tests/de/iges_2/I9
index 834d2cf084..0d261d549f 100644
--- a/tests/de/iges_2/I9
+++ b/tests/de/iges_2/I9
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
diff --git a/tests/de/iges_2/J1 b/tests/de/iges_2/J1
index 915d6199d3..e1addab71e 100644
--- a/tests/de/iges_2/J1
+++ b/tests/de/iges_2/J1
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 
diff --git a/tests/de/iges_3/A1 b/tests/de/iges_3/A1
index 2efdfb905b..d28e86c43e 100644
--- a/tests/de/iges_3/A1
+++ b/tests/de/iges_3/A1
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 
diff --git a/tests/de/iges_3/A3 b/tests/de/iges_3/A3
index 74609b6355..8f9a1437b2 100644
--- a/tests/de/iges_3/A3
+++ b/tests/de/iges_3/A3
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
diff --git a/tests/de/iges_3/A4 b/tests/de/iges_3/A4
index 4fe879fddc..8540730477 100644
--- a/tests/de/iges_3/A4
+++ b/tests/de/iges_3/A4
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
diff --git a/tests/de/iges_3/A5 b/tests/de/iges_3/A5
index 814a333e7f..817b2950a8 100644
--- a/tests/de/iges_3/A5
+++ b/tests/de/iges_3/A5
@@ -1,11 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO ?CR23096 ALL: TOLERANCE : Faulty" 
-puts "TODO CR23096 ALL: LABELS : Faulty" 
+puts "TODO ?CR23096 ALL: TOLERANCE : Faulty" puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO ?CR23096 ALL: Error : 5 differences with reference data found :"
 puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty"
 
+
 set LinuxDiff 5
 set LinuxFaulties {CHECKSHAPE}
 set filename USA60022.igs
diff --git a/tests/de/iges_3/A7 b/tests/de/iges_3/A7
index 53440b1295..7d413d2a87 100644
--- a/tests/de/iges_3/A7
+++ b/tests/de/iges_3/A7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
diff --git a/tests/de/iges_3/A8 b/tests/de/iges_3/A8
index 5fa1103345..51dd8bf684 100644
--- a/tests/de/iges_3/A8
+++ b/tests/de/iges_3/A8
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
+
 set filename VERSEUSE.igs
 
 set ref_data {
diff --git a/tests/de/iges_3/A9 b/tests/de/iges_3/A9
index 37350c1244..1aa926fec4 100644
--- a/tests/de/iges_3/A9
+++ b/tests/de/iges_3/A9
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -12,7 +11,7 @@ TPSTAT      : Faulties = 26  ( 0 )  Warnings = 12567  ( 31118 )  Summary  = 1259
 CHECKSHAPE  : Wires    = 0  ( 31 )  Faces    = 10  ( 32 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 6500  ( 6500 )   Summary  = 157935  ( 158228 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 6500  ( 6500 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 72576  ( 72654 )
-TOLERANCE   : MaxTol   =   0.9560441943  (    20.83020595 )  AvgTol   =   0.00212746714  (  0.003335685994 )
+TOLERANCE   : MaxTol   =   0.9560441943  (    20.83020595 )  AvgTol   =  0.002127467162  (  0.003335686018 )
 LABELS      : N0Labels = 6500  ( 6500 )  N1Labels = 0  ( 25534 )  N2Labels = 0  ( 0 )   TotalLabels = 6500  ( 32034 )   NameLabels = 6500  ( 6500 )   ColorLabels = 6500  ( 32034 )   LayerLabels = 6500  ( 32034 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/iges_3/B2 b/tests/de/iges_3/B2
index 22ea1ea2d7..723a28f386 100644
--- a/tests/de/iges_3/B2
+++ b/tests/de/iges_3/B2
@@ -1,9 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
 
 set LinuxDiff 3
 set filename 1stpunch-mcsrfs.igs
diff --git a/tests/de/step_1/A1 b/tests/de/step_1/A1
index 46e95e0d14..5f0dec82ec 100644
--- a/tests/de/step_1/A1
+++ b/tests/de/step_1/A1
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set ProductMode OFF
 set filename model_214.stp
 
diff --git a/tests/de/step_1/A3 b/tests/de/step_1/A3
index 896ac2417d..ad4eec671f 100644
--- a/tests/de/step_1/A3
+++ b/tests/de/step_1/A3
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename id_turbine-C.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 13  ( 58 )  Summary  = 13  ( 58 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 49  ( 0 )  Face     = 49  ( 49 )   Summary  = 577  ( 530 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 49  ( 0 )  Face     = 49  ( 49 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 218  ( 218 )
-TOLERANCE   : MaxTol   = 0.003591433268  (    21.06910097 )  AvgTol   =  0.0002646299148  (    0.1492659708 )
+TOLERANCE   : MaxTol   = 0.003591433268  (    21.06910097 )  AvgTol   =  0.0002646299074  (    0.1492659708 )
 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/A4 b/tests/de/step_1/A4
index 95005563a2..a907f88bb8 100644
--- a/tests/de/step_1/A4
+++ b/tests/de/step_1/A4
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/A7 b/tests/de/step_1/A7
index 4cee0556df..222c2db0c7 100644
--- a/tests/de/step_1/A7
+++ b/tests/de/step_1/A7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/B4 b/tests/de/step_1/B4
index 72bb55ffe2..4261410d87 100644
--- a/tests/de/step_1/B4
+++ b/tests/de/step_1/B4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm4_ug_punch_c.stp
 
 set ref_data {
diff --git a/tests/de/step_1/B7 b/tests/de/step_1/B7
index 97fc51439d..4def72f16c 100644
--- a/tests/de/step_1/B7
+++ b/tests/de/step_1/B7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename ug_turbine-B.stp
 
 set ref_data {
diff --git a/tests/de/step_1/C2 b/tests/de/step_1/C2
index 341a7ecad1..fb2cca2d75 100644
--- a/tests/de/step_1/C2
+++ b/tests/de/step_1/C2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 3 )  Summary  = 9  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 36  ( 36 )   Summary  = 282  ( 262 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 2  ( 2 )  Face     = 36  ( 36 )   FreeWire = 0  ( 2 )   FreeEdge  = 19 ( 19 )   SharedEdge = 108  ( 107 )
-TOLERANCE   : MaxTol   = 0.009538012231  ( 0.006059255816 )  AvgTol   =  0.0006604306459  (  0.000539393598 )
+TOLERANCE   : MaxTol   = 0.009538012231  ( 0.006059255816 )  AvgTol   =  0.0006602657713  (  0.000539393598 )
 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/C4 b/tests/de/step_1/C4
index dd079b65d4..80d8ef20a5 100644
--- a/tests/de/step_1/C4
+++ b/tests/de/step_1/C4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename PRO20362.stp
 
 set ref_data {
diff --git a/tests/de/step_1/C6 b/tests/de/step_1/C6
index 1e026ef0a7..8f150eaa7b 100644
--- a/tests/de/step_1/C6
+++ b/tests/de/step_1/C6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename PRO7755.stp
 
 set ref_data {
diff --git a/tests/de/step_1/C7 b/tests/de/step_1/C7
index 48672ccdb8..26d6909a40 100644
--- a/tests/de/step_1/C7
+++ b/tests/de/step_1/C7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/D3 b/tests/de/step_1/D3
index a0982f7e5a..f095dfa7d4 100644
--- a/tests/de/step_1/D3
+++ b/tests/de/step_1/D3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/D4 b/tests/de/step_1/D4
index ce9b31bf3c..868ef6d9c9 100644
--- a/tests/de/step_1/D4
+++ b/tests/de/step_1/D4
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/D5 b/tests/de/step_1/D5
index b99206a07a..cb421481ea 100644
--- a/tests/de/step_1/D5
+++ b/tests/de/step_1/D5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/D6 b/tests/de/step_1/D6
index 6cad2c8f74..9b049cb26d 100644
--- a/tests/de/step_1/D6
+++ b/tests/de/step_1/D6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/D7 b/tests/de/step_1/D7
index 35ffcbd122..e4918671e8 100644
--- a/tests/de/step_1/D7
+++ b/tests/de/step_1/D7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 21  ( 20 )  Summary  = 21  ( 20 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   Summary  = 464  ( 464 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 72  ( 72 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 200  ( 200 )
-TOLERANCE   : MaxTol   =   0.5804595017  (    0.157293174 )  AvgTol   =   0.04113072985  (   0.04644710495 )
+TOLERANCE   : MaxTol   =   0.5804595017  (    0.157293174 )  AvgTol   =   0.04113072955  (   0.04644710495 )
 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/D8 b/tests/de/step_1/D8
index f8e7b344c1..2f43aebe40 100644
--- a/tests/de/step_1/D8
+++ b/tests/de/step_1/D8
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm1_db_fuel.stp
 
 set ref_data {
diff --git a/tests/de/step_1/D9 b/tests/de/step_1/D9
index 9e29a23f81..bd73317d8a 100644
--- a/tests/de/step_1/D9
+++ b/tests/de/step_1/D9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename trj4_k1_geo-md-203.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ 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    = 0  ( 0 )  Shell    = 39  ( 0 )  Face     = 39  ( 39 )   Summary  = 492  ( 456 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 39  ( 0 )  Face     = 39  ( 39 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 193  ( 192 )
-TOLERANCE   : MaxTol   = 0.003673630603  ( 0.003673630602 )  AvgTol   =  0.0002911800848  (  0.0002911800866 )
+TOLERANCE   : MaxTol   = 0.003673630603  ( 0.003673630602 )  AvgTol   =  0.0002911805182  (   0.00029118052 )
 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/E1 b/tests/de/step_1/E1
index 367290dfcd..2021783a3b 100644
--- a/tests/de/step_1/E1
+++ b/tests/de/step_1/E1
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename trj4_k1_geo-pe-203.stp
 
 set ref_data {
diff --git a/tests/de/step_1/E2 b/tests/de/step_1/E2
index 97c0c1100b..5ee8ad6ae1 100644
--- a/tests/de/step_1/E2
+++ b/tests/de/step_1/E2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename trj4_k1_geo-pe-214.stp
 
 set ref_data {
diff --git a/tests/de/step_1/E3 b/tests/de/step_1/E3
index ffe5824265..a620226ae9 100644
--- a/tests/de/step_1/E3
+++ b/tests/de/step_1/E3
@@ -1,10 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :" 
 
 set LinuxDiff 2
-
 set filename bm1_sy_exhaust.stp
 
 set ref_data {
@@ -13,7 +13,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 21  ( 12 )  Summary  = 21  ( 12 )
 CHECKSHAPE  : Wires    = 4  ( 0 )  Faces    = 3  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 4 )  Shell    = 4  ( 4 )  Face     = 35  ( 35 )   Summary  = 293  ( 266 )
 STATSHAPE   : Solid    = 3  ( 4 )  Shell    = 4  ( 4 )  Face     = 35  ( 35 )   FreeWire = 0  ( 0 )   FreeEdge  = 24 ( 24 )   SharedEdge = 105  ( 103 )
-TOLERANCE   : MaxTol   = 6.104502198e-006  (         1e-005 )  AvgTol   =  9.526607749e-007  (  2.904829547e-006 )
+TOLERANCE   : MaxTol   = 6.104502198e-006  (         1e-005 )  AvgTol   =  9.694977451e-007  (  2.91037487e-006 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 31  ( 31 )  N2Labels = 0  ( 0 )   TotalLabels = 35  ( 35 )   NameLabels = 7  ( 7 )   ColorLabels = 0  ( 0 )   LayerLabels = 28  ( 28 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/E5 b/tests/de/step_1/E5
index 2b6546567a..18efbf5a2a 100644
--- a/tests/de/step_1/E5
+++ b/tests/de/step_1/E5
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm2_ct_leverrod-A.stp
 
 set ref_data {
diff --git a/tests/de/step_1/E8 b/tests/de/step_1/E8
index 9f96f8b3ca..5aca8ccdcd 100644
--- a/tests/de/step_1/E8
+++ b/tests/de/step_1/E8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm2_id_t4-B.stp
 
 set ref_data {
diff --git a/tests/de/step_1/F9 b/tests/de/step_1/F9
index 3923878ef6..a09f097008 100644
--- a/tests/de/step_1/F9
+++ b/tests/de/step_1/F9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename trj6_pm4-al-214.stp
 
 set ref_data {
diff --git a/tests/de/step_1/G1 b/tests/de/step_1/G1
index 217436058d..ff82ce900b 100644
--- a/tests/de/step_1/G1
+++ b/tests/de/step_1/G1
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
diff --git a/tests/de/step_1/G5 b/tests/de/step_1/G5
index 3395fb99ab..6b4419b429 100644
--- a/tests/de/step_1/G5
+++ b/tests/de/step_1/G5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
@@ -12,7 +11,7 @@ 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 )
 STATSHAPE   : Solid    = 11  ( 11 )  Shell    = 11  ( 11 )  Face     = 178  ( 178 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 407  ( 407 )
-TOLERANCE   : MaxTol   =   0.0182458548  (   0.0182458548 )  AvgTol   =  0.0001972882903  (  0.0001972348021 )
+TOLERANCE   : MaxTol   =   0.0182458548  (   0.0182458548 )  AvgTol   =  0.0001972891935  (  0.0001972348021 )
 LABELS      : N0Labels = 9  ( 9 )  N1Labels = 12  ( 12 )  N2Labels = 0  ( 0 )   TotalLabels = 21  ( 21 )   NameLabels = 19  ( 19 )   ColorLabels = 9  ( 9 )   LayerLabels = 9  ( 19 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_1/G8 b/tests/de/step_1/G8
index 7ccdf676b6..439e89a6dd 100644
--- a/tests/de/step_1/G8
+++ b/tests/de/step_1/G8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
@@ -12,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 8 )  Summary  = 0  ( 8 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 59  ( 0 )  Face     = 59  ( 59 )   Summary  = 787  ( 787 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 59  ( 0 )  Face     = 59  ( 59 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 304  ( 304 )
-TOLERANCE   : MaxTol   = 0.003826736784  (    12.53619093 )  AvgTol   =  0.0001420196162  (   0.06469501933 )
+TOLERANCE   : MaxTol   = 0.003826736784  (    12.53619093 )  AvgTol   =  0.0001420472223  (   0.06469509575 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 59 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 60 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 59 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/G9 b/tests/de/step_1/G9
index e167d707a4..3d820976ee 100644
--- a/tests/de/step_1/G9
+++ b/tests/de/step_1/G9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
diff --git a/tests/de/step_1/H4 b/tests/de/step_1/H4
index 84c3b11214..91a0b8c10c 100644
--- a/tests/de/step_1/H4
+++ b/tests/de/step_1/H4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename Inventor_SupportBracket.stp
 
 set ref_data {
diff --git a/tests/de/step_1/H8 b/tests/de/step_1/H8
index fcd48c3de6..204ea7fa11 100644
--- a/tests/de/step_1/H8
+++ b/tests/de/step_1/H8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename PRO17015.stp
 
 set ref_data {
diff --git a/tests/de/step_1/I4 b/tests/de/step_1/I4
index 1e62908d1d..b06e7cb3fa 100644
--- a/tests/de/step_1/I4
+++ b/tests/de/step_1/I4
@@ -1,17 +1,14 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename PRO9240.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 6 )  Warnings = 0  ( 0 )  Summary  = 0  ( 6 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 14  ( 51 )  Summary  = 14  ( 51 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 21  ( 65 )  Summary  = 21  ( 65 )
 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.705111078e-007  (  8.927244379e-007 )
-LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
+NBSHAPES    : Solid    = 7  ( 7 )  Shell    = 15  ( 14 )  Face     = 43  ( 43 )   Summary  = 355  ( 356 )
+STATSHAPE   : Solid    = 7  ( 7 )  Shell    = 15  ( 14 )  Face     = 43  ( 43 )   FreeWire = 0  ( 0 )   FreeEdge  = 1 ( 1 )   SharedEdge = 109  ( 113 )
+TOLERANCE   : MaxTol   = 3.925172046e-006  ( 3.925171887e-006 )  AvgTol   =  8.789987039e-007  (  8.945737497e-007 )
+LABELS      : N0Labels = 3  ( 3 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 3  ( 3 )   NameLabels = 3  ( 3 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
 COLORS      : Colors   =   (  )
diff --git a/tests/de/step_1/I5 b/tests/de/step_1/I5
index 600db6578c..90455f1d1a 100644
--- a/tests/de/step_1/I5
+++ b/tests/de/step_1/I5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename PRO9244.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 14  ( 4 )  Summary  = 14  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 41  ( 41 )   Summary  = 366  ( 345 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 41  ( 41 )   FreeWire = 0  ( 4 )   FreeEdge  = 24 ( 24 )   SharedEdge = 147  ( 146 )
-TOLERANCE   : MaxTol   =  0.07980045861  (  0.07980045861 )  AvgTol   =  0.005840669333  (  0.005686183039 )
+TOLERANCE   : MaxTol   =  0.07980045861  (  0.07980045861 )  AvgTol   =   0.00584065992  (  0.005686183039 )
 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/I8 b/tests/de/step_1/I8
index 2e69159fc2..179fb49fbd 100644
--- a/tests/de/step_1/I8
+++ b/tests/de/step_1/I8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename robinet.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 3 )  Summary  = 4  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 32  ( 32 )  Face     = 32  ( 32 )   Summary  = 451  ( 451 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 32  ( 32 )  Face     = 32  ( 32 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 177  ( 177 )
-TOLERANCE   : MaxTol   = 0.0002711637276  ( 0.0002711637276 )  AvgTol   =  3.750583844e-006  (  4.44829676e-006 )
+TOLERANCE   : MaxTol   = 0.0002711637276  ( 0.0002711637276 )  AvgTol   =  3.762093294e-006  (  4.454796738e-006 )
 LABELS      : N0Labels = 33  ( 33 )  N1Labels = 32  ( 32 )  N2Labels = 0  ( 0 )   TotalLabels = 65  ( 65 )   NameLabels = 65  ( 65 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/J6 b/tests/de/step_1/J6
index 956a7205d6..5e9fc4027e 100644
--- a/tests/de/step_1/J6
+++ b/tests/de/step_1/J6
@@ -1,9 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty"
 
 set LinuxDiff 2
-set LinuxFaulties {STATSHAPE}
 set filename bm1_pe_t4.stp
 
 set ref_data {
diff --git a/tests/de/step_1/J8 b/tests/de/step_1/J8
index f036ffadaf..fcde0cc950 100644
--- a/tests/de/step_1/J8
+++ b/tests/de/step_1/J8
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename bm1_sy_lever.stp
 
 set ref_data {
diff --git a/tests/de/step_1/K3 b/tests/de/step_1/K3
index 00a4df4102..133ba13e81 100644
--- a/tests/de/step_1/K3
+++ b/tests/de/step_1/K3
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename bm2_ca_t4-A.stp
 
 set ref_data {
diff --git a/tests/de/step_1/K4 b/tests/de/step_1/K4
index 6a4ae15f61..da3cd8f3d3 100644
--- a/tests/de/step_1/K4
+++ b/tests/de/step_1/K4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm2_ct_lever-A.stp
 
 set ref_data {
diff --git a/tests/de/step_1/L4 b/tests/de/step_1/L4
index 1804467ed0..f01afea494 100644
--- a/tests/de/step_1/L4
+++ b/tests/de/step_1/L4
@@ -1,17 +1,14 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm2_ie_lever-C.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 7 )  Summary  = 8  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 333  ( 333 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 135  ( 135 )
-TOLERANCE   : MaxTol   = 2.885723252e-007  ( 2.885128872e-007 )  AvgTol   =  1.021399653e-007  (  1.021395759e-007 )
-LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 413  ( 393 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 2 )   FreeEdge  = 19 ( 19 )   SharedEdge = 154  ( 154 )
+TOLERANCE   : MaxTol   = 2.885723252e-007  ( 2.885128872e-007 )  AvgTol   =  1.019684937e-007  (  1.019681355e-007 )
+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 )
 COLORS      : Colors   =   (  )
diff --git a/tests/de/step_1/L5 b/tests/de/step_1/L5
index d6f2a17306..1e046af276 100644
--- a/tests/de/step_1/L5
+++ b/tests/de/step_1/L5
@@ -1,17 +1,14 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm2_ie_leverrod-C.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 11  ( 7 )  Summary  = 11  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 335  ( 335 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 136  ( 136 )
-TOLERANCE   : MaxTol   = 0.000304966156  ( 0.0003049661559 )  AvgTol   =  4.319600685e-006  (  4.319600685e-006 )
-LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 415  ( 395 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 2 )   FreeEdge  = 19 ( 19 )   SharedEdge = 155  ( 155 )
+TOLERANCE   : MaxTol   = 0.000304966156  ( 0.0003049661559 )  AvgTol   =  3.983645216e-006  (  3.983645216e-006 )
+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 )
 COLORS      : Colors   =   (  )
diff --git a/tests/de/step_1/L9 b/tests/de/step_1/L9
index 4c7b53ed4c..cd4a3328ee 100644
--- a/tests/de/step_1/L9
+++ b/tests/de/step_1/L9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm2_pe_leverrod-A.stp
 
 set ref_data {
diff --git a/tests/de/step_1/N2 b/tests/de/step_1/N2
index 310d4d8188..2526cc5fc5 100644
--- a/tests/de/step_1/N2
+++ b/tests/de/step_1/N2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename bm4_ca_eye.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 11 )  Summary  = 6  ( 11 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 86  ( 86 )   Summary  = 496  ( 498 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 86  ( 86 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 207  ( 209 )
-TOLERANCE   : MaxTol   =  0.03778327591  (  0.03778327591 )  AvgTol   =  0.001249310757  (  0.001282093539 )
+TOLERANCE   : MaxTol   =  0.03778327591  (  0.03778327591 )  AvgTol   =  0.001249318063  (  0.001282100812 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/N3 b/tests/de/step_1/N3
index 6af288dfac..9ddda01c14 100644
--- a/tests/de/step_1/N3
+++ b/tests/de/step_1/N3
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_ct_eye.stp
 
 set ref_data {
diff --git a/tests/de/step_1/N4 b/tests/de/step_1/N4
index bdfce40991..674f8577d0 100644
--- a/tests/de/step_1/N4
+++ b/tests/de/step_1/N4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_id_eye_a.stp
 
 set ref_data {
diff --git a/tests/de/step_1/N5 b/tests/de/step_1/N5
index fb74d02d95..65996a68ac 100644
--- a/tests/de/step_1/N5
+++ b/tests/de/step_1/N5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_id_eye_b.stp
 
 set ref_data {
diff --git a/tests/de/step_1/N6 b/tests/de/step_1/N6
index c332536480..23e5836035 100644
--- a/tests/de/step_1/N6
+++ b/tests/de/step_1/N6
@@ -1,11 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO ?CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty " 
 puts "TODO CR23096 Mandriva2010: TPSTAT : Faulty " 
 puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :" 
 
 set LinuxDiff 4
-set LinuxFaulties {STATSHAPE TPSTAT}
+set LinuxFaulties {TPSTAT}
 set filename bm4_id_punch_b.stp
 
 set ref_data {
diff --git a/tests/de/step_1/N7 b/tests/de/step_1/N7
index dbd978b576..cb9c04a6d1 100644
--- a/tests/de/step_1/N7
+++ b/tests/de/step_1/N7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_pe_punch_a.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 13  ( 0 )  Summary  = 13  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 182  ( 182 )   Summary  = 1237  ( 1237 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 182  ( 182 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 500  ( 500 )
-TOLERANCE   : MaxTol   = 0.0006834695356  ( 0.0006834695356 )  AvgTol   =  1.670011327e-005  (  1.670011329e-005 )
+TOLERANCE   : MaxTol   = 0.0006834695356  ( 0.0006834695356 )  AvgTol   =  1.670011372e-005  (  1.670011374e-005 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 37  ( 37 )  N2Labels = 0  ( 0 )   TotalLabels = 42  ( 42 )   NameLabels = 9  ( 9 )   ColorLabels = 0  ( 0 )   LayerLabels = 33  ( 33 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/O4 b/tests/de/step_1/O4
index 6b28b9da92..3eecbf82e1 100644
--- a/tests/de/step_1/O4
+++ b/tests/de/step_1/O4
@@ -1,12 +1,9 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename ct_turbine-A.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 18  ( 4 )  Summary  = 18  ( 4 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 18  ( 5 )  Summary  = 18  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 40  ( 40 )  Face     = 40  ( 40 )   Summary  = 547  ( 527 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 40  ( 40 )  Face     = 40  ( 40 )   FreeWire = 0  ( 0 )   FreeEdge  = 20 ( 20 )   SharedEdge = 196  ( 196 )
diff --git a/tests/de/step_1/Q4 b/tests/de/step_1/Q4
index 64bc4b89c7..ebe0db709d 100644
--- a/tests/de/step_1/Q4
+++ b/tests/de/step_1/Q4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename id_turbine-A.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 21  ( 16 )  Summary  = 21  ( 16 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 49  ( 49 )   Summary  = 291  ( 290 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 49  ( 49 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 120  ( 119 )
-TOLERANCE   : MaxTol   = 0.003591433268  ( 0.003591433268 )  AvgTol   =  0.0004763290463  (  0.0004798329978 )
+TOLERANCE   : MaxTol   = 0.003591433268  ( 0.003591433268 )  AvgTol   =  0.0004763290463  (  0.0004798376538 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 87  ( 87 )  N2Labels = 0  ( 0 )   TotalLabels = 90  ( 90 )   NameLabels = 5  ( 5 )   ColorLabels = 86  ( 86 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_1/Q5 b/tests/de/step_1/Q5
index 8e1199615e..d31d58a2ca 100644
--- a/tests/de/step_1/Q5
+++ b/tests/de/step_1/Q5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename id_turbine-B.stp
 
 set ref_data {
diff --git a/tests/de/step_1/Q6 b/tests/de/step_1/Q6
index 7f9709d553..c53ea2df02 100644
--- a/tests/de/step_1/Q6
+++ b/tests/de/step_1/Q6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename ie_exhaust-A.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 23  ( 16 )  Summary  = 23  ( 16 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 64  ( 64 )   Summary  = 378  ( 378 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 64  ( 64 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 150  ( 150 )
-TOLERANCE   : MaxTol   = 0.0002089967319  ( 0.0002089967128 )  AvgTol   =  2.456943731e-005  (  2.456943149e-005 )
+TOLERANCE   : MaxTol   = 0.0002089967319  ( 0.0002089967128 )  AvgTol   =  2.456943731e-005  (  2.456947097e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/Q9 b/tests/de/step_1/Q9
index 8e4374b5de..41e15a75b2 100644
--- a/tests/de/step_1/Q9
+++ b/tests/de/step_1/Q9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename manille.stp
 
 set ref_data {
diff --git a/tests/de/step_1/R3 b/tests/de/step_1/R3
index f7c86aea74..fded9307f6 100644
--- a/tests/de/step_1/R3
+++ b/tests/de/step_1/R3
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename obtradio1.stp
 
 set ref_data {
diff --git a/tests/de/step_1/S2 b/tests/de/step_1/S2
index 9d2c272a1b..5a6ff4d2ca 100644
--- a/tests/de/step_1/S2
+++ b/tests/de/step_1/S2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename t4mdb.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 3 )  Summary  = 9  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 13  ( 13 )  Face     = 13  ( 13 )   Summary  = 271  ( 211 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 13  ( 13 )  Face     = 13  ( 13 )   FreeWire = 0  ( 0 )   FreeEdge  = 27 ( 27 )   SharedEdge = 86  ( 80 )
-TOLERANCE   : MaxTol   = 0.0001243142426  ( 0.0001243142426 )  AvgTol   =  1.803707014e-005  (  2.850679311e-005 )
+TOLERANCE   : MaxTol   = 0.0001243142426  ( 0.0001243142426 )  AvgTol   =  1.809267854e-005  (  2.850679311e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 96  ( 96 )  N2Labels = 0  ( 0 )   TotalLabels = 97  ( 97 )   NameLabels = 1  ( 1 )   ColorLabels = 12  ( 12 )   LayerLabels = 84  ( 84 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 9  ( 9 )
diff --git a/tests/de/step_1/U8 b/tests/de/step_1/U8
index e6b2f7bad7..346fdb65e2 100644
--- a/tests/de/step_1/U8
+++ b/tests/de/step_1/U8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj3_s1-ct-203.stp
 
 set ref_data {
diff --git a/tests/de/step_1/U9 b/tests/de/step_1/U9
index 690aa5a6b1..6b4c4ea2c1 100644
--- a/tests/de/step_1/U9
+++ b/tests/de/step_1/U9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj3_s1-ct-214.stp
 
 set ref_data {
diff --git a/tests/de/step_1/V1 b/tests/de/step_1/V1
index cfbc512f7b..158a8c4b73 100644
--- a/tests/de/step_1/V1
+++ b/tests/de/step_1/V1
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj3_s1-ec-203.stp
 
 set ref_data {
diff --git a/tests/de/step_1/V2 b/tests/de/step_1/V2
index 07b5e42188..fd9c952660 100644
--- a/tests/de/step_1/V2
+++ b/tests/de/step_1/V2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj3_s1-ec-214.stp
 
 set ref_data {
diff --git a/tests/de/step_1/V4 b/tests/de/step_1/V4
index 76cded3421..af0078ee31 100644
--- a/tests/de/step_1/V4
+++ b/tests/de/step_1/V4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj3_s1-pe-203.stp
 
 set ref_data {
diff --git a/tests/de/step_1/W6 b/tests/de/step_1/W6
index 09277212e9..08d97bf5ed 100644
--- a/tests/de/step_1/W6
+++ b/tests/de/step_1/W6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj4_s1-ec-214.stp
 
 set ref_data {
diff --git a/tests/de/step_1/W7 b/tests/de/step_1/W7
index 280d5097cc..a7b3100697 100644
--- a/tests/de/step_1/W7
+++ b/tests/de/step_1/W7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj4_s1-pe-203.stp
 
 set ref_data {
diff --git a/tests/de/step_1/X2 b/tests/de/step_1/X2
index 440075533b..f3c4e57d5b 100644
--- a/tests/de/step_1/X2
+++ b/tests/de/step_1/X2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj5_k1-ec-214.stp
 
 set ref_data {
diff --git a/tests/de/step_1/X7 b/tests/de/step_1/X7
index d3898b55fa..0a23b9c688 100644
--- a/tests/de/step_1/X7
+++ b/tests/de/step_1/X7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj5_pm3-ct-203.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 17  ( 7 )  Summary  = 17  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 124  ( 124 )   Summary  = 774  ( 774 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 124  ( 124 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 314  ( 314 )
-TOLERANCE   : MaxTol   = 0.002741067574  ( 0.002741067574 )  AvgTol   =  5.224860755e-005  (  5.209425758e-005 )
+TOLERANCE   : MaxTol   = 0.002741067574  ( 0.002741067574 )  AvgTol   =  5.224860754e-005  (  5.209425755e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/ZB2 b/tests/de/step_1/ZB2
index b32b9e6177..bad380bf39 100644
--- a/tests/de/step_1/ZB2
+++ b/tests/de/step_1/ZB2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename boot.stp
 
 set ref_data {
diff --git a/tests/de/step_1/ZB7 b/tests/de/step_1/ZB7
index b55fc39d0d..d5ce9289e1 100644
--- a/tests/de/step_1/ZB7
+++ b/tests/de/step_1/ZB7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename ug_soapbox-A.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 3 )  Summary  = 8  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 94  ( 94 )   Summary  = 570  ( 570 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 94  ( 94 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 232  ( 232 )
-TOLERANCE   : MaxTol   = 0.008977613887  ( 0.008977613885 )  AvgTol   =  0.001750900293  (  0.001751252138 )
+TOLERANCE   : MaxTol   = 0.008977613887  ( 0.008977613885 )  AvgTol   =  0.001750900764  (   0.00175125261 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_1/ZC3 b/tests/de/step_1/ZC3
index 5a0da24b1f..3879fdb0b8 100644
--- a/tests/de/step_1/ZC3
+++ b/tests/de/step_1/ZC3
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm2_db_leverrod-B.stp
 
 set ref_data {
diff --git a/tests/de/step_1/ZC4 b/tests/de/step_1/ZC4
index cbbf4abf0a..bed8d107ef 100644
--- a/tests/de/step_1/ZC4
+++ b/tests/de/step_1/ZC4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm2_db_leverrod-C.stp
 
 set ref_data {
diff --git a/tests/de/step_1/ZC9 b/tests/de/step_1/ZC9
index eca92c2c03..9b23f5278e 100644
--- a/tests/de/step_1/ZC9
+++ b/tests/de/step_1/ZC9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set ProductMode OFF
 set filename BUC60809.stp
 
diff --git a/tests/de/step_1/ZD7 b/tests/de/step_1/ZD7
index 8fcf6cb362..79b1e3fe85 100644
--- a/tests/de/step_1/ZD7
+++ b/tests/de/step_1/ZD7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename tr8_ha1_ac.stp
 
 set ref_data {
diff --git a/tests/de/step_1/ZD8 b/tests/de/step_1/ZD8
index cc766c0c6d..de1c601d07 100644
--- a/tests/de/step_1/ZD8
+++ b/tests/de/step_1/ZD8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename tr8_ha1_ug.stp
 
 set ref_data {
diff --git a/tests/de/step_1/ZE1 b/tests/de/step_1/ZE1
index cab7c6673c..8c28314762 100644
--- a/tests/de/step_1/ZE1
+++ b/tests/de/step_1/ZE1
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename trj7_c2-al-214.stp
 
 set ref_data {
diff --git a/tests/de/step_1/ZE4 b/tests/de/step_1/ZE4
index c0941e9d17..c1f1a502f7 100644
--- a/tests/de/step_1/ZE4
+++ b/tests/de/step_1/ZE4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename trj7_c2-db-214.stp
 
 set ref_data {
diff --git a/tests/de/step_1/ZE6 b/tests/de/step_1/ZE6
index 249ef3f3ce..b081d8365b 100644
--- a/tests/de/step_1/ZE6
+++ b/tests/de/step_1/ZE6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/ZE8 b/tests/de/step_1/ZE8
index 9945f2fef5..d351b13690 100644
--- a/tests/de/step_1/ZE8
+++ b/tests/de/step_1/ZE8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename trj7_c2-td-203.stp
 
 set ref_data {
diff --git a/tests/de/step_1/ZE9 b/tests/de/step_1/ZE9
index d0f0bea11c..614b4c4b90 100644
--- a/tests/de/step_1/ZE9
+++ b/tests/de/step_1/ZE9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/ZF5 b/tests/de/step_1/ZF5
index ba66b1e36d..ee03fd5e1f 100644
--- a/tests/de/step_1/ZF5
+++ b/tests/de/step_1/ZF5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/ZF7 b/tests/de/step_1/ZF7
index d3ea007853..5c1091310f 100644
--- a/tests/de/step_1/ZF7
+++ b/tests/de/step_1/ZF7
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename S4132-test.stp
 
 set ref_data {
diff --git a/tests/de/step_1/ZG1 b/tests/de/step_1/ZG1
index ffc9413ec0..fce91ef6b5 100644
--- a/tests/de/step_1/ZG1
+++ b/tests/de/step_1/ZG1
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 0 )  Summary  = 8  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 14  ( 14 )   Summary  = 168  ( 149 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 14  ( 14 )   FreeWire = 0  ( 0 )   FreeEdge  = 18 ( 18 )   SharedEdge = 54  ( 54 )
-TOLERANCE   : MaxTol   = 7.347272566e-006  ( 7.347307142e-006 )  AvgTol   =  1.215889533e-006  (  1.215897255e-006 )
+TOLERANCE   : MaxTol   = 7.347272566e-006  ( 7.347307105e-006 )  AvgTol   =  1.21588953e-006  (  1.215897253e-006 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 3 )  N2Labels = 0  ( 1 )   TotalLabels = 5  ( 7 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/ZG3 b/tests/de/step_1/ZG3
index f54d50fa71..f7c30dc640 100644
--- a/tests/de/step_1/ZG3
+++ b/tests/de/step_1/ZG3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 28  ( 0 )  Summary  = 28  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 5  ( 5 )  Shell    = 5  ( 5 )  Face     = 53  ( 53 )   Summary  = 404  ( 395 )
 STATSHAPE   : Solid    = 18  ( 18 )  Shell    = 18  ( 18 )  Face     = 160  ( 160 )   FreeWire = 0  ( 0 )   FreeEdge  = 42 ( 42 )   SharedEdge = 137  ( 137 )
-TOLERANCE   : MaxTol   = 7.325606587e-006  ( 7.325606205e-006 )  AvgTol   =  2.511919557e-006  (  2.517689926e-006 )
+TOLERANCE   : MaxTol   = 7.325606587e-006  ( 7.325606205e-006 )  AvgTol   =  2.517689894e-006  (  2.517689926e-006 )
 LABELS      : N0Labels = 13  ( 13 )  N1Labels = 26  ( 35 )  N2Labels = 0  ( 9 )   TotalLabels = 39  ( 57 )   NameLabels = 26  ( 31 )   ColorLabels = 5  ( 5 )   LayerLabels = 16  ( 16 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_1/ZG9 b/tests/de/step_1/ZG9
index 557dba429b..026dd7251d 100644
--- a/tests/de/step_1/ZG9
+++ b/tests/de/step_1/ZG9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 0 )  Summary  = 4  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 22  ( 22 )   Summary  = 223  ( 199 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 22  ( 22 )   FreeWire = 0  ( 0 )   FreeEdge  = 23 ( 23 )   SharedEdge = 68  ( 68 )
-TOLERANCE   : MaxTol   = 2.100585841e-007  ( 2.098677141e-007 )  AvgTol   =  1.073366139e-007  (  1.07325298e-007 )
+TOLERANCE   : MaxTol   = 2.100585841e-007  ( 2.098677141e-007 )  AvgTol   =  1.073366136e-007  (  1.07325298e-007 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 3 )  N2Labels = 0  ( 1 )   TotalLabels = 5  ( 7 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/ZH1 b/tests/de/step_1/ZH1
index c80919a656..acfc65536d 100644
--- a/tests/de/step_1/ZH1
+++ b/tests/de/step_1/ZH1
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm2_pe_t4-B.stp
 
 set ref_data {
diff --git a/tests/de/step_1/ZH3 b/tests/de/step_1/ZH3
index 1f4dc99a2c..1466dff159 100644
--- a/tests/de/step_1/ZH3
+++ b/tests/de/step_1/ZH3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/ZH4 b/tests/de/step_1/ZH4
index 3768eb996f..a48a4f4f60 100644
--- a/tests/de/step_1/ZH4
+++ b/tests/de/step_1/ZH4
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_1/ZH7 b/tests/de/step_1/ZH7
index 6368b0f558..0b716dc2e2 100644
--- a/tests/de/step_1/ZH7
+++ b/tests/de/step_1/ZH7
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
diff --git a/tests/de/step_1/ZH9 b/tests/de/step_1/ZH9
index 26cf8b9635..24236f8468 100644
--- a/tests/de/step_1/ZH9
+++ b/tests/de/step_1/ZH9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: PROPS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
diff --git a/tests/de/step_1/ZI1 b/tests/de/step_1/ZI1
index fc852f2343..931e426dd9 100644
--- a/tests/de/step_1/ZI1
+++ b/tests/de/step_1/ZI1
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: PROPS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
diff --git a/tests/de/step_1/ZI7 b/tests/de/step_1/ZI7
index 7c89b286d8..18bcf6a39e 100644
--- a/tests/de/step_1/ZI7
+++ b/tests/de/step_1/ZI7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename PRO9245.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 2 )  Summary  = 4  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 12  ( 12 )  Face     = 12  ( 12 )   Summary  = 136  ( 136 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 12  ( 12 )  Face     = 12  ( 12 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 49  ( 49 )
-TOLERANCE   : MaxTol   = 0.0009846163783  ( 0.0009846163783 )  AvgTol   =  7.79901755e-005  (  7.800188396e-005 )
+TOLERANCE   : MaxTol   = 0.0009846163783  ( 0.0009846163783 )  AvgTol   =  7.801327141e-005  (  7.808630045e-005 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_1/ZK5 b/tests/de/step_1/ZK5
index 83b352134a..2e22f3abd7 100644
--- a/tests/de/step_1/ZK5
+++ b/tests/de/step_1/ZK5
@@ -1,17 +1,14 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm2_ie_lever-A.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1  ( 0 )  Summary  = 1  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 333  ( 333 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 135  ( 135 )
-TOLERANCE   : MaxTol   = 2.885132887e-007  ( 2.885128872e-007 )  AvgTol   =  1.013219976e-007  (  1.013219948e-007 )
-LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 413  ( 393 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 2 )   FreeEdge  = 19 ( 19 )   SharedEdge = 154  ( 154 )
+TOLERANCE   : MaxTol   = 2.885132887e-007  ( 2.885128872e-007 )  AvgTol   =  1.012160683e-007  (  1.012160657e-007 )
+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 )
 COLORS      : Colors   =   (  )
diff --git a/tests/de/step_1/ZK7 b/tests/de/step_1/ZK7
index 37a265dc09..8360235f01 100644
--- a/tests/de/step_1/ZK7
+++ b/tests/de/step_1/ZK7
@@ -1,17 +1,14 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm2_ie_leverrod-A.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 0 )  Summary  = 4  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 335  ( 335 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 136  ( 136 )
-TOLERANCE   : MaxTol   = 0.000304966156  ( 0.0003049661559 )  AvgTol   =  4.319608909e-006  (  4.319608909e-006 )
-LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   Summary  = 415  ( 395 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 51  ( 51 )   FreeWire = 0  ( 2 )   FreeEdge  = 19 ( 19 )   SharedEdge = 155  ( 155 )
+TOLERANCE   : MaxTol   = 0.000304966156  ( 0.0003049661559 )  AvgTol   =  3.983652786e-006  (  3.983652786e-006 )
+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 )
 COLORS      : Colors   =   (  )
diff --git a/tests/de/step_1/ZW5 b/tests/de/step_1/ZW5
index 9a29b2f454..c5450b3163 100644
--- a/tests/de/step_1/ZW5
+++ b/tests/de/step_1/ZW5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename voilure-b.stp
 
 set ref_data {
diff --git a/tests/de/step_1/ZZ9 b/tests/de/step_1/ZZ9
index b9762ee5d8..aae94acbf4 100644
--- a/tests/de/step_1/ZZ9
+++ b/tests/de/step_1/ZZ9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_db_seal_b.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 117  ( 39 )  Summary  = 117  ( 39
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 140  ( 140 )   Summary  = 704  ( 704 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 140  ( 140 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 280  ( 280 )
-TOLERANCE   : MaxTol   = 0.0004823436197  ( 0.0004827870033 )  AvgTol   =  0.000157560816  (  0.000165115431 )
+TOLERANCE   : MaxTol   = 0.0004823436197  ( 0.0004827870033 )  AvgTol   =  0.000157531855  (  0.000165115431 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/A2 b/tests/de/step_2/A2
index 5a16194fa1..f1d9680061 100644
--- a/tests/de/step_2/A2
+++ b/tests/de/step_2/A2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename ass-tol2.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ 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.215035338e-005  (  5.153582219e-005 )
+TOLERANCE   : MaxTol   = 0.0009825722198  ( 0.0009825722195 )  AvgTol   =  5.215035337e-005  (  5.153582219e-005 )
 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/A4 b/tests/de/step_2/A4
index 54a82e79b4..6beaff7e43 100644
--- a/tests/de/step_2/A4
+++ b/tests/de/step_2/A4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm4_ug_punch_d.stp
 
 set ref_data {
diff --git a/tests/de/step_2/A6 b/tests/de/step_2/A6
index f31ba5e6ee..4669f863a5 100644
--- a/tests/de/step_2/A6
+++ b/tests/de/step_2/A6
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 
 
 set filename t3d_opt.stp
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 85 )  Summary  = 4  ( 85 )
 CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 34  ( 34 )  Shell    = 34  ( 34 )  Face     = 254  ( 254 )   Summary  = 1470  ( 1508 )
 STATSHAPE   : Solid    = 34  ( 34 )  Shell    = 34  ( 34 )  Face     = 254  ( 254 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 539  ( 577 )
-TOLERANCE   : MaxTol   =    4.686868233  (    4.686868233 )  AvgTol   =   0.06017485437  (   0.05835526529 )
+TOLERANCE   : MaxTol   =    4.686868233  (    4.686868233 )  AvgTol   =   0.06017484737  (   0.05835526534 )
 LABELS      : N0Labels = 42  ( 42 )  N1Labels = 41  ( 41 )  N2Labels = 0  ( 0 )   TotalLabels = 83  ( 83 )   NameLabels = 83  ( 83 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/A8 b/tests/de/step_2/A8
index 4b604b37a0..1bb2d21e6b 100644
--- a/tests/de/step_2/A8
+++ b/tests/de/step_2/A8
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename CTS18541.stp
 
 set ref_data {
diff --git a/tests/de/step_2/A9 b/tests/de/step_2/A9
index 3fe30f161a..ab40e28257 100644
--- a/tests/de/step_2/A9
+++ b/tests/de/step_2/A9
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename PRO10107.stp
 
 set ref_data {
diff --git a/tests/de/step_2/B1 b/tests/de/step_2/B1
index 38a1b5bf2a..b6c6bceca4 100644
--- a/tests/de/step_2/B1
+++ b/tests/de/step_2/B1
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename PRO10108.stp
 
 set ref_data {
diff --git a/tests/de/step_2/B2 b/tests/de/step_2/B2
index 31d46fe8f6..56a103c032 100644
--- a/tests/de/step_2/B2
+++ b/tests/de/step_2/B2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
diff --git a/tests/de/step_2/B3 b/tests/de/step_2/B3
index 28b94677b3..11db31462b 100644
--- a/tests/de/step_2/B3
+++ b/tests/de/step_2/B3
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename welle_surface.stp
 
 set ref_data {
diff --git a/tests/de/step_2/B6 b/tests/de/step_2/B6
index 2ae1b583b9..aa673c4418 100644
--- a/tests/de/step_2/B6
+++ b/tests/de/step_2/B6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 119  ( 100 )  Summary  = 119  ( 10
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 457  ( 457 )   Summary  = 2948  ( 2947 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 457  ( 457 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1203  ( 1203 )
-TOLERANCE   : MaxTol   = 0.005476437308  ( 0.005476492073 )  AvgTol   =  0.0003181718251  (  0.0003179903324 )
+TOLERANCE   : MaxTol   = 0.005476437308  ( 0.005476492073 )  AvgTol   =  0.0003181698974  (  0.0003179717815 )
 LABELS      : N0Labels = 6  ( 6 )  N1Labels = 5  ( 7 )  N2Labels = 0  ( 2 )   TotalLabels = 11  ( 15 )   NameLabels = 11  ( 11 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/B8 b/tests/de/step_2/B8
index d490856e34..5d608a440b 100644
--- a/tests/de/step_2/B8
+++ b/tests/de/step_2/B8
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_2/B9 b/tests/de/step_2/B9
index 73cdee94b7..f12781ac56 100644
--- a/tests/de/step_2/B9
+++ b/tests/de/step_2/B9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename PRO9233.stp
 
 set ref_data {
diff --git a/tests/de/step_2/C1 b/tests/de/step_2/C1
index cc826e6c7d..eb12ec80e8 100644
--- a/tests/de/step_2/C1
+++ b/tests/de/step_2/C1
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
diff --git a/tests/de/step_2/C5 b/tests/de/step_2/C5
index d406fee99c..b8537b5444 100644
--- a/tests/de/step_2/C5
+++ b/tests/de/step_2/C5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename trj4_k1_geo-ac-214.stp
 
 set ref_data {
diff --git a/tests/de/step_2/C6 b/tests/de/step_2/C6
index ba4876b65b..ec7f00bf30 100644
--- a/tests/de/step_2/C6
+++ b/tests/de/step_2/C6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename r0101_al.stp
 
 set ref_data {
diff --git a/tests/de/step_2/C8 b/tests/de/step_2/C8
index c226324b5b..8672ebf8bd 100644
--- a/tests/de/step_2/C8
+++ b/tests/de/step_2/C8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: PROPS : Faulty" 
 
 
diff --git a/tests/de/step_2/C9 b/tests/de/step_2/C9
index 450dd6eb57..18f006f1e0 100644
--- a/tests/de/step_2/C9
+++ b/tests/de/step_2/C9
@@ -1,9 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
-puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
+
+puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
+
 set LinuxDiff 3
 set filename r_77-sy.stp
 
diff --git a/tests/de/step_2/D1 b/tests/de/step_2/D1
index 15f47487ed..fb764db66e 100644
--- a/tests/de/step_2/D1
+++ b/tests/de/step_2/D1
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj5_pm3-in-214.stp
 
 set ref_data {
diff --git a/tests/de/step_2/D3 b/tests/de/step_2/D3
index eaf9240983..a8c9ae2d9f 100644
--- a/tests/de/step_2/D3
+++ b/tests/de/step_2/D3
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm2_ug_t4-B.stp
 
 set ref_data {
diff --git a/tests/de/step_2/D4 b/tests/de/step_2/D4
index ac5b5d1a0e..850a745c59 100644
--- a/tests/de/step_2/D4
+++ b/tests/de/step_2/D4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename tr10_r0401_al.stp
 
 set ref_data {
diff --git a/tests/de/step_2/D5 b/tests/de/step_2/D5
index 6c63ffcb87..dc97cfbbf5 100644
--- a/tests/de/step_2/D5
+++ b/tests/de/step_2/D5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm4_ac_punch.stp
 
 set ref_data {
diff --git a/tests/de/step_2/D6 b/tests/de/step_2/D6
index 6d6e7fcbc8..eaab51471b 100644
--- a/tests/de/step_2/D6
+++ b/tests/de/step_2/D6
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_2/D7 b/tests/de/step_2/D7
index be84db4872..78afabce6a 100644
--- a/tests/de/step_2/D7
+++ b/tests/de/step_2/D7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm4_id_punch_c.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 14  ( 80 )  Summary  = 14  ( 80 )
 CHECKSHAPE  : Wires    = 4  ( 4 )  Faces    = 4  ( 4 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 40  ( 3 )  Face     = 182  ( 182 )   Summary  = 1489  ( 1445 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 40  ( 3 )  Face     = 182  ( 182 )   FreeWire = 0  ( 0 )   FreeEdge  = 6 ( 6 )   SharedEdge = 586  ( 586 )
-TOLERANCE   : MaxTol   = 0.007713500664  (    68.19450273 )  AvgTol   =  0.0006851176006  (    0.1538597037 )
+TOLERANCE   : MaxTol   = 0.007713500664  (    68.19450272 )  AvgTol   =  0.0006851176006  (    0.1538597036 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 4  ( 4 )  N2Labels = 0  ( 0 )   TotalLabels = 9  ( 9 )   NameLabels = 9  ( 9 )   ColorLabels = 3  ( 3 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/D8 b/tests/de/step_2/D8
index dadd7a9dbc..044b0fe989 100644
--- a/tests/de/step_2/D8
+++ b/tests/de/step_2/D8
@@ -1,16 +1,14 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO ?CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty " 
+
+puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :" 
 
 set LinuxDiff 4
-set linuxFaulties {STATSHAPE}
 set filename bm4_id_punch_d.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 69 )  Summary  = 6  ( 69 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 68 )  Summary  = 6  ( 68 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 5  ( 5 )  Shell    = 42  ( 5 )  Face     = 186  ( 186 )   Summary  = 1539  ( 1483 )
 STATSHAPE   : Solid    = 5  ( 5 )  Shell    = 42  ( 5 )  Face     = 186  ( 186 )   FreeWire = 0  ( 0 )   FreeEdge  = 6 ( 6 )   SharedEdge = 602  ( 602 )
diff --git a/tests/de/step_2/D9 b/tests/de/step_2/D9
index 475d94449d..b085f90b6e 100644
--- a/tests/de/step_2/D9
+++ b/tests/de/step_2/D9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
@@ -8,11 +7,11 @@ set filename bm4_db_punch_a.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 13  ( 2 )  Summary  = 13  ( 2 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 2 )  Summary  = 9  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 16  ( 16 )  Face     = 192  ( 192 )   Summary  = 1314  ( 1270 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 16  ( 16 )  Face     = 192  ( 192 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 519  ( 503 )
-TOLERANCE   : MaxTol   =    0.152467407  (    0.344407918 )  AvgTol   =  0.0008343814537  (  0.005614165412 )
+TOLERANCE   : MaxTol   =    0.152467407  (    0.344407918 )  AvgTol   =  0.0007932779574  (  0.005614165412 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 31  ( 31 )  N2Labels = 0  ( 0 )   TotalLabels = 35  ( 35 )   NameLabels = 7  ( 7 )   ColorLabels = 16  ( 16 )   LayerLabels = 16  ( 19 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/E1 b/tests/de/step_2/E1
index 1c8b706058..ae0a134256 100644
--- a/tests/de/step_2/E1
+++ b/tests/de/step_2/E1
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_2/E2 b/tests/de/step_2/E2
index 37508463c7..0aaf396a34 100644
--- a/tests/de/step_2/E2
+++ b/tests/de/step_2/E2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_2/E5 b/tests/de/step_2/E5
index f7b55a83bd..a11cfe2c0e 100644
--- a/tests/de/step_2/E5
+++ b/tests/de/step_2/E5
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename trj3_pm1-ct2-203.stp
 
 set ref_data {
@@ -11,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 37  ( 25 )  Summary  = 37  ( 25 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 7  ( 1 )  Face     = 200  ( 200 )   Summary  = 1529  ( 1523 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 7  ( 1 )  Face     = 200  ( 200 )   FreeWire = 0  ( 44 )   FreeEdge  = 44 ( 44 )   SharedEdge = 613  ( 613 )
-TOLERANCE   : MaxTol   =  0.02902527695  (  0.02902527731 )  AvgTol   =  0.0006111299775  (  0.000610259678 )
+TOLERANCE   : MaxTol   =  0.02902527695  (  0.02902527731 )  AvgTol   =  0.0006111299774  (  0.0006102596779 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 7  ( 7 )   NameLabels = 7  ( 7 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/E6 b/tests/de/step_2/E6
index 00b7d1bd92..6b940d8dd5 100644
--- a/tests/de/step_2/E6
+++ b/tests/de/step_2/E6
@@ -1,19 +1,19 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO ?CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
-puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
+
+puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
+
 set LinuxDiff 3
 set filename trj3_s1-al-214.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 102  ( 101 )  Summary  = 102  ( 101 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 102  ( 97 )  Summary  = 102  ( 97 )
 CHECKSHAPE  : Wires    = 12  ( 12 )  Faces    = 12  ( 12 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 5  ( 5 )  Shell    = 18  ( 14 )  Face     = 94  ( 94 )   Summary  = 630  ( 627 )
 STATSHAPE   : Solid    = 5  ( 5 )  Shell    = 18  ( 14 )  Face     = 94  ( 94 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 255  ( 255 )
-TOLERANCE   : MaxTol   =    5.454654424  (    20.45495409 )  AvgTol   =    0.1582231883  (    0.5084163389 )
+TOLERANCE   : MaxTol   =    5.454654424  (    20.45495409 )  AvgTol   =    0.1582232113  (    0.5079560802 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 18  ( 17 )  N2Labels = 0  ( 0 )   TotalLabels = 19  ( 18 )   NameLabels = 1  ( 1 )   ColorLabels = 18  ( 17 )   LayerLabels = 7  ( 8 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/E7 b/tests/de/step_2/E7
index 5ea848d323..e95ce401b2 100644
--- a/tests/de/step_2/E7
+++ b/tests/de/step_2/E7
@@ -1,8 +1,9 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
 
 set LinuxDiff 3
 set filename r76sy.stp
diff --git a/tests/de/step_2/E9 b/tests/de/step_2/E9
index 56f6626b16..700fb1595a 100644
--- a/tests/de/step_2/E9
+++ b/tests/de/step_2/E9
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
@@ -12,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 22  ( 14 )  Summary  = 22  ( 14 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 16  ( 16 )  Face     = 192  ( 192 )   Summary  = 1314  ( 1270 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 16  ( 16 )  Face     = 192  ( 192 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 519  ( 503 )
-TOLERANCE   : MaxTol   =    0.152467407  (    0.344407918 )  AvgTol   =  0.0007954557279  (  0.005616743583 )
+TOLERANCE   : MaxTol   =    0.152467407  (    0.344407918 )  AvgTol   =  0.0007954557255  (  0.005616743583 )
 LABELS      : N0Labels = 4  ( 4 )  N1Labels = 31  ( 31 )  N2Labels = 0  ( 0 )   TotalLabels = 35  ( 35 )   NameLabels = 7  ( 7 )   ColorLabels = 16  ( 16 )   LayerLabels = 16  ( 19 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/F1 b/tests/de/step_2/F1
index 988d0c939f..e550aaa1b9 100644
--- a/tests/de/step_2/F1
+++ b/tests/de/step_2/F1
@@ -1,9 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :" 
 
 set LinuxDiff 1
 set filename bm4_sd_punch_c.stp
diff --git a/tests/de/step_2/F3 b/tests/de/step_2/F3
index 001512e276..38cfdd5282 100644
--- a/tests/de/step_2/F3
+++ b/tests/de/step_2/F3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
 
diff --git a/tests/de/step_2/F4 b/tests/de/step_2/F4
index d22572ab47..114c026665 100644
--- a/tests/de/step_2/F4
+++ b/tests/de/step_2/F4
@@ -1,10 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
 
 set LinuxDiff 3
 set filename pe_turbine-A.stp
diff --git a/tests/de/step_2/F5 b/tests/de/step_2/F5
index f778786bf1..f2663d6537 100644
--- a/tests/de/step_2/F5
+++ b/tests/de/step_2/F5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename BUC60143.stp
 
 set ref_data {
diff --git a/tests/de/step_2/F9 b/tests/de/step_2/F9
index 2318142629..d60c70f528 100644
--- a/tests/de/step_2/F9
+++ b/tests/de/step_2/F9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename CC670-12608.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 35  ( 21 )  Summary  = 35  ( 21 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 126  ( 126 )   Summary  = 1309  ( 1222 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 126  ( 126 )   FreeWire = 0  ( 8 )   FreeEdge  = 94 ( 94 )   SharedEdge = 449  ( 449 )
-TOLERANCE   : MaxTol   =  0.02385233045  (  0.02385233045 )  AvgTol   =  0.0005034785375  (  0.0004891920813 )
+TOLERANCE   : MaxTol   =  0.02385233045  (  0.02385233045 )  AvgTol   =  0.0005035434631  (  0.0004892198248 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 8  ( 8 )   NameLabels = 8  ( 8 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/G1 b/tests/de/step_2/G1
index a35ecc0ed1..b91544fb83 100644
--- a/tests/de/step_2/G1
+++ b/tests/de/step_2/G1
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename CC670-12613.stp
 
 set ref_data {
diff --git a/tests/de/step_2/G2 b/tests/de/step_2/G2
index b50967a847..7a6bbcfa79 100644
--- a/tests/de/step_2/G2
+++ b/tests/de/step_2/G2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename CTS20315-1.stp
 
 set ref_data {
diff --git a/tests/de/step_2/G7 b/tests/de/step_2/G7
index 88f0ec20c6..601d865c24 100644
--- a/tests/de/step_2/G7
+++ b/tests/de/step_2/G7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename PRO10370.stp
 
 set ref_data {
diff --git a/tests/de/step_2/H5 b/tests/de/step_2/H5
index dc5888a7f2..c9aac4cd62 100644
--- a/tests/de/step_2/H5
+++ b/tests/de/step_2/H5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename Sbottle.stp
 
 set ref_data {
diff --git a/tests/de/step_2/I6 b/tests/de/step_2/I6
index 223ce43ae8..cb8d048acd 100644
--- a/tests/de/step_2/I6
+++ b/tests/de/step_2/I6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm2_id_exhaust-A.stp
 
 set ref_data {
diff --git a/tests/de/step_2/J7 b/tests/de/step_2/J7
index f1799a8f3a..836b80b286 100644
--- a/tests/de/step_2/J7
+++ b/tests/de/step_2/J7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_ct_punch.stp
 
 set ref_data {
diff --git a/tests/de/step_2/K8 b/tests/de/step_2/K8
index 53e4fb9370..7417cc6dad 100644
--- a/tests/de/step_2/K8
+++ b/tests/de/step_2/K8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_pe_punch_b.stp
 
 set ref_data {
diff --git a/tests/de/step_2/L5 b/tests/de/step_2/L5
index 4963d6f676..a1d52db298 100644
--- a/tests/de/step_2/L5
+++ b/tests/de/step_2/L5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_sd_punch_a.stp
 
 set ref_data {
diff --git a/tests/de/step_2/L6 b/tests/de/step_2/L6
index 80b50ea764..e24703da0b 100644
--- a/tests/de/step_2/L6
+++ b/tests/de/step_2/L6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_sd_punch_b.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 10  ( 0 )  Summary  = 10  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 204  ( 204 )   Summary  = 1367  ( 1367 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 204  ( 204 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 554  ( 554 )
-TOLERANCE   : MaxTol   = 6.188728228e-007  ( 6.18873692e-007 )  AvgTol   =  1.426129355e-007  (  1.426128759e-007 )
+TOLERANCE   : MaxTol   = 6.188728122e-007  ( 6.18873692e-007 )  AvgTol   =  1.426129355e-007  (  1.427924806e-007 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 41  ( 41 )  N2Labels = 0  ( 0 )   TotalLabels = 46  ( 46 )   NameLabels = 9  ( 9 )   ColorLabels = 41  ( 41 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/M8 b/tests/de/step_2/M8
index 3a984e23ed..301f7f4f3b 100644
--- a/tests/de/step_2/M8
+++ b/tests/de/step_2/M8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename db_turbine-A.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 12  ( 7 )  Summary  = 12  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 40  ( 40 )   Summary  = 231  ( 231 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 40  ( 40 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 99  ( 99 )
-TOLERANCE   : MaxTol   =  0.02294322294  (  0.02294322294 )  AvgTol   =  0.003566579176  (  0.003568540358 )
+TOLERANCE   : MaxTol   =  0.02294322294  (  0.02294322294 )  AvgTol   =  0.003566378077  (  0.003568339259 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/M9 b/tests/de/step_2/M9
index e98d09dfc2..56feb3c9c5 100644
--- a/tests/de/step_2/M9
+++ b/tests/de/step_2/M9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename db_turbine-B.stp
 
 set ref_data {
diff --git a/tests/de/step_2/N1 b/tests/de/step_2/N1
index 46096443b2..35dcff63d2 100644
--- a/tests/de/step_2/N1
+++ b/tests/de/step_2/N1
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename demo2.stp
 
 set ref_data {
diff --git a/tests/de/step_2/N3 b/tests/de/step_2/N3
index 972b31af1d..7678076a8c 100644
--- a/tests/de/step_2/N3
+++ b/tests/de/step_2/N3
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename ec_turbine-A.stp
 
 set ref_data {
@@ -10,7 +7,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.963326098e-006  (  7.809437752e-006 )
+TOLERANCE   : MaxTol   = 3.83146359e-005  ( 4.239045465e-005 )  AvgTol   =  6.963326097e-006  (  7.809437752e-006 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/N4 b/tests/de/step_2/N4
index db140f692b..427677fb89 100644
--- a/tests/de/step_2/N4
+++ b/tests/de/step_2/N4
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename gbit2tsec.stp
 
 set ref_data {
diff --git a/tests/de/step_2/N6 b/tests/de/step_2/N6
index 08ead2d2aa..0c0071db99 100644
--- a/tests/de/step_2/N6
+++ b/tests/de/step_2/N6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename gbpffacrad.stp
 
 set ref_data {
diff --git a/tests/de/step_2/N7 b/tests/de/step_2/N7
index 2813427341..98c2cd39d9 100644
--- a/tests/de/step_2/N7
+++ b/tests/de/step_2/N7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename id_exhaust-A.stp
 
 set ref_data {
diff --git a/tests/de/step_2/N8 b/tests/de/step_2/N8
index 51033ba927..5de38999e9 100644
--- a/tests/de/step_2/N8
+++ b/tests/de/step_2/N8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename id_exhaust-B.stp
 
 set ref_data {
diff --git a/tests/de/step_2/N9 b/tests/de/step_2/N9
index d88373dabf..70cfd0a356 100644
--- a/tests/de/step_2/N9
+++ b/tests/de/step_2/N9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename id_soapbox-A.stp
 
 set ref_data {
diff --git a/tests/de/step_2/O1 b/tests/de/step_2/O1
index ca39287a5f..6825b2c7b6 100644
--- a/tests/de/step_2/O1
+++ b/tests/de/step_2/O1
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename id_soapbox-B.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 19  ( 6 )  Summary  = 19  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 104  ( 104 )   Summary  = 752  ( 748 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 104  ( 104 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 266  ( 262 )
-TOLERANCE   : MaxTol   = 0.006923751402  ( 0.006923751402 )  AvgTol   =  0.001385246445  (  0.001385552802 )
+TOLERANCE   : MaxTol   = 0.006923751402  ( 0.006923751402 )  AvgTol   =  0.001385246436  (  0.001385552802 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/O2 b/tests/de/step_2/O2
index 7e0ad22dac..c8df548675 100644
--- a/tests/de/step_2/O2
+++ b/tests/de/step_2/O2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename ie_exhaust-C.stp
 
 set ref_data {
diff --git a/tests/de/step_2/O3 b/tests/de/step_2/O3
index 0960d83866..dceec96856 100644
--- a/tests/de/step_2/O3
+++ b/tests/de/step_2/O3
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename ie_soapbox-A.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 28  ( 20 )  Summary  = 28  ( 20 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 28  ( 22 )  Summary  = 28  ( 22 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 112  ( 112 )   Summary  = 691  ( 687 )
 STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 112  ( 112 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 292  ( 288 )
-TOLERANCE   : MaxTol   = 0.009966026823  ( 0.009966026821 )  AvgTol   =  0.001104576766  (  0.001087996133 )
+TOLERANCE   : MaxTol   = 0.009966026823  ( 0.009966026821 )  AvgTol   =  0.001104577485  (  0.001087996858 )
 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/O4 b/tests/de/step_2/O4
index 55a9cef092..d9a40fb7df 100644
--- a/tests/de/step_2/O4
+++ b/tests/de/step_2/O4
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename ie_soapbox-C.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 28  ( 14 )  Summary  = 28  ( 14 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 28  ( 16 )  Summary  = 28  ( 16 )
 CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 2  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 108  ( 108 )   Summary  = 681  ( 677 )
 STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 2  ( 2 )  Face     = 108  ( 108 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 290  ( 286 )
-TOLERANCE   : MaxTol   = 0.009966026823  ( 0.009966026821 )  AvgTol   =  0.001121797311  (  0.001105555446 )
+TOLERANCE   : MaxTol   = 0.009966026823  ( 0.009966026821 )  AvgTol   =  0.001121798037  (  0.001105556177 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/O8 b/tests/de/step_2/O8
index e8400dc563..168f6a05ed 100644
--- a/tests/de/step_2/O8
+++ b/tests/de/step_2/O8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename pe_soapbox-A.stp
 
 set ref_data {
diff --git a/tests/de/step_2/O9 b/tests/de/step_2/O9
index 7db8e295aa..68b7a0d1d3 100644
--- a/tests/de/step_2/O9
+++ b/tests/de/step_2/O9
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename pe_soapbox-B.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 10  ( 2 )  Summary  = 10  ( 2 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 10  ( 8 )  Summary  = 10  ( 8 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 136  ( 136 )   Summary  = 840  ( 838 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 136  ( 136 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 351  ( 349 )
-TOLERANCE   : MaxTol   =   0.0155651078  (  0.01556490515 )  AvgTol   =  0.0006835044041  (  0.0005926024111 )
+TOLERANCE   : MaxTol   =   0.0155651078  (  0.01556490515 )  AvgTol   =  0.0006835051077  (  0.0005926142959 )
 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/P1 b/tests/de/step_2/P1
index 805df98340..03dfc5b8fb 100644
--- a/tests/de/step_2/P1
+++ b/tests/de/step_2/P1
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename r103ec.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 28  ( 0 )  Summary  = 28  ( 0 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 25  ( 0 )  Summary  = 25  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 146  ( 146 )   Summary  = 860  ( 860 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 146  ( 146 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 346  ( 346 )
-TOLERANCE   : MaxTol   = 5.024535408e-007  ( 5.024535217e-007 )  AvgTol   =  1.930849396e-007  (  1.400781778e-007 )
+TOLERANCE   : MaxTol   = 5.024535408e-007  ( 5.024535217e-007 )  AvgTol   =  1.927382486e-007  (  1.400781778e-007 )
 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/P4 b/tests/de/step_2/P4
index 5905a7b41f..0aed320539 100644
--- a/tests/de/step_2/P4
+++ b/tests/de/step_2/P4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename r31db.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 94  ( 85 )  Summary  = 94  ( 85 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 127  ( 127 )   Summary  = 695  ( 695 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 3  ( 3 )  Face     = 127  ( 127 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 269  ( 269 )
-TOLERANCE   : MaxTol   =  0.03575654023  (  0.03575654023 )  AvgTol   =  0.0006545391515  (  0.001601121323 )
+TOLERANCE   : MaxTol   =  0.03575654023  (  0.03575654023 )  AvgTol   =  0.0006545391586  (  0.001601121323 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 3  ( 3 )  N2Labels = 0  ( 0 )   TotalLabels = 4  ( 4 )   NameLabels = 1  ( 1 )   ColorLabels = 3  ( 3 )   LayerLabels = 3  ( 3 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/P5 b/tests/de/step_2/P5
index d44022c5fe..6727c4d6f1 100644
--- a/tests/de/step_2/P5
+++ b/tests/de/step_2/P5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename r56ie.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 20  ( 17 )  Summary  = 20  ( 17 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 495  ( 495 )   Summary  = 3087  ( 3087 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 495  ( 495 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1285  ( 1285 )
-TOLERANCE   : MaxTol   = 0.007275739139  ( 0.007275739138 )  AvgTol   =  0.0003723029387  (  0.0003723030048 )
+TOLERANCE   : MaxTol   = 0.007275739139  ( 0.007275739138 )  AvgTol   =  0.0003723029744  (  0.0003723030048 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_2/P6 b/tests/de/step_2/P6
index 12b17fde39..2d02f08b8b 100644
--- a/tests/de/step_2/P6
+++ b/tests/de/step_2/P6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename r61pe.stp
 
 set ref_data {
diff --git a/tests/de/step_2/P7 b/tests/de/step_2/P7
index 84a8ecb7f2..6492936ee5 100644
--- a/tests/de/step_2/P7
+++ b/tests/de/step_2/P7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename r65a-pe.stp
 
 set ref_data {
diff --git a/tests/de/step_2/P8 b/tests/de/step_2/P8
index 217fc6c7e5..cc38f788d9 100644
--- a/tests/de/step_2/P8
+++ b/tests/de/step_2/P8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename r93id.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 38  ( 22 )  Summary  = 38  ( 22 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 224  ( 224 )   Summary  = 1320  ( 1320 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 224  ( 224 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 538  ( 538 )
-TOLERANCE   : MaxTol   = 0.006032975282  ( 0.006033035609 )  AvgTol   =  0.0005119211885  (  0.0005119217262 )
+TOLERANCE   : MaxTol   = 0.006032975282  ( 0.006033035609 )  AvgTol   =  0.0005119211623  (  0.0005119217262 )
 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/Q4 b/tests/de/step_2/Q4
index bfd32173f3..0d2243e9c4 100644
--- a/tests/de/step_2/Q4
+++ b/tests/de/step_2/Q4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename sd_turbine-A.stp
 
 set ref_data {
diff --git a/tests/de/step_2/R2 b/tests/de/step_2/R2
index a657cff444..6f174cbee0 100644
--- a/tests/de/step_2/R2
+++ b/tests/de/step_2/R2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj7_b1-id-214.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 31  ( 27 )  Summary  = 31  ( 27 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 357  ( 357 )   Summary  = 2005  ( 2003 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 357  ( 357 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 841  ( 839 )
-TOLERANCE   : MaxTol   = 0.007356791914  ( 0.007356791913 )  AvgTol   =  0.0002971930696  (  0.000297727145 )
+TOLERANCE   : MaxTol   = 0.007356791914  ( 0.007356791913 )  AvgTol   =  0.0002971937591  (  0.0002977485157 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/R4 b/tests/de/step_2/R4
index 47b4d1dab4..4bd264af6c 100644
--- a/tests/de/step_2/R4
+++ b/tests/de/step_2/R4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename tr9_r0801-sd.stp
 
 set ref_data {
diff --git a/tests/de/step_2/R5 b/tests/de/step_2/R5
index bbce3e089f..84a23c56ed 100644
--- a/tests/de/step_2/R5
+++ b/tests/de/step_2/R5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trcol1.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 5  ( 2 )  Summary  = 5  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 138  ( 138 )   Summary  = 842  ( 842 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 138  ( 138 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 351  ( 351 )
-TOLERANCE   : MaxTol   =   0.1179467922  (   0.1462670652 )  AvgTol   =   0.02636175801  (   0.03478480279 )
+TOLERANCE   : MaxTol   =   0.1179467933  (   0.1462670652 )  AvgTol   =   0.02636175802  (   0.03478480279 )
 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/R7 b/tests/de/step_2/R7
index da04e69ea9..57a63c3328 100644
--- a/tests/de/step_2/R7
+++ b/tests/de/step_2/R7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj10_b2-oc-214.stp
 
 set ref_data {
diff --git a/tests/de/step_2/S1 b/tests/de/step_2/S1
index 33224c215e..91d1aac6da 100644
--- a/tests/de/step_2/S1
+++ b/tests/de/step_2/S1
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj12_ttmouse-pe-214.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 39  ( 6 )  Summary  = 39  ( 6 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 39  ( 7 )  Summary  = 39  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 16  ( 16 )  Shell    = 17  ( 17 )  Face     = 364  ( 364 )   Summary  = 2485  ( 2485 )
 STATSHAPE   : Solid    = 79  ( 79 )  Shell    = 87  ( 87 )  Face     = 2716  ( 2716 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1053  ( 1053 )
-TOLERANCE   : MaxTol   = 0.008250618048  ( 0.008250618045 )  AvgTol   =  0.0002623355281  (  0.0002623329911 )
+TOLERANCE   : MaxTol   = 0.008250618048  ( 0.008250618045 )  AvgTol   =  0.0002623373479  (  0.0002623348109 )
 LABELS      : N0Labels = 10  ( 10 )  N1Labels = 32  ( 32 )  N2Labels = 0  ( 0 )   TotalLabels = 42  ( 42 )   NameLabels = 22  ( 22 )   ColorLabels = 22  ( 22 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/step_2/S4 b/tests/de/step_2/S4
index 4750385fc4..fecb70fa69 100644
--- a/tests/de/step_2/S4
+++ b/tests/de/step_2/S4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename ug_soapbox-B.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 25  ( 5 )  Summary  = 25  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 94  ( 94 )   Summary  = 570  ( 570 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 94  ( 94 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 232  ( 232 )
-TOLERANCE   : MaxTol   =  0.00325269835  ( 0.003252698346 )  AvgTol   =  0.0003146155421  (  0.0003124677492 )
+TOLERANCE   : MaxTol   =  0.00325269835  ( 0.003252698346 )  AvgTol   =  0.0003146174989  (  0.0003124697061 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/S5 b/tests/de/step_2/S5
index 6053a1daf4..b8f4a53598 100644
--- a/tests/de/step_2/S5
+++ b/tests/de/step_2/S5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj4_k1_top-ec-214.stp
 
 set ref_data {
diff --git a/tests/de/step_2/S6 b/tests/de/step_2/S6
index e62d3b8a98..391b3e0c8b 100644
--- a/tests/de/step_2/S6
+++ b/tests/de/step_2/S6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj4_pm2-ct-203.stp
 
 set ref_data {
diff --git a/tests/de/step_2/S7 b/tests/de/step_2/S7
index 484f40a3a9..9943b11179 100644
--- a/tests/de/step_2/S7
+++ b/tests/de/step_2/S7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj4_pm2-ct2-203.stp
 
 set ref_data {
diff --git a/tests/de/step_2/T1 b/tests/de/step_2/T1
index 2a7a07496b..a60ef6b02c 100644
--- a/tests/de/step_2/T1
+++ b/tests/de/step_2/T1
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
+puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :" 
 
 set LinuxDiff 2
 set filename trj6_b1-id-203.stp
@@ -11,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 31  ( 28 )  Summary  = 31  ( 28 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 357  ( 357 )   Summary  = 2006  ( 2004 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 357  ( 357 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 841  ( 839 )
-TOLERANCE   : MaxTol   = 0.007356791914  ( 0.007356791913 )  AvgTol   =  0.0002971885083  (  0.0002976022274 )
+TOLERANCE   : MaxTol   = 0.007356791914  ( 0.007356791913 )  AvgTol   =  0.0002971887834  (  0.0002976051887 )
 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/T6 b/tests/de/step_2/T6
index 57b5e11904..b8b44f8cca 100644
--- a/tests/de/step_2/T6
+++ b/tests/de/step_2/T6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj6_k1-td-214.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 2  ( 1 )  Summary  = 2  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 59  ( 59 )  Face     = 59  ( 59 )   Summary  = 787  ( 787 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 59  ( 59 )  Face     = 59  ( 59 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 304  ( 304 )
-TOLERANCE   : MaxTol   = 3.463377008e-005  ( 3.463377008e-005 )  AvgTol   =  7.683257197e-007  (  7.686910782e-007 )
+TOLERANCE   : MaxTol   = 3.463377008e-005  ( 3.463377008e-005 )  AvgTol   =  7.68334092e-007  (  7.701432505e-007 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 59  ( 59 )  N2Labels = 0  ( 0 )   TotalLabels = 60  ( 60 )   NameLabels = 1  ( 1 )   ColorLabels = 59  ( 59 )   LayerLabels = 59  ( 59 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_2/V6 b/tests/de/step_2/V6
index 214c3677dd..107985791d 100644
--- a/tests/de/step_2/V6
+++ b/tests/de/step_2/V6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj9_b2-oc-214.stp
 
 set ref_data {
diff --git a/tests/de/step_2/V8 b/tests/de/step_2/V8
index 3f6670e1e6..576c446756 100644
--- a/tests/de/step_2/V8
+++ b/tests/de/step_2/V8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename welle_solid.stp
 
 set ref_data {
diff --git a/tests/de/step_2/W2 b/tests/de/step_2/W2
index 1e213b45da..deb84d239f 100644
--- a/tests/de/step_2/W2
+++ b/tests/de/step_2/W2
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename bm4_sd_eye_c.stp
 
 set ref_data {
diff --git a/tests/de/step_2/W3 b/tests/de/step_2/W3
index 34671f6feb..54a38234a1 100644
--- a/tests/de/step_2/W3
+++ b/tests/de/step_2/W3
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_sd_seal_a.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 150  ( 7 )  Summary  = 150  ( 7 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 135  ( 7 )  Summary  = 135  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 540  ( 540 )   Summary  = 2968  ( 2968 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 540  ( 540 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1202  ( 1202 )
-TOLERANCE   : MaxTol   = 6.818588609e-006  ( 6.818587037e-006 )  AvgTol   =  8.112548803e-007  (  8.033958879e-007 )
+TOLERANCE   : MaxTol   = 6.818588609e-006  ( 6.818587037e-006 )  AvgTol   =  8.073262013e-007  (  8.027541749e-007 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/W4 b/tests/de/step_2/W4
index 0d78d31e81..8bec560488 100644
--- a/tests/de/step_2/W4
+++ b/tests/de/step_2/W4
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_sd_seal_c.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 150  ( 7 )  Summary  = 150  ( 7 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 135  ( 7 )  Summary  = 135  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 540  ( 540 )   Summary  = 2968  ( 2968 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 540  ( 540 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1202  ( 1202 )
-TOLERANCE   : MaxTol   = 6.818588609e-006  ( 6.818587037e-006 )  AvgTol   =  8.112548803e-007  (  8.033958879e-007 )
+TOLERANCE   : MaxTol   = 6.818588609e-006  ( 6.818587037e-006 )  AvgTol   =  8.073262013e-007  (  8.027541749e-007 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/X3 b/tests/de/step_2/X3
index fa3c05ca41..547430f11b 100644
--- a/tests/de/step_2/X3
+++ b/tests/de/step_2/X3
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj9_b2-sy-214.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 113  ( 103 )  Summary  = 113  ( 10
 CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 2  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 260  ( 260 )   Summary  = 1745  ( 1745 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 260  ( 260 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 730  ( 730 )
-TOLERANCE   : MaxTol   = 0.004437798931  (  0.03878259147 )  AvgTol   =  0.0002767147005  (  0.001694294606 )
+TOLERANCE   : MaxTol   = 0.004437798931  (  0.03878259147 )  AvgTol   =  0.0002767147008  (  0.001694294606 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 1  ( 1 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/X7 b/tests/de/step_2/X7
index 841907594b..299ab34e7c 100644
--- a/tests/de/step_2/X7
+++ b/tests/de/step_2/X7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename sd_soapbox-B.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 6  ( 0 )  Summary  = 6  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 111  ( 111 )   Summary  = 689  ( 689 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 111  ( 111 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 286  ( 286 )
-TOLERANCE   : MaxTol   = 4.910247562e-006  ( 4.910249739e-006 )  AvgTol   =  2.472515148e-007  (  2.507727396e-007 )
+TOLERANCE   : MaxTol   = 4.910247562e-006  ( 4.910249739e-006 )  AvgTol   =  2.707393442e-007  (  2.707403089e-007 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_2/Y5 b/tests/de/step_2/Y5
index 94f7b4c6cd..4e6827ef06 100644
--- a/tests/de/step_2/Y5
+++ b/tests/de/step_2/Y5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_3/A3 b/tests/de/step_3/A3
index 9819b6640d..05b97f080c 100644
--- a/tests/de/step_3/A3
+++ b/tests/de/step_3/A3
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename tr9_r0601-db.stp
 
 set ref_data {
@@ -11,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 169  ( 3 )  Summary  = 169  ( 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  = 46792  ( 42470 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 4252  ( 61 )  Face     = 4252  ( 4252 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 17172  ( 17172 )
-TOLERANCE   : MaxTol   =  0.01863822469  (  0.02412563427 )  AvgTol   =  2.361799701e-005  (  0.0001288539302 )
+TOLERANCE   : MaxTol   =  0.01863822562  (  0.02412563427 )  AvgTol   =  2.361804815e-005  (  0.0001288539287 )
 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/A4 b/tests/de/step_3/A4
index f1ff540024..5838eeb5b6 100644
--- a/tests/de/step_3/A4
+++ b/tests/de/step_3/A4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename CTS20315-2.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 322  ( 148 )  Summary  = 322  ( 14
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 797  ( 797 )  Face     = 797  ( 797 )   Summary  = 11928  ( 11928 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 797  ( 797 )  Face     = 797  ( 797 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 4821  ( 4821 )
-TOLERANCE   : MaxTol   =  0.03846819732  (   0.0394709482 )  AvgTol   =  0.0008687242138  (  0.002865279517 )
+TOLERANCE   : MaxTol   =  0.03846819732  (   0.0394709482 )  AvgTol   =  0.0008687249457  (  0.002865279517 )
 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_3/A6 b/tests/de/step_3/A6
index 363146951f..faa9c4c66d 100644
--- a/tests/de/step_3/A6
+++ b/tests/de/step_3/A6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_3/A8 b/tests/de/step_3/A8
index af2802f5aa..1f1bf6cf2c 100644
--- a/tests/de/step_3/A8
+++ b/tests/de/step_3/A8
@@ -1,9 +1,9 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: TOLERANCE : Faulty" 
-puts "TODO CR23096 Mandriva2010: CHECKSHAPE : Faulty"
+puts "TODO CR23096 Mandriva2010: CHECKSHAPE : Faulty " 
+
+puts "TODO CR23096 Mandriva2010: TOLERANCE : Faulty " 
+
+puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :" 
 
 set LinuxDiff 4
 set LinuxFaulties {CHECKSHAPE TOLERANCE}
@@ -15,7 +15,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 47  ( 41 )  Summary  = 47  ( 41 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 209  ( 129 )  Face     = 209  ( 209 )   Summary  = 3033  ( 2883 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 209  ( 129 )  Face     = 209  ( 209 )   FreeWire = 0  ( 1 )   FreeEdge  = 67 ( 67 )   SharedEdge = 1153  ( 1150 )
-TOLERANCE   : MaxTol   =   0.3035246255  (   0.3035246024 )  AvgTol   =  0.001284529245  (  0.001353857367 )
+TOLERANCE   : MaxTol   =   0.3035246255  (   0.3035246024 )  AvgTol   =  0.001284519323  (  0.001353411523 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/B2 b/tests/de/step_3/B2
index b3908de4ec..0f914d14e4 100644
--- a/tests/de/step_3/B2
+++ b/tests/de/step_3/B2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: PROPS : Faulty" 
 
 
@@ -7,11 +6,11 @@ set filename trj7_pm5-pe-214.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 7  ( 4 )  Summary  = 7  ( 4 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 7  ( 2 )  Summary  = 7  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 1067  ( 1067 )   Summary  = 7192  ( 7192 )
 STATSHAPE   : Solid    = 6  ( 6 )  Shell    = 6  ( 6 )  Face     = 1083  ( 1083 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3028  ( 3028 )
-TOLERANCE   : MaxTol   = 0.0008521598214  ( 0.0008521598214 )  AvgTol   =  1.249644984e-005  (  1.249720623e-005 )
+TOLERANCE   : MaxTol   = 0.0008521598214  ( 0.0008521598214 )  AvgTol   =  1.249644992e-005  (  1.249586266e-005 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 107  ( 107 )  N2Labels = 0  ( 0 )   TotalLabels = 112  ( 112 )   NameLabels = 11  ( 11 )   ColorLabels = 104  ( 104 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 5  ( 11 )  Volume   = 5  ( 5 )  Area     = 5  ( 5 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_3/B3 b/tests/de/step_3/B3
index d70ba96e42..8fbf069ea3 100644
--- a/tests/de/step_3/B3
+++ b/tests/de/step_3/B3
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -7,11 +6,11 @@ set filename trj12_b3-id-214.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 451  ( 435 )  Summary  = 451  ( 435 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 451  ( 436 )  Summary  = 451  ( 436 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 691  ( 691 )   Summary  = 4597  ( 4593 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 691  ( 691 )   FreeWire = 0  ( 0 )   FreeEdge  = 4 ( 4 )   SharedEdge = 1921  ( 1921 )
-TOLERANCE   : MaxTol   = 0.009713246079  ( 0.009713246096 )  AvgTol   =  0.0007364223692  (  0.0007406575624 )
+TOLERANCE   : MaxTol   = 0.009713246079  ( 0.009713246096 )  AvgTol   =  0.0007364215724  (  0.0007406585613 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 765  ( 761 )  N2Labels = 0  ( 0 )   TotalLabels = 768  ( 764 )   NameLabels = 5  ( 5 )   ColorLabels = 73  ( 70 )   LayerLabels = 691  ( 691 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_3/B4 b/tests/de/step_3/B4
index 3d049cd7d8..fd87b35431 100644
--- a/tests/de/step_3/B4
+++ b/tests/de/step_3/B4
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_3/B6 b/tests/de/step_3/B6
index e876f531b0..b32799c060 100644
--- a/tests/de/step_3/B6
+++ b/tests/de/step_3/B6
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename tr9_r0601-td.stp
 
 set ref_data {
@@ -11,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 228  ( 1 )  Summary  = 228  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 4242  ( 61 )  Face     = 4242  ( 4242 )   Summary  = 46642  ( 42462 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 4242  ( 61 )  Face     = 4242  ( 4242 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 17100  ( 17100 )
-TOLERANCE   : MaxTol   = 0.0002439254042  ( 0.0002439254042 )  AvgTol   =  2.817872008e-007  (  2.288798605e-007 )
+TOLERANCE   : MaxTol   = 0.0002439254042  ( 0.0002439254042 )  AvgTol   =  2.818121887e-007  (  2.294066782e-007 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 4242  ( 4242 )  N2Labels = 0  ( 0 )   TotalLabels = 4243  ( 4243 )   NameLabels = 1  ( 1 )   ColorLabels = 4242  ( 4242 )   LayerLabels = 4242  ( 4242 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_3/B7 b/tests/de/step_3/B7
index 749f62695d..2b26d1ff59 100644
--- a/tests/de/step_3/B7
+++ b/tests/de/step_3/B7
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename PRO7072.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 163  ( 219 )  Summary  = 163  ( 219 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 163  ( 218 )  Summary  = 163  ( 218 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 779  ( 770 )  Face     = 800  ( 800 )   Summary  = 9160  ( 9152 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 779  ( 770 )  Face     = 800  ( 800 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3403  ( 3404 )
-TOLERANCE   : MaxTol   =   0.1585551198  (   0.1585551198 )  AvgTol   =  0.0004822373214  (  0.0004842497118 )
+TOLERANCE   : MaxTol   =   0.1585551198  (   0.1585551198 )  AvgTol   =  0.0004821919068  (  0.0004842359831 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/B8 b/tests/de/step_3/B8
index a9efb974f9..0bd9edd3d9 100644
--- a/tests/de/step_3/B8
+++ b/tests/de/step_3/B8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 
 
@@ -7,12 +6,12 @@ set filename gehaeuse_solid.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 120  ( 77 )  Summary  = 120  ( 77 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 120  ( 78 )  Summary  = 120  ( 78 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 4  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 12  ( 12 )  Shell    = 28  ( 28 )  Face     = 3042  ( 3042 )   Summary  = 17828  ( 17827 )
-STATSHAPE   : Solid    = 42  ( 42 )  Shell    = 58  ( 58 )  Face     = 3464  ( 3464 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 7282  ( 7281 )
-TOLERANCE   : MaxTol   =  0.08182857582  (  0.08182857582 )  AvgTol   =  0.0001757020743  (  0.0001756621855 )
-LABELS      : N0Labels = 18  ( 18 )  N1Labels = 47  ( 47 )  N2Labels = 0  ( 0 )   TotalLabels = 65  ( 65 )   NameLabels = 65  ( 65 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
+NBSHAPES    : Solid    = 12  ( 12 )  Shell    = 30  ( 30 )  Face     = 3048  ( 3048 )   Summary  = 17864  ( 17863 )
+STATSHAPE   : Solid    = 42  ( 42 )  Shell    = 60  ( 60 )  Face     = 3470  ( 3470 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 7294  ( 7293 )
+TOLERANCE   : MaxTol   =  0.08182857582  (  0.08182857582 )  AvgTol   =  0.0001754797558  (  0.0001754398189 )
+LABELS      : N0Labels = 19  ( 19 )  N1Labels = 47  ( 47 )  N2Labels = 0  ( 0 )   TotalLabels = 66  ( 66 )   NameLabels = 66  ( 66 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
 COLORS      : Colors   =   (  )
diff --git a/tests/de/step_3/B9 b/tests/de/step_3/B9
index cf1a8668d0..a34aa5f5b2 100644
--- a/tests/de/step_3/B9
+++ b/tests/de/step_3/B9
@@ -1,17 +1,16 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
+puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :" 
 
 set LinuxDiff 2
 set filename wgehaeuse_surface.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 167  ( 910 )  Summary  = 167  ( 910 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 178  ( 910 )  Summary  = 178  ( 910 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 2823  ( 0 )  Face     = 2823  ( 2823 )   Summary  = 35044  ( 32219 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 3347  ( 0 )  Face     = 3347  ( 3347 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 13235  ( 13233 )
-TOLERANCE   : MaxTol   =  0.07507769847  (  0.07507769847 )  AvgTol   =  9.972036078e-005  (  0.0001063011758 )
+TOLERANCE   : MaxTol   =  0.07507769847  (  0.07507769847 )  AvgTol   =  9.527949107e-005  (  0.0001063064689 )
 LABELS      : N0Labels = 37  ( 37 )  N1Labels = 76  ( 76 )  N2Labels = 0  ( 0 )   TotalLabels = 113  ( 113 )   NameLabels = 113  ( 113 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/C1 b/tests/de/step_3/C1
index 1c19f32598..0d1da9157b 100644
--- a/tests/de/step_3/C1
+++ b/tests/de/step_3/C1
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj4_pm2-in-214.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 158  ( 150 )  Summary  = 158  ( 150 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 159  ( 150 )  Summary  = 159  ( 150 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 17  ( 17 )  Shell    = 17  ( 17 )  Face     = 1556  ( 1556 )   Summary  = 10319  ( 10319 )
 STATSHAPE   : Solid    = 35  ( 35 )  Shell    = 35  ( 35 )  Face     = 1828  ( 1828 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 4290  ( 4290 )
-TOLERANCE   : MaxTol   =   0.1193605745  (   0.1225157466 )  AvgTol   =  0.001496716052  (  0.001550453363 )
+TOLERANCE   : MaxTol   =   0.1193605745  (   0.1225157466 )  AvgTol   =  0.001496751903  (  0.001550489215 )
 LABELS      : N0Labels = 22  ( 22 )  N1Labels = 39  ( 39 )  N2Labels = 0  ( 0 )   TotalLabels = 61  ( 61 )   NameLabels = 61  ( 61 )   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 e290841c3d..b7ba7d6d1e 100644
--- a/tests/de/step_3/C3
+++ b/tests/de/step_3/C3
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename tr10_r0501_db.stp
 
 set ref_data {
@@ -11,7 +7,7 @@ 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.01863822469  (  0.02412563428 )  AvgTol   =  2.361805361e-005  (  0.0001288540588 )
+TOLERANCE   : MaxTol   =  0.01863822562  (  0.02412563428 )  AvgTol   =  2.361810476e-005  (  0.0001288540574 )
 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/C5 b/tests/de/step_3/C5
index 3c43f1f69a..cce58ddd7a 100644
--- a/tests/de/step_3/C5
+++ b/tests/de/step_3/C5
@@ -1,7 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 
 set filename trj3_pm1-ct-203.stp
diff --git a/tests/de/step_3/C7 b/tests/de/step_3/C7
index ca48215652..817263c8c5 100644
--- a/tests/de/step_3/C7
+++ b/tests/de/step_3/C7
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm1_db_exhaust.stp
 
 set ref_data {
diff --git a/tests/de/step_3/C8 b/tests/de/step_3/C8
index a617c9c084..e456c1803c 100644
--- a/tests/de/step_3/C8
+++ b/tests/de/step_3/C8
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename vorstufe_surface.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 125  ( 461 )  Summary  = 125  ( 461 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 124  ( 461 )  Summary  = 124  ( 461 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 810  ( 0 )  Face     = 810  ( 810 )   Summary  = 10386  ( 9576 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 964  ( 0 )  Face     = 964  ( 964 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3971  ( 3971 )
-TOLERANCE   : MaxTol   = 0.002209187729  ( 0.002209187729 )  AvgTol   =  6.075889762e-005  (  6.038723298e-005 )
+TOLERANCE   : MaxTol   = 0.002209187729  ( 0.002209187729 )  AvgTol   =  6.07301957e-005  (  6.038939277e-005 )
 LABELS      : N0Labels = 9  ( 9 )  N1Labels = 22  ( 22 )  N2Labels = 0  ( 0 )   TotalLabels = 31  ( 31 )   NameLabels = 31  ( 31 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/D1 b/tests/de/step_3/D1
index af59438de0..25c8d45dba 100644
--- a/tests/de/step_3/D1
+++ b/tests/de/step_3/D1
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -12,7 +11,7 @@ TPSTAT      : Faulties = 15  ( 0 )  Warnings = 73  ( 24 )  Summary  = 88  ( 24 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 91  ( 106 )  Face     = 91  ( 106 )   Summary  = 1381  ( 1665 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 91  ( 106 )  Face     = 91  ( 106 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 551  ( 670 )
-TOLERANCE   : MaxTol   =  0.02881427566  (  0.03703290736 )  AvgTol   =  0.002754968668  (  0.003655741726 )
+TOLERANCE   : MaxTol   =  0.02881427566  (  0.03703290736 )  AvgTol   =  0.002754968673  (  0.003655741745 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 182  ( 212 )  N2Labels = 0  ( 0 )   TotalLabels = 183  ( 213 )   NameLabels = 1  ( 1 )   ColorLabels = 91  ( 106 )   LayerLabels = 91  ( 106 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_3/D2 b/tests/de/step_3/D2
index 03bd84b18b..193bcf3887 100644
--- a/tests/de/step_3/D2
+++ b/tests/de/step_3/D2
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm2_ct_t4-A.stp
 
 set ref_data {
@@ -11,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 9  ( 7 )  Summary  = 9  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 17  ( 15 )  Face     = 17  ( 17 )   Summary  = 214  ( 207 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 17  ( 15 )  Face     = 17  ( 17 )   FreeWire = 0  ( 0 )   FreeEdge  = 5 ( 5 )   SharedEdge = 74  ( 74 )
-TOLERANCE   : MaxTol   = 0.0005650418556  ( 0.0005650418556 )  AvgTol   =  2.41320432e-005  (  2.413204307e-005 )
+TOLERANCE   : MaxTol   = 0.0005650418556  ( 0.0005650418556 )  AvgTol   =  2.41320432e-005  (  2.413204402e-005 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/D4 b/tests/de/step_3/D4
index dfa3465d3b..d12e31b4ed 100644
--- a/tests/de/step_3/D4
+++ b/tests/de/step_3/D4
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm2_db_t4-A.stp
 
 set ref_data {
diff --git a/tests/de/step_3/D5 b/tests/de/step_3/D5
index f78d651f0e..2674a2c3e1 100644
--- a/tests/de/step_3/D5
+++ b/tests/de/step_3/D5
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm2_db_t4-B.stp
 
 set ref_data {
diff --git a/tests/de/step_3/D6 b/tests/de/step_3/D6
index b60ec3a4e0..8f9b9ecfa8 100644
--- a/tests/de/step_3/D6
+++ b/tests/de/step_3/D6
@@ -1,8 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename bm2_db_t4-C.stp
 
 set ref_data {
diff --git a/tests/de/step_3/D9 b/tests/de/step_3/D9
index 7d3df41834..9a6aa127a6 100644
--- a/tests/de/step_3/D9
+++ b/tests/de/step_3/D9
@@ -1,9 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
 
 set LinuxDiff 3
 set filename 53921163S0.stp
@@ -11,7 +10,7 @@ set filename 53921163S0.stp
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
 TPSTAT      : Faulties = 0  ( 0 )  Warnings = 51  ( 35 )  Summary  = 51  ( 35 )
-CHECKSHAPE  : Wires    = 0  ( 14 )  Faces    = 9  ( 15 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+CHECKSHAPE  : Wires    = 0  ( 14 )  Faces    = 9  ( 14 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 568  ( 566 )   Summary  = 3706  ( 3711 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 568  ( 566 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1543  ( 1546 )
 TOLERANCE   : MaxTol   =    61.30318124  (    60.87483475 )  AvgTol   =     1.474406352  (     1.657562353 )
diff --git a/tests/de/step_3/E1 b/tests/de/step_3/E1
index bf4df3cf58..177a9e10cf 100644
--- a/tests/de/step_3/E1
+++ b/tests/de/step_3/E1
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -8,11 +6,11 @@ set filename PRO10364.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 44  ( 1 )  Summary  = 44  ( 1 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 35  ( 4 )  Summary  = 35  ( 4 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 13  ( 13 )  Shell    = 300  ( 298 )  Face     = 482  ( 482 )   Summary  = 5637  ( 5527 )
 STATSHAPE   : Solid    = 13  ( 13 )  Shell    = 300  ( 298 )  Face     = 482  ( 482 )   FreeWire = 0  ( 0 )   FreeEdge  = 107 ( 107 )   SharedEdge = 2116  ( 2116 )
-TOLERANCE   : MaxTol   =  0.02930428273  (  0.02930428273 )  AvgTol   =  7.660141425e-005  (  7.484449088e-005 )
+TOLERANCE   : MaxTol   =  0.02930428273  (  0.02930428273 )  AvgTol   =  7.484449085e-005  (  7.484586154e-005 )
 LABELS      : N0Labels = 7  ( 7 )  N1Labels = 504  ( 515 )  N2Labels = 0  ( 0 )   TotalLabels = 511  ( 522 )   NameLabels = 12  ( 12 )   ColorLabels = 498  ( 498 )   LayerLabels = 407  ( 418 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_3/E2 b/tests/de/step_3/E2
index 2f89a2afc8..a059178b66 100644
--- a/tests/de/step_3/E2
+++ b/tests/de/step_3/E2
@@ -1,8 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: TOLERANCE : Faulty"
+puts "TODO CR23096 Mandriva2010: TOLERANCE : Faulty " 
+
+puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
 
 set LinuxDiff 3
 set LinuxFaulties {TOLERANCE}
@@ -14,7 +13,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 24  ( 0 )  Summary  = 24  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   Summary  = 640  ( 631 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 289  ( 282 )
-TOLERANCE   : MaxTol   = 0.0003171897371  ( 0.0003171897371 )  AvgTol   =  3.783050085e-005  (  3.82262146e-005 )
+TOLERANCE   : MaxTol   = 0.0003171897371  ( 0.0003171897371 )  AvgTol   =  3.783974823e-005  (  3.823557508e-005 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 7  ( 7 )  N2Labels = 0  ( 0 )   TotalLabels = 10  ( 10 )   NameLabels = 5  ( 5 )   ColorLabels = 3  ( 3 )   LayerLabels = 5  ( 5 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_3/E3 b/tests/de/step_3/E3
index 17ee2e9d69..b5df978001 100644
--- a/tests/de/step_3/E3
+++ b/tests/de/step_3/E3
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
diff --git a/tests/de/step_3/E4 b/tests/de/step_3/E4
index 064cb96a06..012795e6f1 100644
--- a/tests/de/step_3/E4
+++ b/tests/de/step_3/E4
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-
-
 set filename gehaeuse_surface.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 218  ( 1131 )  Summary  = 218  ( 1131 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 217  ( 1131 )  Summary  = 217  ( 1131 )
 CHECKSHAPE  : Wires    = 8  ( 8 )  Faces    = 8  ( 8 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 3067  ( 0 )  Face     = 3070  ( 3067 )   Summary  = 38193  ( 35102 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 3550  ( 0 )  Face     = 3553  ( 3550 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 14468  ( 14457 )
-TOLERANCE   : MaxTol   =  0.08182775785  (  0.08182775785 )  AvgTol   =  9.392984542e-005  (  8.050559104e-005 )
+TOLERANCE   : MaxTol   =  0.08182775785  (  0.08182775785 )  AvgTol   =  9.392810102e-005  (  8.050590999e-005 )
 LABELS      : N0Labels = 17  ( 17 )  N1Labels = 46  ( 46 )  N2Labels = 0  ( 0 )   TotalLabels = 63  ( 63 )   NameLabels = 63  ( 63 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/E5 b/tests/de/step_3/E5
index bae0c9bd1f..37b1978de3 100644
--- a/tests/de/step_3/E5
+++ b/tests/de/step_3/E5
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -7,12 +6,12 @@ set filename trj9_ap209-mp.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 26  ( 7 )  Summary  = 26  ( 7 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 39  ( 7 )  Summary  = 39  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 8  ( 4 )  Shell    = 8  ( 4 )  Face     = 48  ( 24 )   Summary  = 277  ( 141 )
-STATSHAPE   : Solid    = 24  ( 24 )  Shell    = 24  ( 24 )  Face     = 144  ( 144 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 96  ( 48 )
+NBSHAPES    : Solid    = 12  ( 4 )  Shell    = 12  ( 4 )  Face     = 72  ( 24 )   Summary  = 414  ( 142 )
+STATSHAPE   : Solid    = 28  ( 28 )  Shell    = 28  ( 28 )  Face     = 168  ( 168 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 144  ( 48 )
 TOLERANCE   : MaxTol   = 0.0009551590893  ( 0.0009551590893 )  AvgTol   =  0.0002351494334  (  0.0002351494334 )
-LABELS      : N0Labels = 4  ( 4 )  N1Labels = 6  ( 6 )  N2Labels = 0  ( 0 )   TotalLabels = 10  ( 10 )   NameLabels = 10  ( 9 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
+LABELS      : N0Labels = 5  ( 5 )  N1Labels = 6  ( 6 )  N2Labels = 0  ( 0 )   TotalLabels = 11  ( 11 )   NameLabels = 11  ( 10 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
 COLORS      : Colors   =   (  )
diff --git a/tests/de/step_3/E6 b/tests/de/step_3/E6
index 07efe2e145..17e6cf2a59 100644
--- a/tests/de/step_3/E6
+++ b/tests/de/step_3/E6
@@ -1,8 +1,9 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO ?CR23096 ALL: TOLERANCE : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
+
+
+puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
 
 set LinuxDiff 3
 set filename Z8M6SAT.stp
diff --git a/tests/de/step_3/E7 b/tests/de/step_3/E7
index 226c4ef43d..8891623422 100644
--- a/tests/de/step_3/E7
+++ b/tests/de/step_3/E7
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -8,11 +6,11 @@ set filename r0301_db.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1186  ( 892 )  Summary  = 1186  ( 892 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1184  ( 892 )  Summary  = 1184  ( 892 )
 CHECKSHAPE  : Wires    = 2  ( 2 )  Faces    = 2  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 94  ( 94 )  Shell    = 288  ( 270 )  Face     = 3469  ( 3469 )   Summary  = 30724  ( 27788 )
 STATSHAPE   : Solid    = 94  ( 94 )  Shell    = 288  ( 270 )  Face     = 3469  ( 3469 )   FreeWire = 0  ( 102 )   FreeEdge  = 2219 ( 2219 )   SharedEdge = 11315  ( 11109 )
-TOLERANCE   : MaxTol   =   0.6657106829  (   0.6657106829 )  AvgTol   =  0.001183470686  (  0.004721299906 )
+TOLERANCE   : MaxTol   =   0.6657106829  (   0.6657106829 )  AvgTol   =  0.001182759672  (  0.004767130404 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 1838  ( 1839 )  N2Labels = 0  ( 0 )   TotalLabels = 1839  ( 1840 )   NameLabels = 1  ( 1 )   ColorLabels = 164  ( 164 )   LayerLabels = 1761  ( 1762 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 9  ( 9 )
diff --git a/tests/de/step_3/E8 b/tests/de/step_3/E8
index 68fe4b69d3..0d58b1635c 100644
--- a/tests/de/step_3/E8
+++ b/tests/de/step_3/E8
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -12,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1204  ( 923 )  Summary  = 1204  (
 CHECKSHAPE  : Wires    = 2  ( 3 )  Faces    = 2  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 95  ( 95 )  Shell    = 289  ( 271 )  Face     = 3569  ( 3569 )   Summary  = 31396  ( 28458 )
 STATSHAPE   : Solid    = 95  ( 95 )  Shell    = 289  ( 271 )  Face     = 3569  ( 3569 )   FreeWire = 0  ( 102 )   FreeEdge  = 2219 ( 2219 )   SharedEdge = 11602  ( 11394 )
-TOLERANCE   : MaxTol   =   0.6657106806  (   0.6657106806 )  AvgTol   =  0.000903894111  (  0.003000826275 )
+TOLERANCE   : MaxTol   =   0.6657106806  (   0.6657106806 )  AvgTol   =  0.0009035429877  (   0.00304535831 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 1839  ( 1840 )  N2Labels = 0  ( 0 )   TotalLabels = 1840  ( 1841 )   NameLabels = 1  ( 1 )   ColorLabels = 165  ( 165 )   LayerLabels = 1762  ( 1763 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 9  ( 9 )
diff --git a/tests/de/step_3/E9 b/tests/de/step_3/E9
index a2a22d1454..1acbeab1e4 100644
--- a/tests/de/step_3/E9
+++ b/tests/de/step_3/E9
@@ -1,8 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: TOLERANCE : Faulty"
+puts "TODO CR23096 Mandriva2010: TOLERANCE : Faulty " 
+
+puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :" 
 
 set LinuxDiff 3
 set LinuxFaulties {TOLERANCE}
@@ -14,7 +13,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 24  ( 0 )  Summary  = 24  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   Summary  = 640  ( 631 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 5  ( 3 )  Face     = 43  ( 43 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 289  ( 282 )
-TOLERANCE   : MaxTol   = 0.0003171897371  ( 0.0003171897371 )  AvgTol   =  3.783050085e-005  (  3.82262146e-005 )
+TOLERANCE   : MaxTol   = 0.0003171897371  ( 0.0003171897371 )  AvgTol   =  3.783974823e-005  (  3.823557508e-005 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/F1 b/tests/de/step_3/F1
index 9a953c0511..e724216262 100644
--- a/tests/de/step_3/F1
+++ b/tests/de/step_3/F1
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
@@ -13,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 125  ( 22 )  Summary  = 125  ( 22
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 4252  ( 61 )  Face     = 4252  ( 4252 )   Summary  = 58212  ( 51172 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 4252  ( 61 )  Face     = 4252  ( 4252 )   FreeWire = 0  ( 1 )   FreeEdge  = 2854 ( 2854 )   SharedEdge = 20022  ( 20024 )
-TOLERANCE   : MaxTol   =   0.8498047902  (  0.01572488678 )  AvgTol   =  5.272855489e-005  (  2.121024106e-005 )
+TOLERANCE   : MaxTol   =   0.8498047902  (  0.01572488678 )  AvgTol   =  5.272836076e-005  (  2.121746816e-005 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 7107  ( 7169 )  N2Labels = 0  ( 0 )   TotalLabels = 7110  ( 7172 )   NameLabels = 5  ( 5 )   ColorLabels = 7105  ( 7105 )   LayerLabels = 7105  ( 7167 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_3/F2 b/tests/de/step_3/F2
index 4a66cc8215..65bf9a03cb 100644
--- a/tests/de/step_3/F2
+++ b/tests/de/step_3/F2
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
diff --git a/tests/de/step_3/F3 b/tests/de/step_3/F3
index 928dffd5cc..ba0e3c2005 100644
--- a/tests/de/step_3/F3
+++ b/tests/de/step_3/F3
@@ -1,11 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO ?CR23096 ALL: Error : 2 differences with reference data found :"
 
-
 set LinuxDiff 2
 set filename trj12_b3-sy-214.stp
 
diff --git a/tests/de/step_3/F4 b/tests/de/step_3/F4
index 86d7983cd0..0661e170e8 100644
--- a/tests/de/step_3/F4
+++ b/tests/de/step_3/F4
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
@@ -8,11 +6,11 @@ set filename trj3_pm1-id-214.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1164  ( 890 )  Summary  = 1164  ( 890 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 1163  ( 888 )  Summary  = 1163  ( 888 )
 CHECKSHAPE  : Wires    = 0  ( 1 )  Faces    = 0  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 3831  ( 3826 )   Summary  = 23899  ( 23857 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 3831  ( 3826 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 9990  ( 9965 )
-TOLERANCE   : MaxTol   =  0.02038455644  (  0.00902340394 )  AvgTol   =  0.0003241895913  (  0.000301059797 )
+TOLERANCE   : MaxTol   =  0.02038455644  (  0.00902340394 )  AvgTol   =  0.0003241395776  (  0.0003010640956 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 3047  ( 3047 )  N2Labels = 0  ( 0 )   TotalLabels = 3048  ( 3048 )   NameLabels = 1  ( 1 )   ColorLabels = 3048  ( 3048 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_4/A1 b/tests/de/step_4/A1
index c0535a8af0..d55037c9bb 100644
--- a/tests/de/step_4/A1
+++ b/tests/de/step_4/A1
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
 
@@ -8,11 +6,11 @@ set filename trj4_pm2-id-203.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 53  ( 42 )  Summary  = 53  ( 42 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 52  ( 36 )  Summary  = 52  ( 36 )
 CHECKSHAPE  : Wires    = 0  ( 2 )  Faces    = 0  ( 2 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 8  ( 8 )  Shell    = 230  ( 230 )  Face     = 734  ( 730 )   Summary  = 5894  ( 5886 )
 STATSHAPE   : Solid    = 8  ( 8 )  Shell    = 230  ( 230 )  Face     = 734  ( 730 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2325  ( 2325 )
-TOLERANCE   : MaxTol   = 0.007776555629  ( 0.007776555631 )  AvgTol   =  0.0001609881831  (  0.0001612196595 )
+TOLERANCE   : MaxTol   = 0.007776555629  ( 0.007776555631 )  AvgTol   =  0.0001604710199  (  0.0001606666484 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 3 )  N2Labels = 0  ( 1 )   TotalLabels = 5  ( 7 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/A4 b/tests/de/step_4/A4
index 00d9bf3c7b..db11678d36 100644
--- a/tests/de/step_4/A4
+++ b/tests/de/step_4/A4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename BUC50070.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 71  ( 65 )  Summary  = 71  ( 65 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 445  ( 445 )  Face     = 445  ( 445 )   Summary  = 5378  ( 3758 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 445  ( 445 )  Face     = 445  ( 445 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2023  ( 1600 )
-TOLERANCE   : MaxTol   =  0.08129076078  (   0.1779929979 )  AvgTol   =  0.002444008871  (   0.01499344315 )
+TOLERANCE   : MaxTol   =  0.08129076078  (   0.1779929979 )  AvgTol   =  0.002443078494  (   0.01498804757 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 893  ( 893 )  N2Labels = 0  ( 0 )   TotalLabels = 894  ( 894 )   NameLabels = 1  ( 1 )   ColorLabels = 448  ( 448 )   LayerLabels = 448  ( 448 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/step_4/A8 b/tests/de/step_4/A8
index 2416b7227c..b38afa5cb2 100644
--- a/tests/de/step_4/A8
+++ b/tests/de/step_4/A8
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
@@ -7,11 +6,11 @@ set filename CTS21866.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 126  ( 68 )  Summary  = 126  ( 68 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 121  ( 62 )  Summary  = 121  ( 62 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 4  ( 4 )  Shell    = 4  ( 4 )  Face     = 1393  ( 1393 )   Summary  = 9157  ( 9157 )
 STATSHAPE   : Solid    = 6  ( 6 )  Shell    = 6  ( 6 )  Face     = 1459  ( 1459 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3853  ( 3853 )
-TOLERANCE   : MaxTol   =   0.1532053661  (   0.1473148116 )  AvgTol   =  0.0009144149806  (  0.0009108474231 )
+TOLERANCE   : MaxTol   =   0.1532053661  (   0.1473148116 )  AvgTol   =  0.0009141092787  (  0.0009106079896 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 1261  ( 1261 )  N2Labels = 0  ( 0 )   TotalLabels = 1266  ( 1266 )   NameLabels = 11  ( 11 )   ColorLabels = 0  ( 0 )   LayerLabels = 1255  ( 1255 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/B1 b/tests/de/step_4/B1
index a089c2d6ce..cbea7b5f96 100644
--- a/tests/de/step_4/B1
+++ b/tests/de/step_4/B1
@@ -1,17 +1,14 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename PRO10373.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 27  ( 26 )  Summary  = 27  ( 26 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 27  ( 30 )  Summary  = 27  ( 30 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 9  ( 9 )  Face     = 61  ( 61 )   Summary  = 377  ( 377 )
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 9  ( 9 )  Face     = 61  ( 61 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 143  ( 143 )
-TOLERANCE   : MaxTol   =   0.5015928415  (     0.50770021 )  AvgTol   =   0.01708363244  (   0.01729370712 )
-LABELS      : N0Labels = 3  ( 3 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 5  ( 5 )   NameLabels = 5  ( 5 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
+NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 9  ( 9 )  Face     = 61  ( 61 )   Summary  = 533  ( 489 )
+STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 9  ( 9 )  Face     = 61  ( 61 )   FreeWire = 0  ( 5 )   FreeEdge  = 48 ( 48 )   SharedEdge = 191  ( 191 )
+TOLERANCE   : MaxTol   =   0.5015928415  (     0.50770021 )  AvgTol   =    0.0145237691  (   0.01470236753 )
+LABELS      : N0Labels = 4  ( 4 )  N1Labels = 2  ( 2 )  N2Labels = 0  ( 0 )   TotalLabels = 6  ( 6 )   NameLabels = 6  ( 6 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
 COLORS      : Colors   =   (  )
diff --git a/tests/de/step_4/B3 b/tests/de/step_4/B3
index 307cc38d00..21a7da778b 100644
--- a/tests/de/step_4/B3
+++ b/tests/de/step_4/B3
@@ -1,8 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: TOLERANCE : Faulty"
+puts "TODO CR23096 Mandriva2010: TOLERANCE : Faulty " 
+
+puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :" 
 
 set LinuxDiff 1
 set LinuxFaulties {TOLERANCE}
@@ -14,7 +13,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 77  ( 66 )  Summary  = 77  ( 66 )
 CHECKSHAPE  : Wires    = 1  ( 1 )  Faces    = 1  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 101  ( 101 )  Face     = 101  ( 101 )   Summary  = 6262  ( 6266 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 101  ( 101 )  Face     = 101  ( 101 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2988  ( 2992 )
-TOLERANCE   : MaxTol   =   0.6253365786  (   0.6253365789 )  AvgTol   =  0.0008262371751  (  0.0009142872365 )
+TOLERANCE   : MaxTol   =   0.1351488154  (   0.1351488154 )  AvgTol   =  0.0004822364796  (  0.0005707546974 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/B5 b/tests/de/step_4/B5
index e9fe361374..7b0da054ac 100644
--- a/tests/de/step_4/B5
+++ b/tests/de/step_4/B5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename PRO9235.stp
 
 set ref_data {
diff --git a/tests/de/step_4/B6 b/tests/de/step_4/B6
index d99ce34080..e297481ef8 100644
--- a/tests/de/step_4/B6
+++ b/tests/de/step_4/B6
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename UKI60569-1.stp
 
 set ref_data {
diff --git a/tests/de/step_4/C7 b/tests/de/step_4/C7
index 06cb82c89f..3cfb99c07c 100644
--- a/tests/de/step_4/C7
+++ b/tests/de/step_4/C7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_sd_punch_d.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 10  ( 0 )  Summary  = 10  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 204  ( 204 )   Summary  = 1367  ( 1367 )
 STATSHAPE   : Solid    = 3  ( 3 )  Shell    = 4  ( 4 )  Face     = 204  ( 204 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 554  ( 554 )
-TOLERANCE   : MaxTol   = 6.188728228e-007  ( 7.498981519e-007 )  AvgTol   =  1.436987101e-007  (  1.554329149e-007 )
+TOLERANCE   : MaxTol   = 6.188728122e-007  ( 7.498981519e-007 )  AvgTol   =  1.438491211e-007  (  1.554329149e-007 )
 LABELS      : N0Labels = 5  ( 5 )  N1Labels = 41  ( 41 )  N2Labels = 0  ( 0 )   TotalLabels = 46  ( 46 )   NameLabels = 9  ( 9 )   ColorLabels = 41  ( 41 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/step_4/C8 b/tests/de/step_4/C8
index 50cd400978..2c3b83c53b 100644
--- a/tests/de/step_4/C8
+++ b/tests/de/step_4/C8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename bm4_tc_seal.stp
 
 set ref_data {
diff --git a/tests/de/step_4/D5 b/tests/de/step_4/D5
index acfc1d10e7..2ef60cfbef 100644
--- a/tests/de/step_4/D5
+++ b/tests/de/step_4/D5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename r0901_ec.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 15  ( 7 )  Summary  = 15  ( 7 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 438  ( 438 )   Summary  = 2798  ( 2798 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 438  ( 438 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1136  ( 1136 )
-TOLERANCE   : MaxTol   = 0.0001456659717  ( 0.0001456659717 )  AvgTol   =  8.861431127e-007  (  9.179734625e-007 )
+TOLERANCE   : MaxTol   = 0.0001456659717  ( 0.0001456659717 )  AvgTol   =  8.861431129e-007  (  9.179734625e-007 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/D7 b/tests/de/step_4/D7
index a4f3427c6b..0475140218 100644
--- a/tests/de/step_4/D7
+++ b/tests/de/step_4/D7
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename r65b-pe.stp
 
 set ref_data {
diff --git a/tests/de/step_4/D8 b/tests/de/step_4/D8
index b20854fc2f..ce83469312 100644
--- a/tests/de/step_4/D8
+++ b/tests/de/step_4/D8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename r_39-db.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 230  ( 126 )  Summary  = 230  ( 12
 CHECKSHAPE  : Wires    = 3  ( 3 )  Faces    = 3  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 12  ( 12 )  Shell    = 297  ( 297 )  Face     = 449  ( 449 )   Summary  = 4991  ( 3865 )
 STATSHAPE   : Solid    = 12  ( 12 )  Shell    = 297  ( 297 )  Face     = 449  ( 449 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1935  ( 1842 )
-TOLERANCE   : MaxTol   =  0.09813029449  (   0.1674907116 )  AvgTol   =  0.002798943425  (   0.01426972934 )
+TOLERANCE   : MaxTol   =  0.09813029449  (   0.1674907116 )  AvgTol   =   0.00279894343  (   0.01426972934 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 582  ( 582 )  N2Labels = 0  ( 0 )   TotalLabels = 583  ( 583 )   NameLabels = 1  ( 1 )   ColorLabels = 289  ( 289 )   LayerLabels = 297  ( 297 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/step_4/D9 b/tests/de/step_4/D9
index dbea29b18f..b1b149edb2 100644
--- a/tests/de/step_4/D9
+++ b/tests/de/step_4/D9
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename test-m020306-v1.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 309  ( 114 )  Summary  = 309  ( 114 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 306  ( 112 )  Summary  = 306  ( 112 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 742  ( 742 )   Summary  = 5060  ( 5060 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 742  ( 742 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2108  ( 2108 )
-TOLERANCE   : MaxTol   = 0.008481946718  ( 0.008481946718 )  AvgTol   =  0.0001352333894  (  0.0001311532438 )
+TOLERANCE   : MaxTol   = 0.008481946718  ( 0.008481946718 )  AvgTol   =  0.0001352333894  (  0.0001311526262 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/E1 b/tests/de/step_4/E1
index 0ac0dda42d..991f3550c2 100644
--- a/tests/de/step_4/E1
+++ b/tests/de/step_4/E1
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename test-m020306-v2.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 318  ( 157 )  Summary  = 318  ( 157 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 315  ( 155 )  Summary  = 315  ( 155 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 956  ( 956 )   Summary  = 6474  ( 6474 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 956  ( 956 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2681  ( 2681 )
-TOLERANCE   : MaxTol   = 0.008481946718  ( 0.008481946718 )  AvgTol   =  0.0001073524229  (  0.0001044200574 )
+TOLERANCE   : MaxTol   = 0.008481946718  ( 0.008481946718 )  AvgTol   =  0.0001073524229  (  0.0001044179443 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/E4 b/tests/de/step_4/E4
index ac8c3e1712..8ec8ca1461 100644
--- a/tests/de/step_4/E4
+++ b/tests/de/step_4/E4
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename tr9_r1001-ec.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 133  ( 5 )  Summary  = 133  ( 5 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 121  ( 5 )  Summary  = 121  ( 5 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 918  ( 918 )   Summary  = 6350  ( 6350 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 918  ( 918 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2660  ( 2660 )
-TOLERANCE   : MaxTol   = 0.002778645525  ( 0.005865678105 )  AvgTol   =  0.000107738527  (  0.0001402835312 )
+TOLERANCE   : MaxTol   = 0.002778645525  ( 0.005865678105 )  AvgTol   =  0.0001058947625  (  0.0001402835312 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/E5 b/tests/de/step_4/E5
index 8d74d5dbfb..e1668d8735 100644
--- a/tests/de/step_4/E5
+++ b/tests/de/step_4/E5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj10_b2-os-214.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 25  ( 6 )  Summary  = 25  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 16  ( 16 )  Shell    = 16  ( 16 )  Face     = 950  ( 950 )   Summary  = 6131  ( 6131 )
 STATSHAPE   : Solid    = 31  ( 31 )  Shell    = 31  ( 31 )  Face     = 1105  ( 1105 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 2501  ( 2501 )
-TOLERANCE   : MaxTol   = 7.535366324e-007  ( 7.53535827e-007 )  AvgTol   =  1.408558019e-007  (  1.408560905e-007 )
+TOLERANCE   : MaxTol   = 7.535366351e-007  ( 7.53535827e-007 )  AvgTol   =  1.408558019e-007  (  1.408560905e-007 )
 LABELS      : N0Labels = 19  ( 19 )  N1Labels = 33  ( 33 )  N2Labels = 0  ( 0 )   TotalLabels = 52  ( 52 )   NameLabels = 52  ( 52 )   ColorLabels = 16  ( 16 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_4/E6 b/tests/de/step_4/E6
index 5a1d74c661..ef86a0dd71 100644
--- a/tests/de/step_4/E6
+++ b/tests/de/step_4/E6
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename trj12_b3-ac-214.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 27  ( 104 )  Summary  = 27  ( 104 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 27  ( 102 )  Summary  = 27  ( 102 )
 CHECKSHAPE  : Wires    = 3  ( 4 )  Faces    = 3  ( 4 )  Shells   = 1  ( 1 )   Solids   = 1 ( 1 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1173  ( 1173 )   Summary  = 7998  ( 8005 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1173  ( 1173 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 3392  ( 3399 )
-TOLERANCE   : MaxTol   =    7.063782203  (    7.063782203 )  AvgTol   =  0.002934134168  (  0.002941793404 )
+TOLERANCE   : MaxTol   =    7.063782203  (    7.063782203 )  AvgTol   =  0.002934143213  (  0.002941368783 )
 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_4/E8 b/tests/de/step_4/E8
index 551d4cf7ba..4c757340f6 100644
--- a/tests/de/step_4/E8
+++ b/tests/de/step_4/E8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj3_pm1-pe-203.stp
 
 set ref_data {
diff --git a/tests/de/step_4/F2 b/tests/de/step_4/F2
index 7c78818668..1fa2b8c147 100644
--- a/tests/de/step_4/F2
+++ b/tests/de/step_4/F2
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj5_pm3-db-214.stp
 
 set ref_data {
diff --git a/tests/de/step_4/F3 b/tests/de/step_4/F3
index 13c29760f6..a1a810b783 100644
--- a/tests/de/step_4/F3
+++ b/tests/de/step_4/F3
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj5_pm3-pe-214.stp
 
 set ref_data {
diff --git a/tests/de/step_4/F5 b/tests/de/step_4/F5
index 8f264e6674..4e872dd052 100644
--- a/tests/de/step_4/F5
+++ b/tests/de/step_4/F5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj6_b1-sd-214.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 0 )  Summary  = 8  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 343  ( 343 )   Summary  = 2042  ( 2042 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 343  ( 343 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 865  ( 865 )
-TOLERANCE   : MaxTol   = 7.625392261e-007  ( 7.625403546e-007 )  AvgTol   =  2.087070626e-007  (  2.087070073e-007 )
+TOLERANCE   : MaxTol   = 7.625392261e-007  ( 7.625403546e-007 )  AvgTol   =  2.087070625e-007  (  2.087070074e-007 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 1  ( 1 )  N2Labels = 0  ( 0 )   TotalLabels = 3  ( 3 )   NameLabels = 3  ( 3 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/F8 b/tests/de/step_4/F8
index bd0b372d1d..86da9fe1fb 100644
--- a/tests/de/step_4/F8
+++ b/tests/de/step_4/F8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj7_b1-sd-214.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 8  ( 0 )  Summary  = 8  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 343  ( 343 )   Summary  = 2042  ( 2042 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 343  ( 343 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 865  ( 865 )
-TOLERANCE   : MaxTol   = 7.625392261e-007  ( 7.625403546e-007 )  AvgTol   =  2.087070626e-007  (  2.087070073e-007 )
+TOLERANCE   : MaxTol   = 7.625392261e-007  ( 7.625403546e-007 )  AvgTol   =  2.087070625e-007  (  2.087070074e-007 )
 LABELS      : N0Labels = 2  ( 2 )  N1Labels = 1  ( 1 )  N2Labels = 0  ( 0 )   TotalLabels = 3  ( 3 )   NameLabels = 3  ( 3 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/G5 b/tests/de/step_4/G5
index 1ff8650b54..9155a98b7a 100644
--- a/tests/de/step_4/G5
+++ b/tests/de/step_4/G5
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename vorstufe_solid.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 59  ( 27 )  Summary  = 59  ( 27 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 59  ( 29 )  Summary  = 59  ( 29 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 7  ( 7 )  Shell    = 7  ( 7 )  Face     = 780  ( 780 )   Summary  = 4769  ( 4769 )
 STATSHAPE   : Solid    = 21  ( 21 )  Shell    = 21  ( 21 )  Face     = 920  ( 920 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1970  ( 1970 )
-TOLERANCE   : MaxTol   = 0.002209209821  ( 0.002209209821 )  AvgTol   =  0.0001089165372  (  0.0001089336061 )
+TOLERANCE   : MaxTol   = 0.002209209821  ( 0.002209209821 )  AvgTol   =  0.0001089179871  (  0.0001089351374 )
 LABELS      : N0Labels = 9  ( 9 )  N1Labels = 22  ( 22 )  N2Labels = 0  ( 0 )   TotalLabels = 31  ( 31 )   NameLabels = 31  ( 31 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_4/G7 b/tests/de/step_4/G7
index de3e4efa0e..19e888c630 100644
--- a/tests/de/step_4/G7
+++ b/tests/de/step_4/G7
@@ -1,6 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO ?CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO ?CR23096 ALL: Error : 2 differences with reference data found :"
 
diff --git a/tests/de/step_4/G8 b/tests/de/step_4/G8
index 7875df271b..5c4f5387b5 100644
--- a/tests/de/step_4/G8
+++ b/tests/de/step_4/G8
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_sd_seal_b.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 136  ( 2 )  Summary  = 136  ( 2 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 135  ( 1 )  Summary  = 135  ( 1 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 540  ( 540 )   Summary  = 2968  ( 2968 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 540  ( 540 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 1202  ( 1202 )
-TOLERANCE   : MaxTol   = 6.82509241e-006  ( 6.825090868e-006 )  AvgTol   =  8.355062781e-007  (  8.362830936e-007 )
+TOLERANCE   : MaxTol   = 6.82509241e-006  ( 6.825090868e-006 )  AvgTol   =  8.552888524e-007  (  8.591567457e-007 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 1  ( 1 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 1  ( 1 )
diff --git a/tests/de/step_4/G9 b/tests/de/step_4/G9
index 9cf666d962..88e872f28c 100644
--- a/tests/de/step_4/G9
+++ b/tests/de/step_4/G9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_sd_seal_d.stp
 
 set ref_data {
diff --git a/tests/de/step_4/H1 b/tests/de/step_4/H1
index e7aa3b5726..0ba98f61c0 100644
--- a/tests/de/step_4/H1
+++ b/tests/de/step_4/H1
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-
-
 set filename Inventor_Engine.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 448  ( 559 )  Summary  = 448  ( 55
 CHECKSHAPE  : Wires    = 3  ( 3 )  Faces    = 3  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 47  ( 47 )  Shell    = 47  ( 47 )  Face     = 4455  ( 4455 )   Summary  = 27797  ( 27799 )
 STATSHAPE   : Solid    = 80  ( 80 )  Shell    = 80  ( 80 )  Face     = 5359  ( 5359 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 11462  ( 11464 )
-TOLERANCE   : MaxTol   =      0.8136128  (      0.8136128 )  AvgTol   =  0.0007561423047  (  0.0007592265679 )
+TOLERANCE   : MaxTol   =      0.8136128  (      0.8136128 )  AvgTol   =  0.000756142621  (  0.0007592268842 )
 LABELS      : N0Labels = 52  ( 52 )  N1Labels = 86  ( 86 )  N2Labels = 0  ( 0 )   TotalLabels = 138  ( 138 )   NameLabels = 136  ( 136 )   ColorLabels = 47  ( 47 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 11  ( 11 )
diff --git a/tests/de/step_4/I3 b/tests/de/step_4/I3
index a5431c7d25..822cf677f9 100644
--- a/tests/de/step_4/I3
+++ b/tests/de/step_4/I3
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_db_seal_a.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 117  ( 37 )  Summary  = 117  ( 37
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 140  ( 140 )   Summary  = 704  ( 704 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 140  ( 140 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 280  ( 280 )
-TOLERANCE   : MaxTol   = 0.0004823436197  ( 0.0004827870033 )  AvgTol   =  0.0001520643335  (  0.0001573776642 )
+TOLERANCE   : MaxTol   = 0.0004823436197  ( 0.0004827870033 )  AvgTol   =  0.0001520353725  (  0.0001573776642 )
 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_5/A1 b/tests/de/step_5/A1
index 2fc429f4df..26232518c1 100644
--- a/tests/de/step_5/A1
+++ b/tests/de/step_5/A1
@@ -1,8 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO ?CR23096 ALL: TOLERANCE : Faulty" 
-puts "TODO CR23096 Mandriva2010: TEST INCOMPLETE"
+puts "TODO ?CR23096 ALL: TOLERANCE : Faulty" puts "TODO CR23096 Mandriva2010: TEST INCOMPLETE"
+
 
 set filename Z8INV5.stp
 
diff --git a/tests/de/step_5/A2 b/tests/de/step_5/A2
index cdcbf5693d..f46a0b15c0 100644
--- a/tests/de/step_5/A2
+++ b/tests/de/step_5/A2
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj9_pm7-id-214.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 324  ( 261 )  Summary  = 324  ( 261 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 318  ( 262 )  Summary  = 318  ( 262 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2278  ( 2278 )   Summary  = 14219  ( 14212 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 2278  ( 2278 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 5964  ( 5957 )
-TOLERANCE   : MaxTol   = 0.005454457466  ( 0.005454457467 )  AvgTol   =  0.0004111700107  (  0.0004106377588 )
+TOLERANCE   : MaxTol   = 0.005454457468  ( 0.005454457467 )  AvgTol   =  0.0004109444443  (  0.0004106301474 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 5448  ( 5448 )  N2Labels = 0  ( 0 )   TotalLabels = 5449  ( 5449 )   NameLabels = 1  ( 1 )   ColorLabels = 5449  ( 5449 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/step_5/A4 b/tests/de/step_5/A4
index 73801a3635..badd8163d2 100644
--- a/tests/de/step_5/A4
+++ b/tests/de/step_5/A4
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename wgehaeuse_solid.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 90  ( 70 )  Summary  = 90  ( 70 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 90  ( 74 )  Summary  = 90  ( 74 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 37  ( 37 )  Shell    = 58  ( 58 )  Face     = 2694  ( 2694 )   Summary  = 15919  ( 15919 )
 STATSHAPE   : Solid    = 81  ( 81 )  Shell    = 104  ( 104 )  Face     = 3190  ( 3190 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 6451  ( 6451 )
-TOLERANCE   : MaxTol   =   0.0796367648  (   0.0796367648 )  AvgTol   =  0.0001931760726  (  0.0002389619512 )
+TOLERANCE   : MaxTol   =  0.07893772536  (  0.07893770763 )  AvgTol   =  0.0001930297541  (  0.0002286556631 )
 LABELS      : N0Labels = 37  ( 37 )  N1Labels = 76  ( 76 )  N2Labels = 0  ( 0 )   TotalLabels = 113  ( 113 )   NameLabels = 113  ( 113 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_5/A5 b/tests/de/step_5/A5
index 71497e10fb..f6a671cc58 100644
--- a/tests/de/step_5/A5
+++ b/tests/de/step_5/A5
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename r0801_id.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 220  ( 203 )  Summary  = 220  ( 203 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 219  ( 208 )  Summary  = 219  ( 208 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1327  ( 1327 )   Summary  = 9260  ( 9174 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1327  ( 1327 )   FreeWire = 0  ( 0 )   FreeEdge  = 84 ( 84 )   SharedEdge = 3872  ( 3871 )
-TOLERANCE   : MaxTol   =   0.0796871773  (  0.07968717732 )  AvgTol   =  0.0006258568216  (  0.0006236975279 )
+TOLERANCE   : MaxTol   =   0.0796871773  (  0.07968717732 )  AvgTol   =  0.000625710861  (  0.0006235866117 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 3707  ( 3707 )  N2Labels = 0  ( 0 )   TotalLabels = 3710  ( 3710 )   NameLabels = 5  ( 5 )   ColorLabels = 3706  ( 3706 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 8  ( 8 )
diff --git a/tests/de/step_5/A8 b/tests/de/step_5/A8
index 34de1600a7..a64b343d09 100644
--- a/tests/de/step_5/A8
+++ b/tests/de/step_5/A8
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename sd_exhaust-A.stp
 
 set ref_data {
diff --git a/tests/de/step_5/A9 b/tests/de/step_5/A9
index 04c156864a..6d4c673547 100644
--- a/tests/de/step_5/A9
+++ b/tests/de/step_5/A9
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename sd_exhaust-B.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 0 )  Summary  = 4  ( 0 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 7  ( 7 )  Shell    = 7  ( 7 )  Face     = 100  ( 100 )   Summary  = 627  ( 627 )
 STATSHAPE   : Solid    = 7  ( 7 )  Shell    = 7  ( 7 )  Face     = 100  ( 100 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 240  ( 240 )
-TOLERANCE   : MaxTol   = 9.577494613e-007  ( 9.577357701e-007 )  AvgTol   =  1.439765562e-007  (  1.438155104e-007 )
+TOLERANCE   : MaxTol   = 9.577495182e-007  ( 9.577357701e-007 )  AvgTol   =  1.439765565e-007  (  1.443253274e-007 )
 LABELS      : N0Labels = 7  ( 7 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 7  ( 7 )   NameLabels = 7  ( 7 )   ColorLabels = 7  ( 7 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 5 )
diff --git a/tests/de/step_5/B2 b/tests/de/step_5/B2
index bbeb633b06..fdfa82e40d 100644
--- a/tests/de/step_5/B2
+++ b/tests/de/step_5/B2
@@ -1,16 +1,13 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename tr10_r0601_id.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 220  ( 203 )  Summary  = 220  ( 203 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 219  ( 208 )  Summary  = 219  ( 208 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1327  ( 1327 )   Summary  = 9260  ( 9174 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 1327  ( 1327 )   FreeWire = 0  ( 0 )   FreeEdge  = 84 ( 84 )   SharedEdge = 3872  ( 3871 )
-TOLERANCE   : MaxTol   =   0.0796871773  (  0.07968717732 )  AvgTol   =  0.0006258568216  (  0.0006236975279 )
+TOLERANCE   : MaxTol   =   0.0796871773  (  0.07968717732 )  AvgTol   =  0.000625710861  (  0.0006235866117 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 3707  ( 3707 )  N2Labels = 0  ( 0 )   TotalLabels = 3710  ( 3710 )   NameLabels = 5  ( 5 )   ColorLabels = 3706  ( 3706 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 8  ( 8 )
diff --git a/tests/de/step_5/B4 b/tests/de/step_5/B4
index 2575c24c9b..ce5f7ab8ea 100644
--- a/tests/de/step_5/B4
+++ b/tests/de/step_5/B4
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename bm4_db_seal_c.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 117  ( 39 )  Summary  = 117  ( 39
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 140  ( 140 )   Summary  = 704  ( 704 )
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 140  ( 140 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 280  ( 280 )
-TOLERANCE   : MaxTol   = 0.0004823436197  ( 0.0004827870033 )  AvgTol   =  0.000157560816  (  0.000165115431 )
+TOLERANCE   : MaxTol   = 0.0004823436197  ( 0.0004827870033 )  AvgTol   =  0.000157531855  (  0.000165115431 )
 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_5/B5 b/tests/de/step_5/B5
index 8af36c08a1..7f7e3c1384 100644
--- a/tests/de/step_5/B5
+++ b/tests/de/step_5/B5
@@ -1,7 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-
-
 set filename trj7_pm5-sd-214.stp
 
 set ref_data {
@@ -10,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 14  ( 6 )  Summary  = 14  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 37  ( 37 )  Shell    = 37  ( 37 )  Face     = 1477  ( 1477 )   Summary  = 10045  ( 10045 )
 STATSHAPE   : Solid    = 157  ( 157 )  Shell    = 157  ( 157 )  Face     = 6549  ( 6549 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 4087  ( 4087 )
-TOLERANCE   : MaxTol   = 9.800652784e-007  ( 9.800405136e-007 )  AvgTol   =  1.060761574e-007  (  1.059616207e-007 )
+TOLERANCE   : MaxTol   = 9.800652784e-007  ( 9.800405136e-007 )  AvgTol   =  1.061209555e-007  (  1.059616207e-007 )
 LABELS      : N0Labels = 49  ( 49 )  N1Labels = 207  ( 207 )  N2Labels = 0  ( 0 )   TotalLabels = 256  ( 256 )   NameLabels = 213  ( 213 )   ColorLabels = 80  ( 80 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 21  ( 21 )