diff --git a/tests/3rdparty/fonts/B1 b/tests/3rdparty/fonts/B1
index f30ae58203..1a310f26f5 100644
--- a/tests/3rdparty/fonts/B1
+++ b/tests/3rdparty/fonts/B1
@@ -1,3 +1,7 @@
+puts "TODO ?OCC12345 Debian60-64: \\*\\* Exception \\*\\*.*"
+puts "TODO ?OCC12345 Debian60-64: An exception was caught"
+puts "TODO ?OCC12345 Debian60-64: TEST INCOMPLETE"
+
 puts "============"
 puts "OCC24181 Render text as BRep"
 puts "============"
diff --git a/tests/blend/bfuseblend/A7 b/tests/blend/bfuseblend/A7
index 22cd83d6a9..f94f50a10a 100644
--- a/tests/blend/bfuseblend/A7
+++ b/tests/blend/bfuseblend/A7
@@ -1,5 +1,3 @@
-puts "TODO ?DEBUG_OCC24121 Windows: TEST INCOMPLETE"
-
 box b -20 -20 -20 40 40 20
 ellipse w 0 0 0 10 5
 mkedge w w
diff --git a/tests/blend/tolblend_simple/C9 b/tests/blend/tolblend_simple/C9
index bc3daab143..b4029adcb5 100644
--- a/tests/blend/tolblend_simple/C9
+++ b/tests/blend/tolblend_simple/C9
@@ -1,6 +1,6 @@
 puts "TODO ?OCC22817 All:An exception was caught"
 puts "TODO ?OCC22817 All:\\*\\* Exception \\*\\*"
-puts "TODO OCC22817 All:TEST INCOMPLETE"
+puts "TODO ?OCC22817 All:TEST INCOMPLETE"
 
 restore [locate_data_file CFI_11_d2ffd.rle]  s
 tscale s 0 0 0 SCALE1 
diff --git a/tests/blend/tolblend_simple/F5 b/tests/blend/tolblend_simple/F5
index 219b8e9d90..9f82df7be5 100644
--- a/tests/blend/tolblend_simple/F5
+++ b/tests/blend/tolblend_simple/F5
@@ -1,6 +1,6 @@
 puts "TODO ?OCC22817 All:An exception was caught"
 puts "TODO ?OCC22817 All:\\*\\* Exception \\*\\*"
-puts "TODO OCC22817 All:TEST INCOMPLETE"
+puts "TODO ?OCC22817 All:TEST INCOMPLETE"
 
 restore [locate_data_file CFI_13_c1ffk.rle] s
 tscale s 0 0 0 SCALE1
diff --git a/tests/blend/tolblend_simple/F6 b/tests/blend/tolblend_simple/F6
index d6ed47027c..6dab7b7beb 100644
--- a/tests/blend/tolblend_simple/F6
+++ b/tests/blend/tolblend_simple/F6
@@ -1,6 +1,6 @@
 puts "TODO ?OCC22817 All:An exception was caught"
 puts "TODO ?OCC22817 All:\\*\\* Exception \\*\\*"
-puts "TODO OCC22817 All:TEST INCOMPLETE"
+puts "TODO ?OCC22817 All:TEST INCOMPLETE"
 
 restore [locate_data_file CFI_13_c1ffk.rle] s
 tscale s 0 0 0 SCALE1
diff --git a/tests/blend/tolblend_simple/F9 b/tests/blend/tolblend_simple/F9
index 3e84285aec..dfa2c7085b 100644
--- a/tests/blend/tolblend_simple/F9
+++ b/tests/blend/tolblend_simple/F9
@@ -1,6 +1,6 @@
 puts "TODO ?OCC22817 All:An exception was caught"
 puts "TODO ?OCC22817 All:\\*\\* Exception \\*\\*"
-puts "TODO OCC22817 All:TEST INCOMPLETE"
+puts "TODO ?OCC22817 All:TEST INCOMPLETE"
 
 restore [locate_data_file CFI_13_e1ffm.rle] s
 tscale s 0 0 0 SCALE1
diff --git a/tests/blend/tolblend_simple/G1 b/tests/blend/tolblend_simple/G1
index b2e1330599..dc5b3c7ea6 100644
--- a/tests/blend/tolblend_simple/G1
+++ b/tests/blend/tolblend_simple/G1
@@ -1,6 +1,6 @@
 puts "TODO ?OCC22817 All:An exception was caught"
 puts "TODO ?OCC22817 All:\\*\\* Exception \\*\\*"
-puts "TODO OCC22817 All:TEST INCOMPLETE"
+puts "TODO ?OCC22817 All:TEST INCOMPLETE"
 
 restore [locate_data_file CFI_13_e1ffm.rle] s
 tscale s 0 0 0 SCALE1
diff --git a/tests/boolean/bcut_complex/P6 b/tests/boolean/bcut_complex/P6
index a3f1f32917..f8bdcc4e02 100644
--- a/tests/boolean/bcut_complex/P6
+++ b/tests/boolean/bcut_complex/P6
@@ -1,8 +1,6 @@
 ## fra60813
 puts "TODO #22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO #22911 ALL: Error : The area of the resulting shape is"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
 
 restore [locate_data_file CTO909_Bug3_Tr_obj.rle] a
 restore [locate_data_file Bug4_Tr_outil.rle] b
diff --git a/tests/boolean/bfuse_complex/F8 b/tests/boolean/bfuse_complex/F8
index 44c1024627..712e5356db 100644
--- a/tests/boolean/bfuse_complex/F8
+++ b/tests/boolean/bfuse_complex/F8
@@ -1,4 +1,3 @@
-puts "TODO ?OCC24136 ALL: Faulty shapes in variables faulty_1 to faulty_"
 
 # Original bug : pro12913
 # Date : 24mar98
diff --git a/tests/boolean/bfuse_complex/R9 b/tests/boolean/bfuse_complex/R9
index 2a595539da..3b522b4d1a 100644
--- a/tests/boolean/bfuse_complex/R9
+++ b/tests/boolean/bfuse_complex/R9
@@ -5,8 +5,6 @@ puts "PRO18457"
 puts "Fuse"
 puts ""
 
-puts "TODO ?OCC22911 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC22911 ALL: Error : The area of the resulting shape is"
 
 restore [locate_data_file pro18457a.rle] f1
 restore [locate_data_file pro18457b.rle] f2
diff --git a/tests/boolean/bopfuse_simple/ZP6 b/tests/boolean/bopfuse_simple/ZP6
index f66cff8bbb..2dfec97171 100755
--- a/tests/boolean/bopfuse_simple/ZP6
+++ b/tests/boolean/bopfuse_simple/ZP6
@@ -1,5 +1,3 @@
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Error : The area of the resulting shape is"
 
 #
 # *10603
