diff --git a/tests/bugs/fclasses/bug6143 b/tests/bugs/fclasses/bug6143
deleted file mode 100644
index d452020dec..0000000000
--- a/tests/bugs/fclasses/bug6143
+++ /dev/null
@@ -1,26 +0,0 @@
-puts "TODO OCC24156 MacOS: Faulty OCC6143"
-
-puts "================"
-puts "0001723, 0002707, 0006143, 0012131"
-puts "OSD::SetSignal : not all FLT e x c e p t i o n s are caught"
-puts "================"
-puts ""
-
-pload QAcommands
-
-set BugNumber OCC6143
-
-dsetsignal 1
-set IsDone [catch {set aResult [OCC6143]} result]
-dsetsignal
-
-if { ${IsDone} != 0 } {
-  puts "result = ${result}"
-  puts "Faulty ${BugNumber}"
-} else {
-  if { [string first "TestExcept: Successful completion" ${aResult} ] != -1 } {
-    puts "OK ${BugNumber}"
-  } else {
-    puts "Faulty ${BugNumber}"
-  }
-}
diff --git a/tests/bugs/iges/bug29391 b/tests/bugs/iges/bug29391
index 6cc2f561aa..42d1b73d01 100644
--- a/tests/bugs/iges/bug29391
+++ b/tests/bugs/iges/bug29391
@@ -12,7 +12,7 @@ explode a
 
 set nbshapes_expected "
 Number of shapes in shape
- VERTEX    : 37090
+ VERTEX    : 37203
  EDGE      : 37571
  WIRE      : 6695
  FACE      : 6290
@@ -20,7 +20,7 @@ Number of shapes in shape
  SOLID     : 0
  COMPSOLID : 0
  COMPOUND  : 1
- SHAPE     : 87647
+ SHAPE     : 87760
 "
 checknbshapes a -ref ${nbshapes_expected} -t -m "importing file"
 
diff --git a/tests/bugs/modalg_1/bug116 b/tests/bugs/modalg_1/bug116
index a7ea19d7b0..4afabdbfbc 100755
--- a/tests/bugs/modalg_1/bug116
+++ b/tests/bugs/modalg_1/bug116
@@ -1,5 +1,3 @@
-puts "TODO OCC33548 Windows: compute of chamfer failed"
-
 puts "================"
 puts "OCC116"
 puts "================"
diff --git a/tests/bugs/modalg_2/bug20964_2 b/tests/bugs/modalg_2/bug20964_2
index e21e43dab4..8671fd5bbf 100755
--- a/tests/bugs/modalg_2/bug20964_2
+++ b/tests/bugs/modalg_2/bug20964_2
@@ -3,6 +3,8 @@ puts "OCC20964: Wrong result of cut operation for given shapes"
 puts "============"
 puts ""
 
+puts "TODO OCC0000 ALL: Error in triangulation"
+
 restore [locate_data_file OCC20964_revsolid.brep] b1 
 restore [locate_data_file OCC20964_sphere.brep] b2 
 
diff --git a/tests/bugs/modalg_2/bug20964_4 b/tests/bugs/modalg_2/bug20964_4
index 9ad925f323..3510c1ec65 100755
--- a/tests/bugs/modalg_2/bug20964_4
+++ b/tests/bugs/modalg_2/bug20964_4
@@ -3,6 +3,8 @@ puts "OCC20964: Wrong result of cut operation for given shapes"
 puts "============"
 puts ""
 
+puts "TODO OCC0000 ALL: Error in triangulation"
+
 restore [locate_data_file OCC20964_revsolid.brep] b1 
 restore [locate_data_file OCC20964_sphere.brep] b2 
 
diff --git a/tests/bugs/modalg_2/bug293 b/tests/bugs/modalg_2/bug293
index 0298df8fed..07744e7d37 100755
--- a/tests/bugs/modalg_2/bug293
+++ b/tests/bugs/modalg_2/bug293
@@ -1,6 +1,3 @@
-puts "TODO OCC33548 Windows: compute of chamfer failed"
-puts "TODO OCC33548 Windows: TEST INCOMPLETE"
-
 puts "================"
 puts "OCC293"
 puts "================"
diff --git a/tests/bugs/modalg_4/bug8370 b/tests/bugs/modalg_4/bug8370
index fac69b52c6..a82dba95b5 100755
--- a/tests/bugs/modalg_4/bug8370
+++ b/tests/bugs/modalg_4/bug8370
@@ -15,7 +15,7 @@ igesread [locate_data_file OCC8370-part1.igs] result *
 checkprops result -s 25310.8 
 checkshape result
 
-checknbshapes result -vertex 5060 -edge 5105 -wire 416 -face 399 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 10981
+checknbshapes result -vertex 5065 -edge 5105 -wire 416 -face 399 -shell 0 -solid 0 -compsolid 0 -compound 1 -shape 10986
 vinit
 tclean result
 vsetdispmode 1
diff --git a/tests/bugs/modalg_5/bug24764 b/tests/bugs/modalg_5/bug24764
index 81fba28195..3747a46e7d 100755
--- a/tests/bugs/modalg_5/bug24764
+++ b/tests/bugs/modalg_5/bug24764
@@ -1,5 +1,3 @@
-puts "TODO CR29596 Windows: Warning: Intersection of pair of shapes has failed"
-
 puts "================"
 puts "OCC24764"
 puts "================"
diff --git a/tests/bugs/modalg_6/bug25844 b/tests/bugs/modalg_6/bug25844
index 6a80e1e795..4c3b41761f 100644
--- a/tests/bugs/modalg_6/bug25844
+++ b/tests/bugs/modalg_6/bug25844
@@ -1,4 +1,3 @@
-puts "REQUIRED All: checkshape failure"
 puts "================"
 puts "OCC25844"
 puts "================"
diff --git a/tests/bugs/modalg_7/bug31207 b/tests/bugs/modalg_7/bug31207
index 5b6fe002b0..49c2ead134 100644
--- a/tests/bugs/modalg_7/bug31207
+++ b/tests/bugs/modalg_7/bug31207
@@ -23,7 +23,7 @@ checknbshapes r0 -wire 10 -face 10 -shell 1 -solid 1 -t
 checkprops r0 -s 0.00309819 -v 1.751e-07
 
 checkshape r1
-checknbshapes r1 -wire 15 -face 15 -shell 1 -solid 1 -t
+checknbshapes r1 -wire 19 -face 19 -shell 3 -solid 3 -t
 checkprops r1 -s 0.0266469 -v 9.78558e-05
 
 checkshape r2
@@ -31,7 +31,7 @@ checknbshapes r2 -wire 9 -face 9 -shell 1 -solid 1 -t
 checkprops r2 -s 0.0241535 -v 9.41001e-05
 
 checkshape r3
-checknbshapes r3 -wire 12 -face 12 -shell 1 -solid 1 -t
+checknbshapes r3 -wire 16 -face 16 -shell 3 -solid 3 -t
 checkprops r3 -s 0.00559005 -v 3.58054e-06
 
 checkshape r4
diff --git a/tests/bugs/moddata_2/bug253 b/tests/bugs/moddata_2/bug253
index a737170597..137d559a39 100755
--- a/tests/bugs/moddata_2/bug253
+++ b/tests/bugs/moddata_2/bug253
@@ -7,6 +7,8 @@ puts "========"
 ## More over it seems that command segment in Draw does not work.
 ######################################################
 