@@ -17,6 +15,9 @@ if {[string compare $os "Debian50-64"] != 0 && [string compare $os "Debian60-64"
   if { [string compare $os "Mandriva2010" ] == 0 } {
     set inst "?"
   }
+  if { [string compare $os "MacOS" ] == 0 } {
+    set inst "?"
+  }
   # CR23404
   puts "TODO ${inst}#22911 ${os}: Faulty shapes in variables faulty_1 to faulty_"
 }
@@ -29,7 +30,6 @@ if {  [string compare $os "CentOS55-64"] == 0
   ||  [string compare $os "SL51-64"] == 0 
   ||  [string compare $os "windows"] == 0 
 } {
-  puts "TODO ?OCC22911 $os: Error : The area of the resulting shape is"
 }
 
 ptorus a0 100 20
diff --git a/tests/boolean/bsection/G5 b/tests/boolean/bsection/G5
index 9a205e5101..52ae2047ee 100644
--- a/tests/boolean/bsection/G5
+++ b/tests/boolean/bsection/G5
@@ -1,5 +1,3 @@
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
 
 restore [locate_data_file a67] a
 restore [locate_data_file b67] b
diff --git a/tests/boolean/bsection/M5 b/tests/boolean/bsection/M5
index 4ac13fbba0..2a093780aa 100644
--- a/tests/boolean/bsection/M5
+++ b/tests/boolean/bsection/M5
@@ -1,7 +1,3 @@
-puts "TODO ?CR23797 ALL: An exception was caught"
-puts "TODO ?CR23797 ALL: \\*\\* Exception"
-puts "TODO ?CR23797 ALL: Tcl Exception"
-puts "TODO ?CR23797 ALL: TEST INCOMPLETE"
 
 restore [locate_data_file GEN776_nofog.rle] a
 explode a
diff --git a/tests/boolean/bsection/M8 b/tests/boolean/bsection/M8
index db92b82ebe..614264a2c9 100644
--- a/tests/boolean/bsection/M8
+++ b/tests/boolean/bsection/M8
@@ -1,6 +1,3 @@
-#puts "TODO DEBUG_OCC24121 Debian60-64: Process killed by CPU limit"
-#puts "TODO DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
-
 restore [locate_data_file lh3d_px1.brep] a
 
 #removing intersection of faces a_3 and a_220
diff --git a/tests/boolean/bsection/M9 b/tests/boolean/bsection/M9
index 4b297381a6..ba5db053a2 100644
--- a/tests/boolean/bsection/M9
+++ b/tests/boolean/bsection/M9
@@ -1,6 +1,3 @@
-#puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Process killed by CPU limit"
-#puts "TODO DEBUG_OCC24121 Debian60-64 Windows: TEST INCOMPLETE"
-
 restore [locate_data_file lh3d_px1.brep] a
 
 #removing intersection of faces a_3 and a_220
diff --git a/tests/boolean/bsection/N4 b/tests/boolean/bsection/N4
index 81e3d1aa6f..15992ca796 100644
--- a/tests/boolean/bsection/N4
+++ b/tests/boolean/bsection/N4
@@ -1,6 +1,3 @@
-#puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Process killed by CPU limit"
-#puts "TODO DEBUG_OCC24121 Debian60-64 Windows: TEST INCOMPLETE"
-
 #puts "TODO #23749 ALL: Faulty shapes in variables faulty_1 to faulty_"
 
 cpulimit 3500
diff --git a/tests/bugs/modalg_1/bug13209_1 b/tests/bugs/modalg_1/bug13209_1
index 8c0acba07e..e42f64f226 100755
--- a/tests/bugs/modalg_1/bug13209_1
+++ b/tests/bugs/modalg_1/bug13209_1
@@ -2,7 +2,6 @@ puts "============"
 puts "OCC13209"
 puts "============"
 puts ""
-puts "TODO ?OCC23878 MacOS: Error : Result shape is WRONG"
 #######################################################################
 # Exception is raised while performing boolean operations
 #######################################################################
diff --git a/tests/bugs/modalg_1/bug13209_3 b/tests/bugs/modalg_1/bug13209_3
index a1910703c0..e9d940df67 100755
--- a/tests/bugs/modalg_1/bug13209_3
+++ b/tests/bugs/modalg_1/bug13209_3
@@ -2,7 +2,6 @@ puts "============"
 puts "OCC13209"
 puts "============"
 puts ""
-puts "TODO ?OCC23878 MacOS: Error : Result shape is WRONG"
 #######################################################################
 # Exception is raised while performing boolean operations
 #######################################################################
diff --git a/tests/bugs/modalg_1/bug13211_2 b/tests/bugs/modalg_1/bug13211_2
index 9e78307060..34ae8b3695 100755
--- a/tests/bugs/modalg_1/bug13211_2
+++ b/tests/bugs/modalg_1/bug13211_2
@@ -1,4 +1,3 @@
-puts "TODO ?OCC12345 ALL: Error : Result shape is WRONG"
 puts "============"
 puts "OCC13211"
 puts "============"
diff --git a/tests/bugs/modalg_1/bug13211_4 b/tests/bugs/modalg_1/bug13211_4
index d8c09f7a02..7560ae7d03 100755
--- a/tests/bugs/modalg_1/bug13211_4
+++ b/tests/bugs/modalg_1/bug13211_4
@@ -1,4 +1,3 @@
-puts "TODO ?OCC12345 ALL: Error : Result shape is WRONG"
 puts "============"
 puts "OCC13211"
 puts "============"
diff --git a/tests/bugs/modalg_1/bug13211_7 b/tests/bugs/modalg_1/bug13211_7
index 4b60778141..0ddedf9843 100755
--- a/tests/bugs/modalg_1/bug13211_7
+++ b/tests/bugs/modalg_1/bug13211_7
@@ -1,4 +1,3 @@
-puts "TODO ?OCC24156 MacOS: Error : Result shape is WRONG"
 
 puts "============"
 puts "OCC13211"
diff --git a/tests/bugs/modalg_1/bug13211_9 b/tests/bugs/modalg_1/bug13211_9
index 0109aa255b..bd6ce9b78a 100755
--- a/tests/bugs/modalg_1/bug13211_9
+++ b/tests/bugs/modalg_1/bug13211_9
@@ -1,4 +1,3 @@
-puts "TODO ?OCC24156 MacOS: Error : Result shape is WRONG"
 
 puts "============"
 puts "OCC13211"
diff --git a/tests/bugs/modalg_1/bug1477_11 b/tests/bugs/modalg_1/bug1477_11
index 3dda566007..327f18844a 100755
--- a/tests/bugs/modalg_1/bug1477_11
+++ b/tests/bugs/modalg_1/bug1477_11
@@ -1,8 +1,3 @@
-puts "TODO ?OCC11111 ALL: An exception was caught"
-puts "TODO ?OCC11111 ALL: \\*\\* Exception"
-puts "TODO ?OCC11111 ALL: Faulty OCC1477"
-puts "TODO ?OCC11111 ALL: Tcl Exception"
-puts "TODO ?OCC11111 ALL: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC1477"
diff --git a/tests/bugs/modalg_1/bug165_6 b/tests/bugs/modalg_1/bug165_6
index 316aa57be0..4202a0040c 100755
--- a/tests/bugs/modalg_1/bug165_6
+++ b/tests/bugs/modalg_1/bug165_6
@@ -1,8 +1,3 @@
-puts "TODO ?OCC11111 ALL: An exception was caught"
-puts "TODO ?OCC11111 ALL: \\*\\* Exception"
-puts "TODO ?OCC11111 ALL: Error: Offset is not done."
-puts "TODO ?OCC11111 ALL: Faulty OCC165"
-puts "TODO ?OCC11111 ALL: Error : The length of result shape is"
 
 cpulimit 600
 
diff --git a/tests/bugs/modalg_2/bug23367_2 b/tests/bugs/modalg_2/bug23367_2
index 4f61f1d859..e5b6ad9b63 100755
--- a/tests/bugs/modalg_2/bug23367_2
+++ b/tests/bugs/modalg_2/bug23367_2
@@ -2,7 +2,6 @@ puts "============"
 puts "CR23367"
 puts "============"
 puts ""
-puts "TODO ?OCC453 MacOS: Error : The square of result shape is"
 puts "TODO OCC24156 MacOS: Error : The length of result shape is"
 ##########################################################################################################
 # New functionality restoring the middle path of pipe-like shape
diff --git a/tests/bugs/modalg_2/bug399 b/tests/bugs/modalg_2/bug399
index 4858b91cdd..d081334e72 100755
--- a/tests/bugs/modalg_2/bug399
+++ b/tests/bugs/modalg_2/bug399
@@ -2,8 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_2"
-   puts "TODO ?OCC12345 ALL: Faulty OCC399: Command checkshape works wrongly: Source shape is invalid but this shape must be OK"
 ### by apn master 16.12.2012
 ###   puts "TODO OCC12345 ALL: Error : The square of result shape is"
 }
diff --git a/tests/bugs/modalg_2/bug5805_21 b/tests/bugs/modalg_2/bug5805_21
index d3d4fb9cb3..aae753c6e3 100755
--- a/tests/bugs/modalg_2/bug5805_21
+++ b/tests/bugs/modalg_2/bug5805_21
@@ -1,4 +1,3 @@
-puts "TODO ?OCC11111 ALL: Error : The square of result shape is"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_22 b/tests/bugs/modalg_2/bug5805_22
index 20d01407a6..25171dfad9 100755
--- a/tests/bugs/modalg_2/bug5805_22
+++ b/tests/bugs/modalg_2/bug5805_22
@@ -1,4 +1,3 @@
-puts "TODO ?OCC11111 ALL: Error : The square of result shape is"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_23 b/tests/bugs/modalg_2/bug5805_23
index 0995e525e2..93d858dca4 100755
--- a/tests/bugs/modalg_2/bug5805_23
+++ b/tests/bugs/modalg_2/bug5805_23
@@ -1,4 +1,3 @@
-puts "TODO ?OCC11111 ALL: Error : The square of result shape is"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_24 b/tests/bugs/modalg_2/bug5805_24
index d3c2632ab9..7cd02e9f4a 100755
--- a/tests/bugs/modalg_2/bug5805_24
+++ b/tests/bugs/modalg_2/bug5805_24
@@ -1,4 +1,3 @@
-puts "TODO ?OCC11111 ALL: Error : The square of result shape is"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_47 b/tests/bugs/modalg_2/bug5805_47
index 7d985b55fb..de23a88c52 100755
--- a/tests/bugs/modalg_2/bug5805_47
+++ b/tests/bugs/modalg_2/bug5805_47
@@ -1,4 +1,3 @@
-puts "TODO ?OCC11111 ALL: Error : The square of result shape is"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_48 b/tests/bugs/modalg_2/bug5805_48
index 267c6571c0..886259e7b4 100755
--- a/tests/bugs/modalg_2/bug5805_48
+++ b/tests/bugs/modalg_2/bug5805_48
@@ -1,4 +1,3 @@
-puts "TODO ?OCC11111 ALL: Error : The square of result shape is"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_3/bug600 b/tests/bugs/modalg_3/bug600
index 4c1f33453b..0a925607cd 100755
--- a/tests/bugs/modalg_3/bug600
+++ b/tests/bugs/modalg_3/bug600
@@ -1,5 +1,3 @@
-puts "TODO ?OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC12345 ALL: Error : The square of result shape is"
 
 puts "========================"
 puts " OCC600"
diff --git a/tests/bugs/modalg_4/bug770 b/tests/bugs/modalg_4/bug770
index 6adcfab41c..59b9b774ee 100755
--- a/tests/bugs/modalg_4/bug770
+++ b/tests/bugs/modalg_4/bug770
@@ -1,8 +1,3 @@
-puts "TODO ?OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC12345 ALL: An exception was caught"
-puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-puts "TODO ?OCC12345 ALL: Error : The square of result shape is"
-puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 
 puts "========"
 puts "OCC770"
diff --git a/tests/bugs/modalg_4/bug8842_15 b/tests/bugs/modalg_4/bug8842_15
index e2ffd8de7a..d952a8916d 100755
--- a/tests/bugs/modalg_4/bug8842_15
+++ b/tests/bugs/modalg_4/bug8842_15
@@ -1,6 +1,3 @@
-puts "TODO ?OCC11111 ALL: OCC8842: Faulty"
-puts "TODO ?OCC11111 ALL: \\*\\* Exception"
-puts "TODO ?OCC11111 ALL: An exception was caught"
 
 puts "============"
 puts "OCC8842"
diff --git a/tests/bugs/modalg_5/bug23952_1 b/tests/bugs/modalg_5/bug23952_1
index 98e8f57a69..8cadf3b8b0 100644
--- a/tests/bugs/modalg_5/bug23952_1
+++ b/tests/bugs/modalg_5/bug23952_1
@@ -1,5 +1,5 @@
-puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*"
-puts "TODO OCC24156 MacOS: An exception was caught"
+puts "TODO ?OCC24156 MacOS: \\*\\* Exception \\*\\*.*"
+puts "TODO ?OCC24156 MacOS: An exception was caught"
 puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
 puts "TODO OCC24156 MacOS: \\*\\*\\* Abort"
 puts "TODO OCC24156 MacOS: ... The exception is"
diff --git a/tests/bugs/modalg_5/bug24005 b/tests/bugs/modalg_5/bug24005
index edf42ecfcd..3e0bc23543 100755
--- a/tests/bugs/modalg_5/bug24005
+++ b/tests/bugs/modalg_5/bug24005
@@ -19,7 +19,7 @@ set q [dchrono h show]
 regexp {CPU user time: ([-0-9.+eE]+) seconds} $q full z
 puts "$z"
 