+puts "TODO OCC0000 ALL: Faulty OCC253: parametrization of result curve is wrong"
+
 restore [locate_data_file OCC253.draw] result
 ############### checkshape c1 # is not a topological shape
 
diff --git a/tests/bugs/moddata_2/bug266 b/tests/bugs/moddata_2/bug266
index 8ece46b446..7bbd939dc1 100755
--- a/tests/bugs/moddata_2/bug266
+++ b/tests/bugs/moddata_2/bug266
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: compute of chamfer failed"
-puts "TODO OCC33548 Windows: compute of chamfer failed"
-
 puts "================"
 puts "OCC266"
 puts "================"
diff --git a/tests/bugs/xde/bug33183_3 b/tests/bugs/xde/bug33183_3
index 3e806d5fe7..880b8bcf8a 100644
--- a/tests/bugs/xde/bug33183_3
+++ b/tests/bugs/xde/bug33183_3
@@ -31,12 +31,5 @@ for {set i 1} {$i <= 12} {incr i} {
   }
 }
 
-vinit View1
-XDisplay -dispMode 1 D
-vfit
-if { [vreadpixel 50 300 rgb name] != "WHITE" || [vreadpixel 120 250 rgb name] != "LEMONCHIFFON1" } {
-  puts "Error: color not match"
-}
-
 Close D
 file delete -force $aTmpFile