-set max_time 0.3
+set max_time 0.4
 if { $z > ${max_time} } {                                         
     puts "Elapsed time is more than ${max_time} seconds - Faulty"
 } else {
diff --git a/tests/bugs/moddata_1/bug16119 b/tests/bugs/moddata_1/bug16119
index a72a779a9e..43330f18ec 100755
--- a/tests/bugs/moddata_1/bug16119
+++ b/tests/bugs/moddata_1/bug16119
@@ -1,4 +1,3 @@
-puts "TODO ?OCC12345 ALL: OCC16119: Faulty"
 puts "============"
 puts "OCC16119"
 puts "============"
diff --git a/tests/bugs/moddata_1/bug165_2 b/tests/bugs/moddata_1/bug165_2
index 3c24b22644..3f8f4c2bd4 100755
--- a/tests/bugs/moddata_1/bug165_2
+++ b/tests/bugs/moddata_1/bug165_2
@@ -1,7 +1,3 @@
-puts "TODO ?OCC12345 ALL: An exception was caught"
-puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-puts "TODO ?OCC23748 ALL: Error: Offset is not done."
-puts "TODO ?OCC12345 ALL: OCC165 Faulty"
 
 puts "========"
 puts "OCC165"
diff --git a/tests/bugs/moddata_1/bug22623 b/tests/bugs/moddata_1/bug22623
index 0c28310dc5..8d7addae25 100755
--- a/tests/bugs/moddata_1/bug22623
+++ b/tests/bugs/moddata_1/bug22623
@@ -1,6 +1,3 @@
-puts "TODO ?#22623 ALL: \\*\\* Exception"
-puts "TODO ?#22623 ALL: An exception was caught"
-puts "TODO ?#22623 ALL: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC22623"
diff --git a/tests/bugs/moddata_1/bug22757 b/tests/bugs/moddata_1/bug22757
index ce600f365e..d9a248bcf5 100755
--- a/tests/bugs/moddata_1/bug22757
+++ b/tests/bugs/moddata_1/bug22757
@@ -1,6 +1,3 @@
-puts "TODO ?DEBUG_OCC24121 Windows: \\*\\* Exception \\*\\*.*"
-puts "TODO ?DEBUG_OCC24121 Windows: An exception was caught"
-puts "TODO ?DEBUG_OCC24121 Windows: Faulty OCC22757"
 
 puts "================"
 puts "OCC22757"
diff --git a/tests/bugs/moddata_1/bug54 b/tests/bugs/moddata_1/bug54
index 3536c317c2..816f9f2fa2 100755
--- a/tests/bugs/moddata_1/bug54
+++ b/tests/bugs/moddata_1/bug54
@@ -2,8 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 puts "TODO OCC12345 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC12345 ALL: Process killed by CPU limit"
-puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 puts "================"
 puts "OCC54"
 puts "================"
diff --git a/tests/bugs/moddata_2/bug956_1 b/tests/bugs/moddata_2/bug956_1
index 76fda06ebf..10edaf1033 100755
--- a/tests/bugs/moddata_2/bug956_1
+++ b/tests/bugs/moddata_2/bug956_1
@@ -1,4 +1,3 @@
-puts "TODO ?OCC12345 ALL: Faulty OCC956"
 
 puts "========="
 puts " OCC956 "
diff --git a/tests/bugs/moddata_2/bug956_2 b/tests/bugs/moddata_2/bug956_2
index 3e045b22cb..ddf1876fef 100755
--- a/tests/bugs/moddata_2/bug956_2
+++ b/tests/bugs/moddata_2/bug956_2
@@ -1,4 +1,3 @@
-puts "TODO ?OCC12345 ALL: Faulty OCC956"
 
 puts "========="
 puts " OCC956 "
diff --git a/tests/bugs/step/bug11856 b/tests/bugs/step/bug11856
index 516a8fb390..2882f915e5 100755
--- a/tests/bugs/step/bug11856
+++ b/tests/bugs/step/bug11856
@@ -1,4 +1,3 @@
-puts "TODO ?OCC12345 ALL: StepFile Error"
 
 puts "============"
 puts "OCC11856"
diff --git a/tests/bugs/vis/buc60574 b/tests/bugs/vis/buc60574
index 2934f0934c..b439537457 100755
--- a/tests/bugs/vis/buc60574
+++ b/tests/bugs/vis/buc60574
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "==========="
diff --git a/tests/bugs/vis/buc60632_1 b/tests/bugs/vis/buc60632_1
index 0016b34d4d..1dcf5dddc4 100755
--- a/tests/bugs/vis/buc60632_1
+++ b/tests/bugs/vis/buc60632_1
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "================"
diff --git a/tests/bugs/vis/buc60632_2 b/tests/bugs/vis/buc60632_2
index 606d90c313..ea6e9493b0 100755
--- a/tests/bugs/vis/buc60632_2
+++ b/tests/bugs/vis/buc60632_2
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "================"
diff --git a/tests/bugs/vis/bug137_10 b/tests/bugs/vis/bug137_10
index a900de813c..f6190bb8f7 100755
--- a/tests/bugs/vis/bug137_10
+++ b/tests/bugs/vis/bug137_10
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
    set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "================"
diff --git a/tests/bugs/vis/bug137_11 b/tests/bugs/vis/bug137_11
index 116a22f799..aa77b1a263 100755
--- a/tests/bugs/vis/bug137_11
+++ b/tests/bugs/vis/bug137_11
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
    set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "================"
diff --git a/tests/bugs/vis/bug137_2 b/tests/bugs/vis/bug137_2
index dc9ef02f3a..1a96189806 100755
--- a/tests/bugs/vis/bug137_2
+++ b/tests/bugs/vis/bug137_2
@@ -1,4 +1,3 @@
-puts "TODO ?OCC12345 ALL: Error : Colors are not equal in default coordinate and in the near coordinates too"
 
 puts "========================"
 puts "OCC137"
diff --git a/tests/bugs/vis/bug137_3 b/tests/bugs/vis/bug137_3
index bb25275125..056dd59bd5 100755
--- a/tests/bugs/vis/bug137_3
+++ b/tests/bugs/vis/bug137_3
@@ -1,4 +1,3 @@
-puts "TODO ?OCC12345 ALL: Error : Colors are not equal in default coordinate and in the near coordinates too"
 
 puts "========================"
 puts "OCC137"
diff --git a/tests/bugs/vis/bug137_4 b/tests/bugs/vis/bug137_4
index 07d9359725..1c0ec98ac8 100755
--- a/tests/bugs/vis/bug137_4
+++ b/tests/bugs/vis/bug137_4
@@ -1,4 +1,3 @@
-puts "TODO ?OCC12345 ALL: Error : Colors are not equal in default coordinate and in the near coordinates too"
 
 puts "========================"
 puts "OCC137"
diff --git a/tests/bugs/vis/bug137_5 b/tests/bugs/vis/bug137_5
index ac953126bf..21b232ed75 100755
--- a/tests/bugs/vis/bug137_5
+++ b/tests/bugs/vis/bug137_5
@@ -1,4 +1,3 @@
-puts "TODO ?OCC12345 ALL: Error : Colors are not equal in default coordinate and in the near coordinates too"
 
 puts "========================"
 puts "OCC137"
diff --git a/tests/bugs/vis/bug137_9 b/tests/bugs/vis/bug137_9
index a5b9d89e4b..9d0f72c9ea 100755
--- a/tests/bugs/vis/bug137_9
+++ b/tests/bugs/vis/bug137_9
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
    set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "================"
diff --git a/tests/bugs/vis/bug21747_8 b/tests/bugs/vis/bug21747_8
index 9ced128a88..65d1edbc34 100755
--- a/tests/bugs/vis/bug21747_8
+++ b/tests/bugs/vis/bug21747_8
@@ -1,6 +1,3 @@
-puts "TODO ?OCC12345 ALL: An exception was caught"
-puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 puts "============"
 puts "OCC21747"
 puts "============"
diff --git a/tests/bugs/vis/bug21747_9 b/tests/bugs/vis/bug21747_9
index b71fa92d80..bbf7dba592 100755
--- a/tests/bugs/vis/bug21747_9
+++ b/tests/bugs/vis/bug21747_9
@@ -1,6 +1,3 @@
-puts "TODO ?OCC12345 ALL: An exception was caught"
-puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 puts "============"
 puts "OCC21747"
 puts "============"
diff --git a/tests/bugs/vis/bug22849 b/tests/bugs/vis/bug22849
index f70dc3698a..fb6e4a1e88 100755
--- a/tests/bugs/vis/bug22849
+++ b/tests/bugs/vis/bug22849
@@ -1,4 +1,3 @@
-puts "TODO ?OCC11111 ALL: Faulty OCC22849"
 puts "TODO DEBUG_OCC24121 Debian60-64 Windows: Warning: ShapeFix_Solid::SolidFromShell: Exception"
 
 puts "============"
diff --git a/tests/bugs/vis/bug22906 b/tests/bugs/vis/bug22906
index 81d7a905ce..47a91e60f5 100755
--- a/tests/bugs/vis/bug22906
+++ b/tests/bugs/vis/bug22906
@@ -1,6 +1,3 @@
-puts "TODO ?OCC11111 ALL: An exception was caught"
-puts "TODO ?OCC11111 ALL: \\*\\* Exception"
-puts "TODO ?OCC11111 ALL: TEST INCOMPLETE"
 
 puts "================"
 puts "OCC22906"
diff --git a/tests/bugs/vis/bug23539_2 b/tests/bugs/vis/bug23539_2
index 65d90a6da2..a7c3ce6116 100644
--- a/tests/bugs/vis/bug23539_2
+++ b/tests/bugs/vis/bug23539_2
@@ -1,6 +1,3 @@
-puts "TODO ?OCC12345 ALL: An exception was caught"
-puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 
 
 puts "============"
diff --git a/tests/bugs/vis/bug597_1 b/tests/bugs/vis/bug597_1
index b964c21dab..a2539ec6da 100755
--- a/tests/bugs/vis/bug597_1
+++ b/tests/bugs/vis/bug597_1
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="
diff --git a/tests/bugs/vis/bug597_2 b/tests/bugs/vis/bug597_2
index c849c1941d..f49ae714b3 100755
--- a/tests/bugs/vis/bug597_2
+++ b/tests/bugs/vis/bug597_2
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="
diff --git a/tests/bugs/vis/bug597_3 b/tests/bugs/vis/bug597_3
index 7d85648eff..aaa5f40cb4 100755
--- a/tests/bugs/vis/bug597_3
+++ b/tests/bugs/vis/bug597_3
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="
diff --git a/tests/bugs/vis/bug597_4 b/tests/bugs/vis/bug597_4
index 13e6d29e22..3299f92111 100755
--- a/tests/bugs/vis/bug597_4
+++ b/tests/bugs/vis/bug597_4
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="
diff --git a/tests/bugs/vis/bug597_5 b/tests/bugs/vis/bug597_5
index e53d41f4e6..b93c0150ee 100755
--- a/tests/bugs/vis/bug597_5
+++ b/tests/bugs/vis/bug597_5
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="
diff --git a/tests/bugs/vis/bug597_6 b/tests/bugs/vis/bug597_6
index 1b0a8094fb..66084cffec 100755
--- a/tests/bugs/vis/bug597_6
+++ b/tests/bugs/vis/bug597_6
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 puts "=================================="
diff --git a/tests/bugs/vis/bug597_7 b/tests/bugs/vis/bug597_7
index 244c209106..76339a0c25 100755
--- a/tests/bugs/vis/bug597_7
+++ b/tests/bugs/vis/bug597_7
@@ -2,9 +2,6 @@ if { [array get env os_type] != "" } {
     set os $env(os_type)
 }
 if { [string compare $os "windows"] != 0 } {
-   puts "TODO ?OCC12345 ALL: An exception was caught"
-   puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-   puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 
diff --git a/tests/bugs/vis/bug64 b/tests/bugs/vis/bug64
index af499fd043..6dd2c1bdb6 100755
--- a/tests/bugs/vis/bug64
+++ b/tests/bugs/vis/bug64
@@ -1,3 +1,5 @@
+puts "TODO ?OCC12345 MacOS: Error : Colors are not equal"
+
 puts "================"
 puts "BUC61018"
 puts "OCC64"
diff --git a/tests/bugs/vis/bug74 b/tests/bugs/vis/bug74
index b1582aeb27..a6894fc0b6 100755
--- a/tests/bugs/vis/bug74
+++ b/tests/bugs/vis/bug74
@@ -1,7 +1,3 @@
-puts "TODO ?OCC12345 ALL: An exception was caught"
-puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
-puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
-puts "TODO ?OCC12345 ALL: Colors are not equal in default coordinate and in the near coordinates too"
 
 puts "================"
 puts "OCC74"
diff --git a/tests/bugs/xde/bug184 b/tests/bugs/xde/bug184
index 3c13195f1a..86592104d5 100755
--- a/tests/bugs/xde/bug184
+++ b/tests/bugs/xde/bug184
@@ -54,14 +54,14 @@ if { ${nb_v2} != ${nb_v1}
     || ${nb_f2} != ${nb_f1} 
     || ${nb_sh2} != ${nb_sh1} 
     || ${nb_sol2} != ${nb_sol1} 
-    || ${nb_compsol2} != ${nb_compsol2} 
+    || ${nb_compsol2} != ${nb_compsol1} 
     || ${nb_compound2} != ${nb_compound1} 
-    || ${nb_shape2} != ${nb_shape2} } {
+    || ${nb_shape2} != ${nb_shape1} } {
     puts "Error : Number of shapes is faulty"
 }
 
 if { ${square2} != ${square1} } {
-   puts "Error : "Square is not valid"
+   puts "Error : Square is not valid"
 }
 
 set 2dviewer 0
diff --git a/tests/de/step_5/A6 b/tests/de/step_5/A6
index 148b66716e..22f986d6cd 100644
--- a/tests/de/step_5/A6
+++ b/tests/de/step_5/A6
@@ -1,5 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO ?OCC24048 ALL: Error : 1 differences with reference data found"
 set filename r1001_ac.stp
 
 set ref_data {
diff --git a/tests/de/step_5/B3 b/tests/de/step_5/B3
index 82b9a857eb..ec9416e52c 100644
--- a/tests/de/step_5/B3
+++ b/tests/de/step_5/B3
@@ -1,6 +1,4 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO ?OCC24048 ALL: NBSHAPES : Faulty"
-puts "TODO ?OCC24048 ALL: Error : 4 differences with reference data found"
 set filename tr10_r1001_ac.stp
 
 set ref_data {
diff --git a/tests/draft/angle/E5 b/tests/draft/angle/E5
index 5d74189b1b..d6a0f6bc5d 100644
--- a/tests/draft/angle/E5
+++ b/tests/draft/angle/E5
@@ -1,7 +1,5 @@
-puts "TODO ?OCC23667 Mandriva2010: Faulty shapes in variables faulty_1 to faulty_"
 
 #C2----------------------------------------------
-puts "TODO ?OCC23211 Debian40: Error: The tolerance of result shape is too big"
 
 plane p 0 0 0 1 0 0 0 0 -1
 pcone p p 15 18 20
diff --git a/tests/heal/data/advanced/C6 b/tests/heal/data/advanced/C6
index 20ebe59445..b473c5d84b 100644
--- a/tests/heal/data/advanced/C6
+++ b/tests/heal/data/advanced/C6
@@ -1,5 +1,4 @@
 if {[string compare $command "SplitAngle"] == 0 } {
-    puts "TODO ?OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2 "
 }
 restore [locate_data_file FRA61952.rle] a
 
diff --git a/tests/heal/data/advanced/C8 b/tests/heal/data/advanced/C8
index 02422dceb9..dde4ae8b91 100644
--- a/tests/heal/data/advanced/C8
+++ b/tests/heal/data/advanced/C8
@@ -1,5 +1,4 @@
 if {[string compare $command "SplitAngle"] == 0 } {
-    puts "TODO ?OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_4 "
 }
 restore [locate_data_file FRA61955.rle] a
 
diff --git a/tests/heal/data/advanced/D2 b/tests/heal/data/advanced/D2
index 60f390f716..ad441d3ade 100644
--- a/tests/heal/data/advanced/D2
+++ b/tests/heal/data/advanced/D2
@@ -1,5 +1,4 @@
 if {[string compare $command "SplitAngle"] == 0 } {
-    puts "TODO ?OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_10 "
 }
 restore [locate_data_file FRA61958.rle] a
 
diff --git a/tests/heal/data/advanced/R7 b/tests/heal/data/advanced/R7
index 40321dd319..23171fa77b 100644
--- a/tests/heal/data/advanced/R7
+++ b/tests/heal/data/advanced/R7
@@ -1,5 +1,3 @@
-puts "TODO ?DEBUG_OCC24121 Debian60-64: Process killed by COU limit"
-puts "TODO ?DEBUG_OCC24121 Debian60-64: TEST INCOMPLETE"
 
 restore [locate_data_file CTO909_Bug3_Tr_obj.rle] a
 
diff --git a/tests/heal/data/advanced/V7 b/tests/heal/data/advanced/V7
index c4aba27612..0eb8c7500b 100644
--- a/tests/heal/data/advanced/V7
+++ b/tests/heal/data/advanced/V7
@@ -1,5 +1,4 @@
 if {[string compare $command "SplitAngle"] == 0 } {
-    puts "TODO ?DEBUG_OCC24121 Windows: Faulty shapes in variables faulty_1 to faulty_"
 }
 
 restore [locate_data_file CONTOUR-VITRE.brep] a
diff --git a/tests/heal/data/advanced/ZF1 b/tests/heal/data/advanced/ZF1
index fddef1abbb..d382115be1 100644
--- a/tests/heal/data/advanced/ZF1
+++ b/tests/heal/data/advanced/ZF1
@@ -8,7 +8,6 @@ if {[string compare $command "SplitAngle"] == 0 } {
 	||  [string compare $os "Mandriva2008"] == 0
 	||  [string compare $os "Mandriva2010"] == 0
        } {
-  puts "TODO ?OCC23127 $os: Faulty shapes in variables faulty_1 to faulty_2"
     }
 }
 
diff --git a/tests/heal/data/advanced/ZF2 b/tests/heal/data/advanced/ZF2
index 4d1cb5c72b..948a8bbabc 100644
--- a/tests/heal/data/advanced/ZF2
+++ b/tests/heal/data/advanced/ZF2
@@ -8,7 +8,6 @@ if {[string compare $command "SplitAngle"] == 0 } {
 	||  [string compare $os "Mandriva2008"] == 0
 	||  [string compare $os "Mandriva2010"] == 0
        } {
-  puts "TODO ?OCC23127 $os: Faulty shapes in variables faulty_1 to faulty_2"
     }
 }
 
diff --git a/tests/heal/surface_to_bspline/A1 b/tests/heal/surface_to_bspline/A1
index 67f65c993d..c517f6616e 100644
--- a/tests/heal/surface_to_bspline/A1
+++ b/tests/heal/surface_to_bspline/A1
@@ -1,5 +1,3 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2"
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file aaa.rle] a
diff --git a/tests/heal/surface_to_bspline/A2 b/tests/heal/surface_to_bspline/A2
index 6869bc9a31..8ac56da1d1 100644
--- a/tests/heal/surface_to_bspline/A2
+++ b/tests/heal/surface_to_bspline/A2
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file BoxAndConeFS.rle] a
diff --git a/tests/heal/surface_to_bspline/A5 b/tests/heal/surface_to_bspline/A5
index 03df3d76de..eaa4327b29 100644
--- a/tests/heal/surface_to_bspline/A5
+++ b/tests/heal/surface_to_bspline/A5
@@ -1,5 +1,3 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_1"
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file cc.rle] a
diff --git a/tests/heal/surface_to_bspline/A6 b/tests/heal/surface_to_bspline/A6
index 194a248f23..4619e78d02 100644
--- a/tests/heal/surface_to_bspline/A6
+++ b/tests/heal/surface_to_bspline/A6
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CCH_coco1.rle] a
diff --git a/tests/heal/surface_to_bspline/A7 b/tests/heal/surface_to_bspline/A7
index 93545609f6..33bfb0f4ef 100644
--- a/tests/heal/surface_to_bspline/A7
+++ b/tests/heal/surface_to_bspline/A7
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CCH_testkhes.rle] a
diff --git a/tests/heal/surface_to_bspline/A9 b/tests/heal/surface_to_bspline/A9
index ed24de4dcf..b7a0ebb46c 100644
--- a/tests/heal/surface_to_bspline/A9
+++ b/tests/heal/surface_to_bspline/A9
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CFE900_ger50gdb.rle] a
diff --git a/tests/heal/surface_to_bspline/B1 b/tests/heal/surface_to_bspline/B1
index 5353b51155..937393a534 100644
--- a/tests/heal/surface_to_bspline/B1
+++ b/tests/heal/surface_to_bspline/B1
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CFE901_cts21gft.rle] a
diff --git a/tests/heal/surface_to_bspline/B2 b/tests/heal/surface_to_bspline/B2
index 011a26882d..9716894326 100644
--- a/tests/heal/surface_to_bspline/B2
+++ b/tests/heal/surface_to_bspline/B2
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CFI_5_l12fgq.rle] a
diff --git a/tests/heal/surface_to_bspline/B3 b/tests/heal/surface_to_bspline/B3
index 4f2c372560..b4b55a39eb 100644
--- a/tests/heal/surface_to_bspline/B3
+++ b/tests/heal/surface_to_bspline/B3
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CFI_6_g56fhe.rle] a
diff --git a/tests/heal/surface_to_bspline/B5 b/tests/heal/surface_to_bspline/B5
index 5f921eaab3..e14c28f568 100644
--- a/tests/heal/surface_to_bspline/B5
+++ b/tests/heal/surface_to_bspline/B5
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CFI_cfi90fjb.rle] a
diff --git a/tests/heal/surface_to_bspline/B7 b/tests/heal/surface_to_bspline/B7
index cae7874a57..0ba60c6804 100644
--- a/tests/heal/surface_to_bspline/B7
+++ b/tests/heal/surface_to_bspline/B7
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CFI_g1234fio.rle] a
diff --git a/tests/heal/surface_to_bspline/B8 b/tests/heal/surface_to_bspline/B8
index 076739c06a..88468bf64f 100644
--- a/tests/heal/surface_to_bspline/B8
+++ b/tests/heal/surface_to_bspline/B8
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CFI_g5678fip.rle] a
diff --git a/tests/heal/surface_to_bspline/B9 b/tests/heal/surface_to_bspline/B9
index edd001e558..6a73a26704 100644
--- a/tests/heal/surface_to_bspline/B9
+++ b/tests/heal/surface_to_bspline/B9
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CFI_n12__fiw.rle] a
diff --git a/tests/heal/surface_to_bspline/C1 b/tests/heal/surface_to_bspline/C1
index 1e3a0d73c9..de7e7e7537 100644
--- a/tests/heal/surface_to_bspline/C1
+++ b/tests/heal/surface_to_bspline/C1
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CFI_o12__fix.rle] a
diff --git a/tests/heal/surface_to_bspline/C5 b/tests/heal/surface_to_bspline/C5
index 5ca046918e..36e84fbd41 100644
--- a/tests/heal/surface_to_bspline/C5
+++ b/tests/heal/surface_to_bspline/C5
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CFI_pro5807.rle] a
diff --git a/tests/heal/surface_to_bspline/C6 b/tests/heal/surface_to_bspline/C6
index 1c91276b58..5cc41ec2e6 100644
--- a/tests/heal/surface_to_bspline/C6
+++ b/tests/heal/surface_to_bspline/C6
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CFI_pro9480.rle] a
diff --git a/tests/heal/surface_to_bspline/C7 b/tests/heal/surface_to_bspline/C7
index e33f5c5bfd..75ee2947c9 100644
--- a/tests/heal/surface_to_bspline/C7
+++ b/tests/heal/surface_to_bspline/C7
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CHE_cc4.rle] a
diff --git a/tests/heal/surface_to_bspline/D1 b/tests/heal/surface_to_bspline/D1
index 6e3acc3df7..2a44340d25 100644
--- a/tests/heal/surface_to_bspline/D1
+++ b/tests/heal/surface_to_bspline/D1
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CTO900_buc60127-part.rle] a
diff --git a/tests/heal/surface_to_bspline/D2 b/tests/heal/surface_to_bspline/D2
index 8a74867dbd..7eb6a0bbbd 100644
--- a/tests/heal/surface_to_bspline/D2
+++ b/tests/heal/surface_to_bspline/D2
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CTO900_cts18078-part.rle] a
diff --git a/tests/heal/surface_to_bspline/D3 b/tests/heal/surface_to_bspline/D3
index 33c3c6b7fc..76e230162c 100644
--- a/tests/heal/surface_to_bspline/D3
+++ b/tests/heal/surface_to_bspline/D3
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CTO900_cts60005a.rle] a
diff --git a/tests/heal/surface_to_bspline/D4 b/tests/heal/surface_to_bspline/D4
index 424204391d..453b89ebff 100644
--- a/tests/heal/surface_to_bspline/D4
+++ b/tests/heal/surface_to_bspline/D4
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CTO900_ger60039a.rle] a
diff --git a/tests/heal/surface_to_bspline/D5 b/tests/heal/surface_to_bspline/D5
index ca3872999e..730e4d0f6d 100644
--- a/tests/heal/surface_to_bspline/D5
+++ b/tests/heal/surface_to_bspline/D5
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CTO900_ger60041a.rle] a
diff --git a/tests/heal/surface_to_bspline/D6 b/tests/heal/surface_to_bspline/D6
index 7bbecb4978..6046a93494 100644
--- a/tests/heal/surface_to_bspline/D6
+++ b/tests/heal/surface_to_bspline/D6
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CTO900_ger60054a.rle] a
diff --git a/tests/heal/surface_to_bspline/D7 b/tests/heal/surface_to_bspline/D7
index f3d662ea8b..3182473304 100644
--- a/tests/heal/surface_to_bspline/D7
+++ b/tests/heal/surface_to_bspline/D7
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CTS18683.rle] a
diff --git a/tests/heal/surface_to_bspline/D8 b/tests/heal/surface_to_bspline/D8
index d150bdeae7..0d6574308c 100644
--- a/tests/heal/surface_to_bspline/D8
+++ b/tests/heal/surface_to_bspline/D8
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file CTS18826.rle] a
diff --git a/tests/heal/surface_to_bspline/E2 b/tests/heal/surface_to_bspline/E2
index c035ddfe20..68f2212e64 100644
--- a/tests/heal/surface_to_bspline/E2
+++ b/tests/heal/surface_to_bspline/E2
@@ -1,5 +1,3 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2"
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file DSE3.rle] a
diff --git a/tests/heal/surface_to_bspline/E3 b/tests/heal/surface_to_bspline/E3
index b7b7c67cab..d4a9f571a0 100644
--- a/tests/heal/surface_to_bspline/E3
+++ b/tests/heal/surface_to_bspline/E3
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file DSEwithTol1.rle] a
diff --git a/tests/heal/surface_to_bspline/E5 b/tests/heal/surface_to_bspline/E5
index 1ecb511e62..fc6d3c4ee4 100644
--- a/tests/heal/surface_to_bspline/E5
+++ b/tests/heal/surface_to_bspline/E5
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file RevolutionFG.rle] a
diff --git a/tests/heal/surface_to_bspline/E7 b/tests/heal/surface_to_bspline/E7
index fd02b5e467..07d789bf13 100644
--- a/tests/heal/surface_to_bspline/E7
+++ b/tests/heal/surface_to_bspline/E7
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file newFS.rle] a
diff --git a/tests/heal/surface_to_bspline/E8 b/tests/heal/surface_to_bspline/E8
index f08c5e1f12..1ddb4b7836 100644
--- a/tests/heal/surface_to_bspline/E8
+++ b/tests/heal/surface_to_bspline/E8
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file pcpc2_FS_FG.rle] a
diff --git a/tests/heal/surface_to_bspline/E9 b/tests/heal/surface_to_bspline/E9
index ff9c3e619c..2f4ed0b01a 100644
--- a/tests/heal/surface_to_bspline/E9
+++ b/tests/heal/surface_to_bspline/E9
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file PRO10066.rle] a
diff --git a/tests/heal/surface_to_bspline/F1 b/tests/heal/surface_to_bspline/F1
index 1ecb511e62..fc6d3c4ee4 100644
--- a/tests/heal/surface_to_bspline/F1
+++ b/tests/heal/surface_to_bspline/F1
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file RevolutionFG.rle] a
diff --git a/tests/heal/surface_to_bspline/F2 b/tests/heal/surface_to_bspline/F2
index f5f4809e80..baec327d29 100644
--- a/tests/heal/surface_to_bspline/F2
+++ b/tests/heal/surface_to_bspline/F2
@@ -1,5 +1,3 @@
 puts "TODO OCC23127 ALL: Faulty shapes in variables faulty_1 to faulty_2"
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file rrr.rle] a
diff --git a/tests/heal/surface_to_bspline/F4 b/tests/heal/surface_to_bspline/F4
index a455f57bd0..d549e7f705 100644
--- a/tests/heal/surface_to_bspline/F4
+++ b/tests/heal/surface_to_bspline/F4
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file shell_orient.rle] a
diff --git a/tests/heal/surface_to_bspline/F5 b/tests/heal/surface_to_bspline/F5
index 70efcd7f52..18dd382644 100644
--- a/tests/heal/surface_to_bspline/F5
+++ b/tests/heal/surface_to_bspline/F5
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file spheraDSE.rle] a
diff --git a/tests/heal/surface_to_bspline/F7 b/tests/heal/surface_to_bspline/F7
index 74b958a8af..53d6298009 100644
--- a/tests/heal/surface_to_bspline/F7
+++ b/tests/heal/surface_to_bspline/F7
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file bottle.brep] a
diff --git a/tests/heal/surface_to_bspline/F8 b/tests/heal/surface_to_bspline/F8
index ee08fd56e6..3f92354235 100644
--- a/tests/heal/surface_to_bspline/F8
+++ b/tests/heal/surface_to_bspline/F8
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file bowl_noremove.brep] a
diff --git a/tests/heal/surface_to_bspline/G2 b/tests/heal/surface_to_bspline/G2
index 343ae5692c..275eb8f47d 100644
--- a/tests/heal/surface_to_bspline/G2
+++ b/tests/heal/surface_to_bspline/G2
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file Fourche7corrige.brep] a
diff --git a/tests/heal/surface_to_bspline/G3 b/tests/heal/surface_to_bspline/G3
index 526faceb29..a23e5c68b7 100644
--- a/tests/heal/surface_to_bspline/G3
+++ b/tests/heal/surface_to_bspline/G3
@@ -1,4 +1,2 @@
-puts "TODO ?OCC24156 MacOS: Process killed by CPU limit"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 
 restore [locate_data_file hammer.brep] a
diff --git a/tests/offset/faces_type_i/D7 b/tests/offset/faces_type_i/D7
index 266c6ed125..714bf409df 100644
--- a/tests/offset/faces_type_i/D7
+++ b/tests/offset/faces_type_i/D7
@@ -1,6 +1,3 @@
-puts "TODO ?OCC23068 Mandriva2010: Error: bsection of the result and s is not equal to zero"
-puts "TODO ?OCC23068 Mandriva2010: Error : The volume of the resulting shape "
-puts "TODO ?OCC23068 Mandriva2010: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*"
 puts "TODO OCC24156 MacOS: An exception was caught"
 puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
diff --git a/tests/offset/faces_type_i/G5 b/tests/offset/faces_type_i/G5
index 40602d1bde..782dbceb02 100644
--- a/tests/offset/faces_type_i/G5
+++ b/tests/offset/faces_type_i/G5
@@ -1,11 +1,6 @@
 puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*"
 puts "TODO OCC24156 MacOS: An exception was caught"
 puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO ?OCC23068 ALL: Error : The offset is not valid"
-puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape "
-puts "TODO ?OCC23748 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC23748 ALL: Tcl Exception: ERROR.offsetperform operation not done."
-puts "TODO ?OCC23748 ALL: TEST INCOMPLETE"
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
diff --git a/tests/offset/shape_type_a/A4 b/tests/offset/shape_type_a/A4
index 1484655365..7038c3aa1e 100755
--- a/tests/offset/shape_type_a/A4
+++ b/tests/offset/shape_type_a/A4
@@ -1,5 +1,3 @@
-puts "TODO ?OCC23086 ALL: Error : The offset is not valid. The volume is 0."
-puts "TODO ?OCC23086 ALL: Error : The volume of the resulting shape is"
 
 pcone s 10 5 20
 