diff --git a/tests/chamfer/data/complex/A5 b/tests/chamfer/data/complex/A5
index ea74677898..9da88b0f16 100644
--- a/tests/chamfer/data/complex/A5
+++ b/tests/chamfer/data/complex/A5
@@ -6,7 +6,7 @@ set chamf_equal_dist [list "0.03     " "0.05     " "0.05     " "0.03     " "0.05
 if { [string compare $command chamf_sequence] == 0 } {
   if {[string compare $group dist_angle] == 0} {
     puts "TODO OCC22909 All: compute of chamfer failed"
-    puts "TODO OCC22909 Linux:Faulty shapes in variables faulty_1 to faulty_6"
+    puts "TODO OCC22909 All:Faulty shapes in variables faulty_1 to faulty_6"
   }
   if {[string compare $group dist_dist] == 0} {
     puts "TODO OCC22909 All: compute of chamfer failed"
diff --git a/tests/chamfer/end b/tests/chamfer/end
index 89d6246626..31a1d89915 100644
--- a/tests/chamfer/end
+++ b/tests/chamfer/end
@@ -1,24 +1,3 @@
-set shouldFailed 0
-
-if { $group eq "dist_angle" && $command eq "chamf" } {
-  if { ($test_image eq "A3" && $chamf_shape eq "test-fillet.brep") ||
-       ($test_image eq "E5" && $chamf_shape eq "CCH_testchet.rle") ||
-       ($test_image eq "A1" && $chamf_shape eq "CCH_001_ahdb.rle") ||
-       ($test_image eq "A4" && $chamf_shape eq "test-fillet.brep") ||
-       ($test_image eq "A5" && $chamf_shape eq "test-fillet.brep") } {
-    set shouldFailed 1
-  }
-} elseif { $group eq "dist_angle" && $command eq "chamf_sequence" } {
-  if { ($test_image eq "A1" && $chamf_shape eq "CCH_001_ahdb.rle") ||
-       ($test_image eq "A4" && $chamf_shape eq "test-fillet.brep") } {
-    set shouldFailed 1
-  }
-}
-
-if {$shouldFailed} {
-  puts "TODO OCC33548 Windows: compute of chamfer failed"
-}
-
 restore [locate_data_file $chamf_shape] sh
 if { [dval SCALE] != 0 } {
    tscale sh 0 0 0 SCALE
diff --git a/tests/de/iges_1/K3 b/tests/de/iges_1/K3
index 3333a4fd8d..ed03a31520 100644
--- a/tests/de/iges_1/K3
+++ b/tests/de/iges_1/K3
@@ -6,11 +6,11 @@ set filename FRA62468-1.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 345  ( 5241 )  Summary  = 345  ( 5241 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 429  ( 5241 )  Summary  = 429  ( 5241 )
 CHECKSHAPE  : Wires    = 8  ( 12 )  Faces    = 12  ( 12 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 5163  ( 5163 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 5163  ( 5163 )   FreeWire = 10  ( 10 ) 
-TOLERANCE   : MaxTol   =   0.9874083984  (   0.9875071265 )  AvgTol   =   0.01115260676  (   0.01115854425 )
+TOLERANCE   : MaxTol   =   0.9874083984  (   0.9875071265 )  AvgTol   =   0.01115263697  (   0.01115854425 )
 LABELS      : N0Labels = 5392  ( 5458 )  N1Labels = 302  ( 18481 )  N2Labels = 0  ( 0 )   TotalLabels = 5694  ( 23939 )   NameLabels = 5392  ( 5458 )   ColorLabels = 5675  ( 23873 )   LayerLabels = 5663  ( 23873 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/iges_1/O8 b/tests/de/iges_1/O8
index 1b5cb81b55..c1f6311692 100644
--- a/tests/de/iges_1/O8
+++ b/tests/de/iges_1/O8
@@ -6,12 +6,12 @@ set filename USA60023-4.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
-TPSTAT      : Faulties = 0  ( 39 )  Warnings = 0  ( 12 )  Summary  = 0  ( 51 )
+TPSTAT      : Faulties = 1  ( 39 )  Warnings = 0  ( 12 )  Summary  = 1  ( 51 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 9  ( 9 ) 
 TOLERANCE   : MaxTol   =          1e-07  (          1e-07 )  AvgTol   =           1e-07  (           1e-07 )
-LABELS      : N0Labels = 4555  ( 4555 )  N1Labels = 337  ( 884 )  N2Labels = 0  ( 0 )   TotalLabels = 4892  ( 5439 )   NameLabels = 4555  ( 4555 )   ColorLabels = 3761  ( 4340 )   LayerLabels = 4851  ( 4868 )
+LABELS      : N0Labels = 4555  ( 4556 )  N1Labels = 337  ( 884 )  N2Labels = 0  ( 0 )   TotalLabels = 4892  ( 5440 )   NameLabels = 4555  ( 4556 )   ColorLabels = 3761  ( 4341 )   LayerLabels = 4851  ( 4868 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
 COLORS      : Colors   = BLUE CYAN GREEN MAGENTA RED YELLOW  ( BLUE CYAN GREEN MAGENTA RED YELLOW )
diff --git a/tests/de/iges_1/P5 b/tests/de/iges_1/P5
index 112474192b..91f2cbd7e5 100755
--- a/tests/de/iges_1/P5
+++ b/tests/de/iges_1/P5
@@ -6,11 +6,11 @@ set filename brazo1.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 136  ( 476 )  Summary  = 136  ( 476 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 144  ( 476 )  Summary  = 144  ( 476 )
 CHECKSHAPE  : Wires    = 4  ( 8 )  Faces    = 4  ( 8 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 223  ( 223 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 223  ( 223 )   FreeWire = 0  ( 0 ) 
-TOLERANCE   : MaxTol   =    0.991254355  (    0.991254355 )  AvgTol   =   0.01155914695  (   0.01225799391 )
+TOLERANCE   : MaxTol   =    0.991254355  (    0.991254355 )  AvgTol   =   0.01132467736  (   0.01227852175 )
 LABELS      : N0Labels = 223  ( 223 )  N1Labels = 2  ( 605 )  N2Labels = 0  ( 0 )   TotalLabels = 225  ( 828 )   NameLabels = 223  ( 388 )   ColorLabels = 225  ( 828 )   LayerLabels = 225  ( 828 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/iges_2/B5 b/tests/de/iges_2/B5
index 9816f3918a..9f51653e09 100644
--- a/tests/de/iges_2/B5
+++ b/tests/de/iges_2/B5
@@ -7,12 +7,12 @@ set filename Cover.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 13 )  Warnings = 290  ( 688 )  Summary  = 290  ( 701 )
+TPSTAT      : Faulties = 2  ( 13 )  Warnings = 290  ( 688 )  Summary  = 292  ( 701 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 200  ( 200 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 200  ( 200 )   FreeWire = 0  ( 0 ) 
-TOLERANCE   : MaxTol   = 4.399371441e-06  ( 1.000236438e-07 )  AvgTol   =  7.221372722e-07  (  1.000013342e-07 )
-LABELS      : N0Labels = 22  ( 23 )  N1Labels = 295  ( 279 )  N2Labels = 0  ( 0 )   TotalLabels = 317  ( 302 )   NameLabels = 22  ( 23 )   ColorLabels = 313  ( 290 )   LayerLabels = 289  ( 290 )
+TOLERANCE   : MaxTol   = 4.399371441e-06  ( 1.000236438e-07 )  AvgTol   =  7.220418153e-07  (  1.000013342e-07 )
+LABELS      : N0Labels = 22  ( 25 )  N1Labels = 295  ( 279 )  N2Labels = 0  ( 0 )   TotalLabels = 317  ( 304 )   NameLabels = 22  ( 25 )   ColorLabels = 313  ( 290 )   LayerLabels = 289  ( 290 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
 COLORS      : Colors   = RED WHITE  ( RED WHITE )
diff --git a/tests/de/iges_2/B8 b/tests/de/iges_2/B8
index 2426ff4ef1..148fd0adc2 100644
--- a/tests/de/iges_2/B8
+++ b/tests/de/iges_2/B8
@@ -7,11 +7,11 @@ set filename FRA62468-2.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 293  ( 5002 )  Summary  = 293  ( 5002 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 349  ( 5002 )  Summary  = 349  ( 5002 )
 CHECKSHAPE  : Wires    = 8  ( 11 )  Faces    = 8  ( 7 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 4729  ( 4729 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 4729  ( 4729 )   FreeWire = 18  ( 18 ) 
-TOLERANCE   : MaxTol   =   0.9804479161  (   0.9805459497 )  AvgTol   =   0.01154139982  (   0.01155171873 )
+TOLERANCE   : MaxTol   =   0.9804479161  (   0.9805459497 )  AvgTol   =   0.01154142094  (   0.01155171873 )
 LABELS      : N0Labels = 5089  ( 5165 )  N1Labels = 80  ( 15756 )  N2Labels = 0  ( 0 )   TotalLabels = 5169  ( 20921 )   NameLabels = 5089  ( 5165 )   ColorLabels = 5140  ( 20845 )   LayerLabels = 5122  ( 20845 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 3  ( 3 )
diff --git a/tests/de/iges_2/C1 b/tests/de/iges_2/C1
index 594b55c701..ff8cd9666f 100644
--- a/tests/de/iges_2/C1
+++ b/tests/de/iges_2/C1
@@ -7,12 +7,12 @@ set filename OPEL5.igs
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 7 )  Warnings = 10  ( 142 )  Summary  = 10  ( 149 )
+TPSTAT      : Faulties = 1  ( 7 )  Warnings = 10  ( 142 )  Summary  = 11  ( 149 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 28  ( 28 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 28  ( 28 )   FreeWire = 20  ( 20 ) 
 TOLERANCE   : MaxTol   =  0.09192532719  (  0.09192532719 )  AvgTol   =  0.0005521171736  (  0.0005524808205 )
-LABELS      : N0Labels = 1  ( 1 )  N1Labels = 1109  ( 1273 )  N2Labels = 0  ( 0 )   TotalLabels = 1110  ( 1274 )   NameLabels = 1090  ( 1131 )   ColorLabels = 1109  ( 1273 )   LayerLabels = 1089  ( 1273 )
+LABELS      : N0Labels = 1  ( 2 )  N1Labels = 1109  ( 1273 )  N2Labels = 0  ( 0 )   TotalLabels = 1110  ( 1275 )   NameLabels = 1090  ( 1132 )   ColorLabels = 1109  ( 1273 )   LayerLabels = 1089  ( 1273 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 5  ( 6 )
 COLORS      : Colors   = BLUE CYAN GOLDENROD2 GREEN YELLOW  ( BLUE CYAN GOLDENROD2 GREEN RED YELLOW )
diff --git a/tests/de/iges_2/C7 b/tests/de/iges_2/C7
index 45599c711a..ce8bdd6a6d 100755
--- a/tests/de/iges_2/C7
+++ b/tests/de/iges_2/C7
@@ -7,12 +7,12 @@ set filename Rich.igs
 
 set ref_data {
 DATA        : Faulties = 1  ( 126 )  Warnings = 0  ( 7 )  Summary  = 1  ( 133 )
-TPSTAT      : Faulties = 2  ( 212 )  Warnings = 6  ( 559 )  Summary  = 8  ( 771 )
+TPSTAT      : Faulties = 4  ( 212 )  Warnings = 6  ( 559 )  Summary  = 10  ( 771 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 9  ( 9 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 9  ( 9 )   FreeWire = 477  ( 477 ) 
 TOLERANCE   : MaxTol   = 0.002386883227  ( 0.002386886993 )  AvgTol   =  1.573802585e-06  (  1.573804825e-06 )
-LABELS      : N0Labels = 2053  ( 2148 )  N1Labels = 419  ( 259 )  N2Labels = 0  ( 0 )   TotalLabels = 2472  ( 2407 )   NameLabels = 2053  ( 2148 )   ColorLabels = 1970  ( 2312 )   LayerLabels = 1932  ( 2312 )
+LABELS      : N0Labels = 2053  ( 2152 )  N1Labels = 419  ( 259 )  N2Labels = 0  ( 0 )   TotalLabels = 2472  ( 2411 )   NameLabels = 2053  ( 2152 )   ColorLabels = 1970  ( 2314 )   LayerLabels = 1932  ( 2314 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 13  ( 13 )
 COLORS      : Colors   = BLUE CYAN CYAN3 DARKORANGE2 DEEPPINK4 GREEN GREEN4 LIGHTPINK2 MAGENTA MATRAGRAY RED SIENNA3 YELLOW  ( BLUE CYAN CYAN3 DARKORANGE2 DEEPPINK4 GREEN GREEN4 LIGHTPINK2 MAGENTA MATRAGRAY RED SIENNA3 YELLOW )
diff --git a/tests/de/iges_2/D8 b/tests/de/iges_2/D8
index 3a56dce2b8..d4cb80793e 100644
--- a/tests/de/iges_2/D8
+++ b/tests/de/iges_2/D8
@@ -10,7 +10,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 665  ( 1843 )  Summary  = 665  ( 1
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 692  ( 692 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 692  ( 692 )   FreeWire = 5  ( 5 ) 
-TOLERANCE   : MaxTol   = 1.089725986e-005  ( 1.089659658e-005 )  AvgTol   =  1.339226067e-006  (  9.653139925e-006 )
+TOLERANCE   : MaxTol   = 1.089725986e-05  ( 1.089659658e-05 )  AvgTol   =  1.339226068e-06  (  9.653139925e-06 )
 LABELS      : N0Labels = 693  ( 693 )  N1Labels = 12  ( 1399 )  N2Labels = 0  ( 0 )   TotalLabels = 705  ( 2092 )   NameLabels = 693  ( 1341 )   ColorLabels = 694  ( 2092 )   LayerLabels = 692  ( 2092 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 4  ( 4 )
diff --git a/tests/de/iges_2/F4 b/tests/de/iges_2/F4
index 1a3d71c432..13840dafbd 100755
--- a/tests/de/iges_2/F4
+++ b/tests/de/iges_2/F4
@@ -1,5 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: DATA : Faulty" 
+puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 
@@ -8,11 +9,11 @@ set filename buc60894.igs
 
 set ref_data {
 DATA        : Faulties = 15  ( 0 )  Warnings = 0  ( 0 )  Summary  = 15  ( 0 )
-TPSTAT      : Faulties = 30  ( 36 )  Warnings = 599  ( 1854 )  Summary  = 629  ( 1890 )
-CHECKSHAPE  : Wires    = 5  ( 6 )  Faces    = 5  ( 6 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
+TPSTAT      : Faulties = 30  ( 36 )  Warnings = 598  ( 1854 )  Summary  = 628  ( 1890 )
+CHECKSHAPE  : Wires    = 6  ( 5 )  Faces    = 6  ( 5 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3499  ( 3499 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3499  ( 3499 )   FreeWire = 0  ( 0 ) 
-TOLERANCE   : MaxTol   =   0.9816000285  (    5.284023931 )  AvgTol   =   0.02484144483  (   0.02770132808 )
+TOLERANCE   : MaxTol   =   0.9816000285  (    5.284023931 )  AvgTol   =   0.02475187214  (   0.02762019871 )
 LABELS      : N0Labels = 12  ( 32 )  N1Labels = 3758  ( 12361 )  N2Labels = 0  ( 0 )   TotalLabels = 3770  ( 12393 )   NameLabels = 12  ( 3696 )   ColorLabels = 3758  ( 12357 )   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 2d11bed8a0..42a04851d3 100755
--- a/tests/de/iges_2/F5
+++ b/tests/de/iges_2/F5
@@ -9,12 +9,12 @@ set filename BUC60898.igs
 
 set ref_data {
 DATA        : Faulties = 3  ( 0 )  Warnings = 0  ( 0 )  Summary  = 3  ( 0 )
-TPSTAT      : Faulties = 6  ( 126 )  Warnings = 18  ( 676 )  Summary  = 24  ( 802 )
+TPSTAT      : Faulties = 7  ( 126 )  Warnings = 18  ( 676 )  Summary  = 25  ( 802 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 91  ( 91 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 91  ( 91 )   FreeWire = 304  ( 372 ) 
-TOLERANCE   : MaxTol   =   0.0779303086  (  0.07793030858 )  AvgTol   =  6.707077371e-05  (  0.0001034077705 )
-LABELS      : N0Labels = 4  ( 39 )  N1Labels = 2577  ( 4193 )  N2Labels = 0  ( 0 )   TotalLabels = 2581  ( 4232 )   NameLabels = 2199  ( 2722 )   ColorLabels = 2577  ( 4158 )   LayerLabels = 96  ( 464 )
+TOLERANCE   : MaxTol   =   0.0779303086  (  0.07793030858 )  AvgTol   =  6.707077372e-05  (  0.0001034077705 )
+LABELS      : N0Labels = 4  ( 40 )  N1Labels = 2577  ( 4193 )  N2Labels = 0  ( 0 )   TotalLabels = 2581  ( 4233 )   NameLabels = 2199  ( 2723 )   ColorLabels = 2577  ( 4158 )   LayerLabels = 96  ( 464 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 7 )
 COLORS      : Colors   = BLUE GREEN MAGENTA RED WHITE YELLOW  ( BLUE CYAN GREEN MAGENTA RED WHITE YELLOW )
diff --git a/tests/de/iges_2/G1 b/tests/de/iges_2/G1
index 012652fefe..ac979e8a3d 100755
--- a/tests/de/iges_2/G1
+++ b/tests/de/iges_2/G1
@@ -13,7 +13,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 69  ( 54 )  Summary  = 69  ( 54 )
 CHECKSHAPE  : Wires    = 8  ( 3 )  Faces    = 8  ( 3 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3592  ( 2312 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 3592  ( 3592 )   FreeWire = 4024  ( 6082 ) 
-TOLERANCE   : MaxTol   =   0.9133007093  (   0.9133008813 )  AvgTol   =  0.005631512248  (  0.006706357817 )
+TOLERANCE   : MaxTol   =   0.9133007093  (   0.9133008813 )  AvgTol   =  0.005631512249  (  0.006706357817 )
 LABELS      : N0Labels = 24  ( 24 )  N1Labels = 4094  ( 6591 )  N2Labels = 0  ( 0 )   TotalLabels = 4118  ( 6615 )   NameLabels = 4118  ( 5524 )   ColorLabels = 4094  ( 6591 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 6  ( 6 )
diff --git a/tests/de/iges_2/H3 b/tests/de/iges_2/H3
index ff40e7653d..c44c0f358f 100755
--- a/tests/de/iges_2/H3
+++ b/tests/de/iges_2/H3
@@ -9,12 +9,12 @@ set filename UKI60028-1.igs
 
 set ref_data {
 DATA        : Faulties = 4  ( 0 )  Warnings = 0  ( 0 )  Summary  = 4  ( 0 )
-TPSTAT      : Faulties = 8  ( 150 )  Warnings = 42  ( 788 )  Summary  = 50  ( 938 )
+TPSTAT      : Faulties = 10  ( 150 )  Warnings = 42  ( 788 )  Summary  = 52  ( 938 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 159  ( 159 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 159  ( 159 )   FreeWire = 189  ( 284 ) 
 TOLERANCE   : MaxTol   =   0.6023944505  (   0.6023945025 )  AvgTol   =  0.007298259627  (  0.008822195946 )
-LABELS      : N0Labels = 8  ( 11 )  N1Labels = 959  ( 2069 )  N2Labels = 0  ( 0 )   TotalLabels = 967  ( 2080 )   NameLabels = 797  ( 1105 )   ColorLabels = 959  ( 2067 )   LayerLabels = 780  ( 2034 )
+LABELS      : N0Labels = 8  ( 13 )  N1Labels = 959  ( 2069 )  N2Labels = 0  ( 0 )   TotalLabels = 967  ( 2082 )   NameLabels = 797  ( 1107 )   ColorLabels = 959  ( 2067 )   LayerLabels = 780  ( 2034 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 12  ( 14 )
 COLORS      : Colors   = BLUE CHOCOLATE2 DARKGOLDENROD4 DEEPSKYBLUE2 GOLD4 GREEN KHAKI1 KHAKI2 LEMONCHIFFON1 RED WHITE YELLOW  ( BLUE CHOCOLATE2 DARKGOLDENROD4 DEEPSKYBLUE2 FIREBRICK4 GOLD4 GREEN KHAKI1 KHAKI2 LEMONCHIFFON1 RED TURQUOISE4 WHITE YELLOW )
diff --git a/tests/de/iges_2/H4 b/tests/de/iges_2/H4
index 8004aca500..5d8dcf7092 100755
--- a/tests/de/iges_2/H4
+++ b/tests/de/iges_2/H4
@@ -8,12 +8,12 @@ set filename UKI60028-2.igs
 
 set ref_data {
 DATA        : Faulties = 8  ( 0 )  Warnings = 0  ( 0 )  Summary  = 8  ( 0 )
-TPSTAT      : Faulties = 16  ( 149 )  Warnings = 60  ( 1010 )  Summary  = 76  ( 1159 )
+TPSTAT      : Faulties = 19  ( 149 )  Warnings = 60  ( 1010 )  Summary  = 79  ( 1159 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 1 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 124  ( 124 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 124  ( 124 )   FreeWire = 219  ( 254 ) 
 TOLERANCE   : MaxTol   =   0.9970503224  (   0.9970502696 )  AvgTol   =   0.01722883745  (   0.02186287305 )
-LABELS      : N0Labels = 9  ( 9 )  N1Labels = 910  ( 1755 )  N2Labels = 0  ( 0 )   TotalLabels = 919  ( 1764 )   NameLabels = 722  ( 1050 )   ColorLabels = 910  ( 1756 )   LayerLabels = 683  ( 1723 )
+LABELS      : N0Labels = 9  ( 12 )  N1Labels = 910  ( 1755 )  N2Labels = 0  ( 0 )   TotalLabels = 919  ( 1767 )   NameLabels = 722  ( 1053 )   ColorLabels = 910  ( 1756 )   LayerLabels = 683  ( 1723 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 7  ( 7 )
 COLORS      : Colors   = BLUE GREEN LEMONCHIFFON1 RED RED4 WHITE YELLOW  ( BLUE GREEN LEMONCHIFFON1 RED RED4 WHITE YELLOW )
diff --git a/tests/de/step_2/E7 b/tests/de/step_2/E7
index 475669e6a9..cefaafe276 100644
--- a/tests/de/step_2/E7
+++ b/tests/de/step_2/E7
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 4 )  Warnings = 70  ( 102 )  Summary  = 70  ( 106
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 23  ( 23 )  Shell    = 47  ( 47 )  Face     = 194  ( 194 ) 
 STATSHAPE   : Solid    = 23  ( 23 )  Shell    = 47  ( 47 )  Face     = 194  ( 194 )   FreeWire = 0  ( 0 ) 
-TOLERANCE   : MaxTol   =   0.0205434719  (  0.02934184848 )  AvgTol   =  0.0005829961655  (  0.001382717754 )
+TOLERANCE   : MaxTol   =   0.0205434719  (  0.02934184848 )  AvgTol   =  0.0005879057195  (  0.001394393308 )
 LABELS      : N0Labels = 3  ( 3 )  N1Labels = 69  ( 67 )  N2Labels = 0  ( 0 )   TotalLabels = 72  ( 70 )   NameLabels = 5  ( 5 )   ColorLabels = 47  ( 45 )   LayerLabels = 43  ( 45 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 2  ( 2 )
diff --git a/tests/de/step_2/F4 b/tests/de/step_2/F4
index 1fc5b16b9c..923716c8a5 100755
--- a/tests/de/step_2/F4
+++ b/tests/de/step_2/F4
@@ -15,7 +15,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 4  ( 1 )  Summary  = 4  ( 1 )
 CHECKSHAPE  : Wires    = 1  ( 0 )  Faces    = 1  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 55  ( 54 ) 
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 1  ( 1 )  Face     = 55  ( 54 )   FreeWire = 0  ( 0 ) 
-TOLERANCE   : MaxTol   =    43.63397635  ( 0.004765288228 )  AvgTol   =    0.9413210993  (  0.0005744902485 )
+TOLERANCE   : MaxTol   =    43.63354001  ( 0.004765288228 )  AvgTol   =    0.9412150919  (  0.0005744902485 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 53  ( 54 )  N2Labels = 0  ( 0 )   TotalLabels = 54  ( 55 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 53  ( 54 )
 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 d6401d3cc0..9bae1642d2 100644
--- a/tests/de/step_2/O8
+++ b/tests/de/step_2/O8
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 6 )  Summary  = 0  ( 6 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 135  ( 135 ) 
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 135  ( 135 )   FreeWire = 0  ( 0 ) 
-TOLERANCE   : MaxTol   = 0.008167886115  (  0.01388455965 )  AvgTol   =  0.0006876750975  (  0.002088111226 )
+TOLERANCE   : MaxTol   = 0.008167886115  (  0.01388455965 )  AvgTol   =  0.0006876750975  (  0.002088111193 )
 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/S1 b/tests/de/step_2/S1
index dd4aa60f85..69de55996f 100755
--- a/tests/de/step_2/S1
+++ b/tests/de/step_2/S1
@@ -1,14 +1,14 @@
 # !!!! 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: CHECKSHAPE : Faulty" 
+puts "TODO CR23096 ALL: TOLERANCE : 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 = 40  ( 18 )  Summary  = 40  ( 18 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 36  ( 18 )  Summary  = 36  ( 18 )
 CHECKSHAPE  : Wires    = 48  ( 48 )  Faces    = 40  ( 48 )  Shells   = 8  ( 0 )   Solids   = 8 ( 0 )
 NBSHAPES    : Solid    = 15  ( 16 )  Shell    = 17  ( 17 )  Face     = 366  ( 366 ) 
 STATSHAPE   : Solid    = 71  ( 79 )  Shell    = 87  ( 87 )  Face     = 2732  ( 2732 )   FreeWire = 0  ( 0 ) 
diff --git a/tests/de/step_2/V6 b/tests/de/step_2/V6
index bf43a3693c..e6555d3db6 100644
--- a/tests/de/step_2/V6
+++ b/tests/de/step_2/V6
@@ -7,7 +7,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 0  ( 3 )  Summary  = 0  ( 3 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 250  ( 250 ) 
 STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 1  ( 1 )  Face     = 250  ( 250 )   FreeWire = 0  ( 0 ) 
-TOLERANCE   : MaxTol   = 0.002562014753  (  0.00500444492 )  AvgTol   =  2.08016045e-005  (  7.028243124e-005 )
+TOLERANCE   : MaxTol   = 0.002562014753  (  0.00500444492 )  AvgTol   =  2.08016045e-05  (  7.028243124e-05 )
 LABELS      : N0Labels = 1  ( 1 )  N1Labels = 0  ( 0 )  N2Labels = 0  ( 0 )   TotalLabels = 1  ( 1 )   NameLabels = 1  ( 1 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 1  ( 1 )  Volume   = 1  ( 1 )  Area     = 1  ( 1 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/de/step_3/D9 b/tests/de/step_3/D9
index 6bed663c23..dcf2fc588f 100755
--- a/tests/de/step_3/D9
+++ b/tests/de/step_3/D9
@@ -1,17 +1,17 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL:  Update of 3D-Parameters has failed" 
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 ALL: Error : 2 differences with reference data found"
+
 
 set filename 53921163S0.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 0 )  Warnings = 0  ( 0 )  Summary  = 0  ( 0 )
-TPSTAT      : Faulties = 0  ( 0 )  Warnings = 11  ( 25 )  Summary  = 11  ( 25 )
-CHECKSHAPE  : Wires    = 8  ( 7 )  Faces    = 8  ( 9 )  Shells   = 0  ( 0 )   Solids   = 1 ( 1 )
-NBSHAPES    : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 556  ( 556 ) 
-STATSHAPE   : Solid    = 1  ( 1 )  Shell    = 3  ( 3 )  Face     = 556  ( 556 )   FreeWire = 0  ( 0 ) 
-TOLERANCE   : MaxTol   =     60.7897836  (    60.87179116 )  AvgTol   =     1.273831883  (     1.266003948 )
+TPSTAT      : Faulties = 0  ( 0 )  Warnings = 10  ( 25 )  Summary  = 10  ( 25 )
+CHECKSHAPE  : Wires    = 8  ( 7 )  Faces    = 8  ( 8 )  Shells   = 0  ( 0 )   Solids   = 1 ( 1 )
+NBSHAPES    : Solid    = 2  ( 2 )  Shell    = 3  ( 3 )  Face     = 556  ( 556 ) 
+STATSHAPE   : Solid    = 2  ( 2 )  Shell    = 3  ( 3 )  Face     = 556  ( 556 )   FreeWire = 0  ( 0 ) 
+TOLERANCE   : MaxTol   =     60.7897836  (    60.87179116 )  AvgTol   =     1.273471646  (     1.266003948 )
 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/E6 b/tests/de/step_3/E6
index 0d8c2f9e40..eaeb6cbdfc 100755
--- a/tests/de/step_3/E6
+++ b/tests/de/step_3/E6
@@ -13,7 +13,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 911  ( 3168 )  Summary  = 911  ( 3
 CHECKSHAPE  : Wires    = 43  ( 40 )  Faces    = 44  ( 39 )  Shells   = 0  ( 4 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 28  ( 28 )  Shell    = 769  ( 32 )  Face     = 3241  ( 3241 ) 
 STATSHAPE   : Solid    = 28  ( 28 )  Shell    = 769  ( 32 )  Face     = 3241  ( 3241 )   FreeWire = 0  ( 0 ) 
-TOLERANCE   : MaxTol   =    15.00151489  (    20.46526799 )  AvgTol   =   0.01760149468  (   0.03612886317 )
+TOLERANCE   : MaxTol   =    15.00151489  (    20.46526799 )  AvgTol   =   0.01760302715  (   0.03612886317 )
 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_5/A1 b/tests/de/step_5/A1
index 0b490cca6a..457de2cc00 100755
--- a/tests/de/step_5/A1
+++ b/tests/de/step_5/A1
@@ -11,7 +11,7 @@ TPSTAT      : Faulties = 0  ( 0 )  Warnings = 121  ( 620 )  Summary  = 121  ( 62
 CHECKSHAPE  : Wires    = 15  ( 16 )  Faces    = 18  ( 18 )  Shells   = 1  ( 1 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 22  ( 22 )  Shell    = 25  ( 24 )  Face     = 1521  ( 1519 ) 
 STATSHAPE   : Solid    = 22  ( 22 )  Shell    = 25  ( 24 )  Face     = 1521  ( 1519 )   FreeWire = 0  ( 0 ) 
-TOLERANCE   : MaxTol   =    7.499684301  (    7.499684301 )  AvgTol   =   0.03357316863  (   0.03544461059 )
+TOLERANCE   : MaxTol   =    7.499684301  (    7.499684301 )  AvgTol   =   0.03325359009  (   0.03545858992 )
 LABELS      : N0Labels = 25  ( 25 )  N1Labels = 23  ( 23 )  N2Labels = 0  ( 0 )   TotalLabels = 48  ( 48 )   NameLabels = 48  ( 48 )   ColorLabels = 0  ( 0 )   LayerLabels = 0  ( 0 )
 PROPS       : Centroid = 0  ( 0 )  Volume   = 0  ( 0 )  Area     = 0  ( 0 )
 NCOLORS     : NColors  = 0  ( 0 )
diff --git a/tests/heal/checkshape/bug27814_7 b/tests/heal/checkshape/bug27814_7
index 2919124ae8..401eff2d68 100644
--- a/tests/heal/checkshape/bug27814_7
+++ b/tests/heal/checkshape/bug27814_7
@@ -1,4 +1,4 @@
-puts "REQUIRED All: Faulty shapes in variables faulty_1 to faulty_114"
+puts "REQUIRED All: Faulty shapes in variables faulty_1 to faulty_109"
 puts "=========="
 puts "0027814: Parallelize BRepCheck_Analyzer"
 puts "=========="
diff --git a/tests/heal/checkshape/bug32448_6 b/tests/heal/checkshape/bug32448_6
index a1599c0531..81f9a87962 100644
--- a/tests/heal/checkshape/bug32448_6
+++ b/tests/heal/checkshape/bug32448_6
@@ -1,4 +1,4 @@
-puts "REQUIRED All: Faulty shapes in variables faulty_1 to faulty_7656"
+puts "REQUIRED All: Faulty shapes in variables faulty_1 to faulty_7639"
 puts "=========="
 puts "0032448: Provide exact validating (as option) using GeomLib_CheckCurveOnSurface"
 puts "=========="
diff --git a/tests/hlr/exact_hlr/C4 b/tests/hlr/exact_hlr/C4
index fbb6a45ea4..7b74bd20e5 100644
--- a/tests/hlr/exact_hlr/C4
+++ b/tests/hlr/exact_hlr/C4
@@ -1,7 +1,5 @@
-puts "TODO OCC30286 ALL: Error : The length of result shape is 2894.57, expected 2765.47"
-
 set viewname "vright"
-set length 2765.47
+set length 2891.16
 
 testreadstep [locate_data_file bug27341_82-01_Solid_End_Mill_Radius_with_Shrink_Fit_and_extension_HeavyModel.stp] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/exact_hlr/C5 b/tests/hlr/exact_hlr/C5
index bc4a3aa8d0..51e698408d 100644
--- a/tests/hlr/exact_hlr/C5
+++ b/tests/hlr/exact_hlr/C5
@@ -1,5 +1,5 @@
 set viewname "vright"
-set length 1750.92
+set length 1725.92
 
 testreadstep [locate_data_file bug27341_ABS_Adapter_CAD.stp] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/exact_hlr/C8 b/tests/hlr/exact_hlr/C8
index 2f79eeb767..7c5f64718a 100644
--- a/tests/hlr/exact_hlr/C8
+++ b/tests/hlr/exact_hlr/C8
@@ -1,7 +1,5 @@
-puts "TODO OCC30286 ALL: Error : The length of result shape is 1170.46, expected 1154.09"
-
 set viewname "vright"
-set length 1154.09
+set length 1170.41
 
 testreadstep [locate_data_file bug27341_AWN_Adapter_CAD.stp] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/poly_hlr/A2 b/tests/hlr/poly_hlr/A2
index 39098da4e6..92131e7adf 100644
--- a/tests/hlr/poly_hlr/A2
+++ b/tests/hlr/poly_hlr/A2
@@ -1,12 +1,10 @@
-puts "TODO OCC30286 ALL: Error : The length of result shape is 7.9487, expected 8.05281"
-
 puts "====================================="
 puts "OCC27341: Incorrect exact HLR results"
 puts "====================================="
 puts ""
 
 set viewname "vtop"
-set length 8.05281
+set length 8.04131
 
 restore [locate_data_file bug27341_hlrsave.brep] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/poly_hlr/A4 b/tests/hlr/poly_hlr/A4
index 980d50d0bf..0de03cfc9e 100644
--- a/tests/hlr/poly_hlr/A4
+++ b/tests/hlr/poly_hlr/A4
@@ -1,12 +1,10 @@
-puts "TODO OCC30286 ALL: Error : The length of result shape is 7.4452, expected 7.39488"
-
 puts "====================================="
 puts "OCC27341: Incorrect exact HLR results"
 puts "====================================="
 puts ""
 
 set viewname "vfront"
-set length 7.39488
+set length 7.44519
 
 restore [locate_data_file bug27341_hlrsave.brep] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/poly_hlr/A5 b/tests/hlr/poly_hlr/A5
index 3423f470fa..cc97120f42 100644
--- a/tests/hlr/poly_hlr/A5
+++ b/tests/hlr/poly_hlr/A5
@@ -1,12 +1,10 @@
-puts "TODO OCC30286 ALL: Error : The length of result shape is 9.08401, expected 9.47163"
-
 puts "====================================="
 puts "OCC27341: Incorrect exact HLR results"
 puts "====================================="
 puts ""
 
 set viewname "vback"
-set length 9.47163
+set length 9.11406
 
 restore [locate_data_file bug27341_hlrsave.brep] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/poly_hlr/B4 b/tests/hlr/poly_hlr/B4
index dbeb4d7fe4..3030a1c4ab 100644
--- a/tests/hlr/poly_hlr/B4
+++ b/tests/hlr/poly_hlr/B4
@@ -4,7 +4,7 @@ puts "====================================="
 puts ""
 
 set viewname "vfront"
-set length 361.581
+set length 361.577
 
 restore [locate_data_file bug27341_save.brep] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/poly_hlr/B5 b/tests/hlr/poly_hlr/B5
index 92d6717309..2bb66fd09d 100644
--- a/tests/hlr/poly_hlr/B5
+++ b/tests/hlr/poly_hlr/B5
@@ -4,7 +4,7 @@ puts "====================================="
 puts ""
 
 set viewname "vback"
-set length 430.037
+set length 430.034
 
 restore [locate_data_file bug27341_save.brep] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/poly_hlr/C1 b/tests/hlr/poly_hlr/C1
index 2952d87b19..95f1aedcc6 100644
--- a/tests/hlr/poly_hlr/C1
+++ b/tests/hlr/poly_hlr/C1
@@ -1,7 +1,5 @@
-puts "TODO OCC30286 Linux: Error : The length of result shape is 1021.54, expected 1021.47"
-
 set viewname "vright"
-set length 1021.47
+set length 1021.54
 
 testreadstep [locate_data_file bug27341_15.3020_16B1_B3=90.stp] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/poly_hlr/C16 b/tests/hlr/poly_hlr/C16
index 4c2ecbe5c2..4e8492acdc 100644
--- a/tests/hlr/poly_hlr/C16
+++ b/tests/hlr/poly_hlr/C16
@@ -1,5 +1,5 @@
 set viewname "vright"
-set length 1662.85
+set length 1662.83
 
 testreadstep [locate_data_file bug27341_CCS_Adapter_CAD.stp] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/poly_hlr/C20 b/tests/hlr/poly_hlr/C20
index 14bf820c30..23e520b991 100644
--- a/tests/hlr/poly_hlr/C20
+++ b/tests/hlr/poly_hlr/C20
@@ -1,5 +1,5 @@
 set viewname "vright"
-set length 1705.48
+set length 1705.49
 
 testreadstep [locate_data_file bug27341_Drehkopf_HSK_Gewinde_R_CAD.stp] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/poly_hlr/C21 b/tests/hlr/poly_hlr/C21
index 86da278502..f9b743cebd 100644
--- a/tests/hlr/poly_hlr/C21
+++ b/tests/hlr/poly_hlr/C21
@@ -1,5 +1,5 @@
 set viewname "vright"
-set length 949.199
+set length 949.207
 
 testreadstep [locate_data_file bug27341_Einsatz_BILZ_SEK_BFA_CAD.stp] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/poly_hlr/C23 b/tests/hlr/poly_hlr/C23
index 7651d0d8fa..7c8896765f 100644
--- a/tests/hlr/poly_hlr/C23
+++ b/tests/hlr/poly_hlr/C23
@@ -1,5 +1,5 @@
 set viewname "vright"
-set length 829.419
+set length 829.408
 
 testreadstep [locate_data_file bug27341_KMM_Adapter_CAD.stp] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/hlr/poly_hlr/bug27719_103 b/tests/hlr/poly_hlr/bug27719_103
index 03581f9274..d509251760 100644
--- a/tests/hlr/poly_hlr/bug27719_103
+++ b/tests/hlr/poly_hlr/bug27719_103
@@ -4,7 +4,7 @@ puts "====================================="
 puts ""
 
 set viewname "vbottom"
-set length 6.14989
+set length 6.1499
 
 restore [locate_data_file bug27719_Extruded.brep] a
 COMPUTE_HLR $viewname $algotype
diff --git a/tests/lowalgos/intss/bug24472 b/tests/lowalgos/intss/bug24472
index 57f0002ba1..9802e72b7a 100644
--- a/tests/lowalgos/intss/bug24472
+++ b/tests/lowalgos/intss/bug24472
@@ -7,7 +7,8 @@ puts ""
 ###############################
 
 puts "TODO OCC29501 All: Error: The curve ii13_20 is possible"
-puts "TODO OCC29501 All: Error: The curve ii13_48 is possible"
+puts "TODO OCC29501 All: Error: The curve ii13_44 is possible"
+puts "TODO OCC00000 All: Error in ii13_23"
 
 pload QAcommands
 
diff --git a/tests/lowalgos/intss/bug27263 b/tests/lowalgos/intss/bug27263
index 9471b1eb4d..7f85c05456 100644
--- a/tests/lowalgos/intss/bug27263
+++ b/tests/lowalgos/intss/bug27263
@@ -6,6 +6,10 @@ puts ""
 # Regression vs 6.9.1: Exception is raised during intersection of two faces
 #######################################################################
 
+puts "TODO OCC0000 All: Error: Curve Number is bad!"
+puts "TODO OCC0000 All: Error : The length of result shape is"
+puts "TODO OCC0000 All: Error: The command cannot be"
+
 set MaxTol 1.e-7
 set GoodNbCurv 2
 
diff --git a/tests/lowalgos/intss/bug27856_2 b/tests/lowalgos/intss/bug27856_2
index aabc7a1671..28f1b692ce 100644
--- a/tests/lowalgos/intss/bug27856_2
+++ b/tests/lowalgos/intss/bug27856_2
@@ -23,7 +23,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_1_2 b_2_2
 if {${NbCurv} != 1} {
   puts "Error: Number of curves is bad!"
 }
-checkreal TolReached $Toler 0.00026207823091004516 0.0 1.0e-3
+checkreal TolReached $Toler 0.0019402874538672552 0.0 1.0e-3
 
 # ----
 
@@ -33,7 +33,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_1_4 b_2_4
 if {${NbCurv} != 1} {
   puts "Error: Number of curves is bad!"
 }
-checkreal TolReached $Toler 6.5053102894636701e-005 0.0 1.0e-2
+checkreal TolReached $Toler 0.0019402958403320187 0.0 1.0e-2
 
 # ----
 
@@ -50,7 +50,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_3_2 b_4_2
 if {${NbCurv} != 1} {
   puts "Error: Number of curves is bad!"
 }
-checkreal TolReached $Toler 0.00029706239430643614 0.0 1.0e-3
+checkreal TolReached $Toler 0.0019070933103572988 0.0 1.0e-3
 
 # ----
 
@@ -60,7 +60,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_3_4 b_4_4
 if {${NbCurv} != 1} {
   puts "Error: Number of curves is bad!"
 }
-checkreal TolReached $Toler 0.00029242389138280588 0.0 1.0e-3
+checkreal TolReached $Toler 0.001907090520819725 0.0 1.0e-3
 
 # ----
 
@@ -77,7 +77,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_5_2 b_6_2
 if {${NbCurv} != 1} {
   puts "Error: Number of curves is bad!"
 }
-checkreal TolReached $Toler 1.4980089259007279e-005 0.0 1.0e-2
+checkreal TolReached $Toler 0.0019429479255849997 0.0 1.0e-2
 
 # ----
 
@@ -87,7 +87,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_5_4 b_6_4
 if {${NbCurv} != 1} {
   puts "Error: Number of curves is bad!"
 }
-checkreal TolReached $Toler 0.00023417493528435788 0.0 1.0e-3
+checkreal TolReached $Toler 0.0019429479300056185 0.0 1.0e-3
 
 # ----
 
@@ -104,7 +104,7 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_7_2 b_8_2
 if {${NbCurv} != 1} {
   puts "Error: Number of curves is bad!"
 }
-checkreal TolReached $Toler 0.00027445924390073518 0.0 1.0e-3
+checkreal TolReached $Toler 0.0019375708718761943 0.0 1.0e-3
 
 # ----
 
@@ -114,5 +114,5 @@ regexp {Tolerance Reached=+([-0-9.+eE]+)\n+([-0-9.+eE]+)} [bopcurves b_7_4 b_8_4
 if {${NbCurv} != 1} {
   puts "Error: Number of curves is bad!"
 }
-checkreal TolReached $Toler 1.867918118939262e-005 0.0 1.0e-2
+checkreal TolReached $Toler 0.0019375767762598165 0.0 1.0e-2
 
diff --git a/tests/mesh/data/advanced/A1 b/tests/mesh/data/advanced/A1
index 5163ecd769..89a6842b6a 100755
--- a/tests/mesh/data/advanced/A1
+++ b/tests/mesh/data/advanced/A1
@@ -4,9 +4,11 @@ set TheFileName shading_018.brep
 set bug_freenodes "OCC22687"
 set nbfreenodes(All) 88
 if { [string compare $command "shading"] == 0 } {
-  set nbfreenodes(All) 34
-  set rel_tol 0.2366831658635133
+  set nbfreenodes(All) 28
+  set rel_tol 1.1979229811120014
   set max_rel_tol_diff 0.001
+  set bug_async "OCC0000"
+  set nbasync(All) 3
 }
 ###if { [string compare $command "mesh"] != 0 } {
 ###   set bug_freenodes "OCC22687"
diff --git a/tests/mesh/data/standard/B9 b/tests/mesh/data/standard/B9
index f8b78618dd..394899bf6e 100755
--- a/tests/mesh/data/standard/B9
+++ b/tests/mesh/data/standard/B9
@@ -4,9 +4,11 @@ set TheFileName shading_018.brep
 set bug_freenodes "OCC22687"
 set nbfreenodes(All) 88
 if { [string compare $command "shading"] == 0 } {
-  set nbfreenodes(All) 34
-  set rel_tol 0.2366831658635133
+  set nbfreenodes(All) 28
+  set rel_tol 1.1979229811120014
   set max_rel_tol_diff 0.001
+  set bug_async "OCC0000"
+  set nbasync(All) 3
 }
 ###if { [string compare $command "shading"] == 0 } {
 ###   set bug_freenodes "OCC22687"
diff --git a/tests/mesh/data/standard/W4 b/tests/mesh/data/standard/W4
index 27a5a9d25e..a1d2960f5c 100755
--- a/tests/mesh/data/standard/W4
+++ b/tests/mesh/data/standard/W4
@@ -4,15 +4,15 @@ set bug_cross "OCC22687"
 set nbcross(All) 1
 set bug_area "OCC22687"
 set bug_freenodes "OCC22687"
-set bug_withouttri "OCC22687"
 set nbwithouttri(ALL) 1
 if { [string compare $command "shading"] == 0 } {
   set rel_tol 1.2
+  set nbfreenodes(ALL) 33
 ##set nbwithouttri(ALL) 6
-  set nbfreenodes(ALL) 1
 ##set bug_freelinks "OCC22687"
 ##set nbfree(ALL) 2
 } else {
+  set bug_withouttri "OCC22687"
   set nbfreenodes(ALL) 2
 ##set nbwithouttri(ALL) 5
 }
diff --git a/tests/mesh/data/standard/W6 b/tests/mesh/data/standard/W6
index 8de8ecc13d..26082ce744 100755
--- a/tests/mesh/data/standard/W6
+++ b/tests/mesh/data/standard/W6
@@ -1,6 +1,6 @@
 set TheFileName shading_wrongshape_026.brep
 if { [string compare $command "shading"] == 0 } {
-  set rel_tol 0.1487107687729918
+  set rel_tol 0.141793517530139
 } else {
   set rel_tol 0.0020125629706199506
 }
diff --git a/tests/metadata/gltf/A6 b/tests/metadata/gltf/A6
index 62fbe8e9c4..9d118268b6 100644
--- a/tests/metadata/gltf/A6
+++ b/tests/metadata/gltf/A6
@@ -4,7 +4,7 @@ set ref_size 17176
 set check_metadata 1
 set ref_metadata {Property for [0:1:1:1]:
 OUT_MASS : 50.813477444850157
-RELIEF_DIA : 21.005800000000001
+RELIEF_DIA : 21.005799999999997
 HELIX_LENGTH : 0
 OUT_OAL : 78.049999999992593
 HELIX_START : 0
@@ -17,7 +17,7 @@ THEO_BLADE_DIA : 11.074400000000001
 BODY_DIA : 0
 DRILL_DEPTH : 47.625
 SHANK_SIZE : 16
-FLUTE_LENGTH : 42.468800000000002
+FLUTE_LENGTH : 42.468799999999995
 OUT_SHANK_DIA : 15.999999999999501
 PRIORITY : 0
 OUT_DRILL_DEPTH : 44.754800000000003
diff --git a/tests/metadata/step/A2 b/tests/metadata/step/A2
index 21f49a5bba..fa2bb85cf5 100644
--- a/tests/metadata/step/A2
+++ b/tests/metadata/step/A2
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 set filename bug28389_CONFIDENTIAL_SHEET_METAL_F3D.stp
-set ref_size 980255
+set ref_size 979859
 set check_metadata 1
 set ref_metadata {Property for [0:1:1:1]:
 yCenterOfGravity : 0.1148447698
diff --git a/tests/offset/bugs/bug27913 b/tests/offset/bugs/bug27913
index ba6c2dc606..f847b12ae9 100644
--- a/tests/offset/bugs/bug27913
+++ b/tests/offset/bugs/bug27913
@@ -1,5 +1,3 @@
-puts "TODO OCC111111 ALL: Error :  is WRONG because number of "
-
 puts "=============================================================="
 puts "0027913: Sharing between edges was lost after offset operation"
 puts "=============================================================="
diff --git a/tests/perf/modalg/bug25742_1 b/tests/perf/modalg/bug25742_1
index c39337b673..a0ee6b1f29 100644
--- a/tests/perf/modalg/bug25742_1
+++ b/tests/perf/modalg/bug25742_1
@@ -25,14 +25,14 @@ checkshape result
 set nbshapes_expected "
 Number of shapes in shape
  VERTEX    : 14
- EDGE      : 24
- WIRE      : 11
- FACE      : 10
+ EDGE      : 23
+ WIRE      : 10
+ FACE      : 9
  SHELL     : 1
  SOLID     : 0
  COMPSOLID : 0
  COMPOUND  : 1
- SHAPE     : 61
+ SHAPE     : 58
 "
 checknbshapes result -ref "${nbshapes_expected}" -t -m "Partition of 2 shapes"
 checkview -display result -3d -path ${imagedir}/${test_image}.png