diff --git a/tests/offset/shape_type_i/D6 b/tests/offset/shape_type_i/D6
index 8e47719f89..c0cd818f47 100755
--- a/tests/offset/shape_type_i/D6
+++ b/tests/offset/shape_type_i/D6
@@ -1,8 +1,6 @@
 puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*"
 puts "TODO OCC24156 MacOS: An exception was caught"
 puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO ?OCC23068 Mandriva2010: Error: bsection of the result and s is not equal to zero"
-puts "TODO ?OCC23068 Mandriva2010: Faulty shapes in variables faulty_1 to faulty_2"
 puts "TODO OCC23068 Mandriva2010: Error : The volume of the resulting shape"
 
 ellipse w1 0 0 0 15 10
diff --git a/tests/offset/shape_type_i/D7 b/tests/offset/shape_type_i/D7
index fc34c848d9..714bf409df 100755
--- a/tests/offset/shape_type_i/D7
+++ b/tests/offset/shape_type_i/D7
@@ -1,9 +1,6 @@
 puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*"
 puts "TODO OCC24156 MacOS: An exception was caught"
 puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO ?OCC23068 Mandriva2010: Error: bsection of the result and s is not equal to zero"
-puts "TODO ?OCC23068 Mandriva2010: Error : The volume of the resulting shape "
-puts "TODO ?OCC23068 Mandriva2010: Faulty shapes in variables faulty_1 to faulty_2"
 
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
diff --git a/tests/offset/wire_closed_outside_0_005/G7 b/tests/offset/wire_closed_outside_0_005/G7
index eacdca9a57..500f77f0a9 100755
--- a/tests/offset/wire_closed_outside_0_005/G7
+++ b/tests/offset/wire_closed_outside_0_005/G7
@@ -1,5 +1,3 @@
-puts "TODO ?OCC23068 ALL: Error : result is not a topological shape!!!"
-puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
 restore [locate_data_file offset_wire_084.brep] s
 
 set length 18.1766
diff --git a/tests/offset/wire_closed_outside_0_025/G5 b/tests/offset/wire_closed_outside_0_025/G5
index 8669a29435..1531e20666 100644
--- a/tests/offset/wire_closed_outside_0_025/G5
+++ b/tests/offset/wire_closed_outside_0_025/G5
@@ -1,7 +1,3 @@
-puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
-puts "TODO ?OCC23068 ALL: An exception was caught"
-puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
-puts "TODO ?OCC23748 ALL: Error: Offset is not done."
 
 restore [locate_data_file offset_wire_082.brep] s
 
diff --git a/tests/offset/wire_closed_outside_0_075/G5 b/tests/offset/wire_closed_outside_0_075/G5
index fa9cfcbafd..b48e5a3391 100644
--- a/tests/offset/wire_closed_outside_0_075/G5
+++ b/tests/offset/wire_closed_outside_0_075/G5
@@ -1,7 +1,3 @@
-puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
-puts "TODO ?OCC23068 ALL: An exception was caught"
-puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
-puts "TODO ?OCC23748 ALL: Error: Offset is not done."
 
 restore [locate_data_file offset_wire_082.brep] s
 
diff --git a/tests/offset/wire_closed_outside_0_075/I3 b/tests/offset/wire_closed_outside_0_075/I3
index 0ab223b7a8..255cbd29b4 100644
--- a/tests/offset/wire_closed_outside_0_075/I3
+++ b/tests/offset/wire_closed_outside_0_075/I3
@@ -6,8 +6,6 @@ if {[array get env os_type] != ""} {
 if {
         [string compare $os "Windows-32-VC8"] == 0
    } {
-  puts "TODO ?OCC23068 $os: An exception was caught"
-  puts "TODO ?OCC23068 $os: Error : The offset cannot be built."
 }
 
 restore [locate_data_file offset_wire_098.brep] s
diff --git a/tests/offset/wire_unclosed_outside_0_005/C3 b/tests/offset/wire_unclosed_outside_0_005/C3
index 5341199c3b..39b2ac4cd4 100755
--- a/tests/offset/wire_unclosed_outside_0_005/C3
+++ b/tests/offset/wire_unclosed_outside_0_005/C3
@@ -1,8 +1,5 @@
-#puts "TODO ?OCC23068 ALL: TEST INCOMPLETE"
 puts "TODO OCC23068 ALL: Error : The offset cannot be built."
 puts "TODO OCC23068 ALL: An exception was caught"
-#puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
-#puts "TODO ?OCC23068 ALL: Error : result is not a topological shape!!!"
 puts "TODO OCC23068 ALL: Error: Offset is not done."
 
 restore [locate_data_file offset_wire_074.brep] s
diff --git a/tests/offset/wire_unclosed_outside_0_005/C4 b/tests/offset/wire_unclosed_outside_0_005/C4
index 44b22e3f3e..d9025779ab 100644
--- a/tests/offset/wire_unclosed_outside_0_005/C4
+++ b/tests/offset/wire_unclosed_outside_0_005/C4
@@ -1,7 +1,3 @@
-#puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
-#puts "TODO ?OCC23068 ALL: An exception was caught"
-#puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
-#puts "TODO ?OCC23748 ALL: Error: Offset is not done."
 
 restore [locate_data_file offset_wire_075.brep] s
 
diff --git a/tests/offset/wire_unclosed_outside_0_025/C3 b/tests/offset/wire_unclosed_outside_0_025/C3
index 5341199c3b..39b2ac4cd4 100755
--- a/tests/offset/wire_unclosed_outside_0_025/C3
+++ b/tests/offset/wire_unclosed_outside_0_025/C3
@@ -1,8 +1,5 @@
-#puts "TODO ?OCC23068 ALL: TEST INCOMPLETE"
 puts "TODO OCC23068 ALL: Error : The offset cannot be built."
 puts "TODO OCC23068 ALL: An exception was caught"
-#puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
-#puts "TODO ?OCC23068 ALL: Error : result is not a topological shape!!!"
 puts "TODO OCC23068 ALL: Error: Offset is not done."
 
 restore [locate_data_file offset_wire_074.brep] s
diff --git a/tests/offset/wire_unclosed_outside_0_025/C4 b/tests/offset/wire_unclosed_outside_0_025/C4
index 164d122029..ddd9c94b46 100644
--- a/tests/offset/wire_unclosed_outside_0_025/C4
+++ b/tests/offset/wire_unclosed_outside_0_025/C4
@@ -1,7 +1,3 @@
-#puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
-#puts "TODO ?OCC23068 ALL: An exception was caught"
-#puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
-#puts "TODO ?OCC23748 ALL: Error: Offset is not done."
 
 restore [locate_data_file offset_wire_075.brep] s
 
diff --git a/tests/offset/wire_unclosed_outside_0_075/C3 b/tests/offset/wire_unclosed_outside_0_075/C3
index 5341199c3b..39b2ac4cd4 100755
--- a/tests/offset/wire_unclosed_outside_0_075/C3
+++ b/tests/offset/wire_unclosed_outside_0_075/C3
@@ -1,8 +1,5 @@
-#puts "TODO ?OCC23068 ALL: TEST INCOMPLETE"
 puts "TODO OCC23068 ALL: Error : The offset cannot be built."
 puts "TODO OCC23068 ALL: An exception was caught"
-#puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
-#puts "TODO ?OCC23068 ALL: Error : result is not a topological shape!!!"
 puts "TODO OCC23068 ALL: Error: Offset is not done."
 
 restore [locate_data_file offset_wire_074.brep] s
diff --git a/tests/offset/wire_unclosed_outside_0_075/C4 b/tests/offset/wire_unclosed_outside_0_075/C4
index db61e28fb5..b508c5a788 100644
--- a/tests/offset/wire_unclosed_outside_0_075/C4
+++ b/tests/offset/wire_unclosed_outside_0_075/C4
@@ -1,7 +1,3 @@
-#puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
-#puts "TODO ?OCC23068 ALL: An exception was caught"
-#puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
-#puts "TODO ?OCC23748 ALL: Error: Offset is not done."
 
 restore [locate_data_file offset_wire_075.brep] s
 
diff --git a/tests/xml/data/ocaf/A7 b/tests/xml/data/ocaf/A7
index 038c7634e5..c44b1a391d 100644
--- a/tests/xml/data/ocaf/A7
+++ b/tests/xml/data/ocaf/A7
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "ocaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-
 set aTestName "caf001-G3"
 puts ${aTestName}
 
diff --git a/tests/xml/data/ocaf/A8 b/tests/xml/data/ocaf/A8
index d9d8101927..c591f64b9d 100644
--- a/tests/xml/data/ocaf/A8
+++ b/tests/xml/data/ocaf/A8
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "ocaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "caf001-H3"
 puts ${aTestName}
 
diff --git a/tests/xml/data/ocaf/A9 b/tests/xml/data/ocaf/A9
index 9eb64b901d..60efd3d754 100644
--- a/tests/xml/data/ocaf/A9
+++ b/tests/xml/data/ocaf/A9
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "ocaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-
 set aTestName "caf001-I3"
 puts ${aTestName}
 
diff --git a/tests/xml/data/ocaf/C2 b/tests/xml/data/ocaf/C2
index 58da100d60..f6baedf877 100644
--- a/tests/xml/data/ocaf/C2
+++ b/tests/xml/data/ocaf/C2
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "ocaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "caf100-A1"
 puts ${aTestName}
 
diff --git a/tests/xml/data/ocaf/C3 b/tests/xml/data/ocaf/C3
index 9d22124255..1f9c69b35d 100644
--- a/tests/xml/data/ocaf/C3
+++ b/tests/xml/data/ocaf/C3
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "ocaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "caf100-B1"
 puts ${aTestName}
 
diff --git a/tests/xml/data/ocaf/C4 b/tests/xml/data/ocaf/C4
index a5d81152ac..96d0d8a65f 100644
--- a/tests/xml/data/ocaf/C4
+++ b/tests/xml/data/ocaf/C4
@@ -1,7 +1,3 @@
-if { [string compare $subgroup "ocaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-}
-    
 set aTestName "caf100-C1"
 puts ${aTestName}
 
diff --git a/tests/xml/data/ocaf/C5 b/tests/xml/data/ocaf/C5
index b6a5a2a8a3..2c81ef1418 100644
--- a/tests/xml/data/ocaf/C5
+++ b/tests/xml/data/ocaf/C5
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "ocaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "caf100-D1"
 puts ${aTestName}
 
diff --git a/tests/xml/data/ocaf/C7 b/tests/xml/data/ocaf/C7
index a9b76467de..217da9d51b 100644
--- a/tests/xml/data/ocaf/C7
+++ b/tests/xml/data/ocaf/C7
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "ocaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "caf100-P1"
 puts ${aTestName}
 
diff --git a/tests/xml/data/xcaf/A1 b/tests/xml/data/xcaf/A1
index 35134a7492..dc77004a3e 100644
--- a/tests/xml/data/xcaf/A1
+++ b/tests/xml/data/xcaf/A1
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "xcaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "xcaf200-A1"
 puts $aTestName
 
diff --git a/tests/xml/data/xcaf/A2 b/tests/xml/data/xcaf/A2
index b524c76e06..cf2dad54ba 100644
--- a/tests/xml/data/xcaf/A2
+++ b/tests/xml/data/xcaf/A2
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "xcaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "SATCOM"
 puts $aTestName
 
diff --git a/tests/xml/data/xcaf/A3 b/tests/xml/data/xcaf/A3
index cb5ab247dc..770cdcc0b1 100644
--- a/tests/xml/data/xcaf/A3
+++ b/tests/xml/data/xcaf/A3
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "xcaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "SATCOM1"
 puts $aTestName
 
diff --git a/tests/xml/data/xcaf/A4 b/tests/xml/data/xcaf/A4
index 6ce33c51a4..85c9b1f3b5 100644
--- a/tests/xml/data/xcaf/A4
+++ b/tests/xml/data/xcaf/A4
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "xcaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "xcaf200-C1"
 puts $aTestName
 
diff --git a/tests/xml/data/xcaf/A5 b/tests/xml/data/xcaf/A5
index bbb2673b8b..0a56cd0f40 100644
--- a/tests/xml/data/xcaf/A5
+++ b/tests/xml/data/xcaf/A5
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "xcaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "xcaf200-D1"
 puts $aTestName
 
diff --git a/tests/xml/data/xcaf/A6 b/tests/xml/data/xcaf/A6
index 33033d6f54..91567e0b13 100644
--- a/tests/xml/data/xcaf/A6
+++ b/tests/xml/data/xcaf/A6
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "xcaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 puts "============"
 puts "OCC16497"
 puts "============"
diff --git a/tests/xml/data/xcaf/A7 b/tests/xml/data/xcaf/A7
index e8a06ee801..599c33d672 100644
--- a/tests/xml/data/xcaf/A7
+++ b/tests/xml/data/xcaf/A7
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "xcaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "xcaf200-G1"
 puts $aTestName
 
diff --git a/tests/xml/data/xcaf/A8 b/tests/xml/data/xcaf/A8
index 2193cd541a..a2cb33b11b 100644
--- a/tests/xml/data/xcaf/A8
+++ b/tests/xml/data/xcaf/A8
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "xcaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "xcaf200-L1"
 puts $aTestName
 
diff --git a/tests/xml/data/xcaf/A9 b/tests/xml/data/xcaf/A9
index fa90d4df9d..bb6982ac2e 100644
--- a/tests/xml/data/xcaf/A9
+++ b/tests/xml/data/xcaf/A9
@@ -1,8 +1,3 @@
-if { [string compare $subgroup "xcaf_xml"] == 0 } {
-    puts "TODO ?OCC23768 ALL: Error : File is not valid"
-    puts "TODO ?OCC23768 ALL: Error at line"
-}
-    
 set aTestName "xcaf200-V1"
 puts $aTestName