diff --git a/tests/blend/complex/A2 b/tests/blend/complex/A2
index 6233845509..d5886eb119 100644
--- a/tests/blend/complex/A2
+++ b/tests/blend/complex/A2
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 ## ====================================
 ## Grid	   : CFI900
 ## Test    : A1
diff --git a/tests/blend/complex/A3 b/tests/blend/complex/A3
index 8e6fb1aa8c..e75b7d9bc4 100644
--- a/tests/blend/complex/A3
+++ b/tests/blend/complex/A3
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 ## ====================================
 ## Grid	   : CFI900
 ## Test    : B1
diff --git a/tests/blend/complex/B3 b/tests/blend/complex/B3
index 954e335890..132c97d242 100644
--- a/tests/blend/complex/B3
+++ b/tests/blend/complex/B3
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 ## ====================================
 ## Grid	   : CFI900
 ## Test    : E5
diff --git a/tests/blend/complex/C2 b/tests/blend/complex/C2
index 1106edf62d..44ffc7bc24 100644
--- a/tests/blend/complex/C2
+++ b/tests/blend/complex/C2
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 ## ====================================
 ## Grid	   : CFI900
 ## Test    : F7
diff --git a/tests/blend/complex/F6 b/tests/blend/complex/F6
index 6c95771e74..46ac0cb729 100644
--- a/tests/blend/complex/F6
+++ b/tests/blend/complex/F6
@@ -3,9 +3,7 @@
 ## Test    : K7
 ## Comment : from cts21020
 ## ====================================
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
 puts "TODO OCC22817 All: Faulty shapes in variables faulty_1 to faulty_"
-
 restore [locate_data_file CFI_cts21020.rle] a
 explode a e
 blend result a 0.05 a_8 0.05 a_10 0.05 a_9 0.05 a_5 0.05 a_3 0.05 a_1
diff --git a/tests/blend/encoderegularity/A6 b/tests/blend/encoderegularity/A6
index 97ead5485b..59663fa3b0 100644
--- a/tests/blend/encoderegularity/A6
+++ b/tests/blend/encoderegularity/A6
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI901_congefkd.rle] m
 explode m E
 encoderegularity m 3
diff --git a/tests/blend/simple/F5 b/tests/blend/simple/F5
index 2efe19e0f6..e26fd03eb2 100644
--- a/tests/blend/simple/F5
+++ b/tests/blend/simple/F5
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi
 polyline w2 -15 0 0 0 -5 0 15 0 0
diff --git a/tests/blend/simple/P7 b/tests/blend/simple/P7
index f7f470b1fd..143ef603ee 100644
--- a/tests/blend/simple/P7
+++ b/tests/blend/simple/P7
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #pcylinder s1 5 20
 #pcylinder s2 5 12 
 #ttranslate s2 5 0 3
diff --git a/tests/blend/simple/V7 b/tests/blend/simple/V7
index d50d4e9d3a..c86efea543 100644
--- a/tests/blend/simple/V7
+++ b/tests/blend/simple/V7
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file 8_J1.draw] s
 tscale s 0 0 0 SCALE
 explode s e
diff --git a/tests/blend/simple/W4 b/tests/blend/simple/W4
index 604d8d7b84..ffeb4cef36 100644
--- a/tests/blend/simple/W4
+++ b/tests/blend/simple/W4
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 ## ===========================================
 ## Grid    : CCV001
 ## Test    : C3
diff --git a/tests/blend/simple/X5 b/tests/blend/simple/X5
index 243e44b8bb..4e1cd3ba09 100644
--- a/tests/blend/simple/X5
+++ b/tests/blend/simple/X5
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 ## ===========================================
 ## Grid    : CCV001
 ## Test    : I1
diff --git a/tests/blend/simple/X8 b/tests/blend/simple/X8
index 4daaf96062..49a4ca3c0d 100644
--- a/tests/blend/simple/X8
+++ b/tests/blend/simple/X8
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 ## ===========================================
 ## Grid    : CCV001
 ## Test    : M1
diff --git a/tests/blend/tolblend_simple/A1 b/tests/blend/tolblend_simple/A1
index 772daa86a6..7362e35cd8 100644
--- a/tests/blend/tolblend_simple/A1
+++ b/tests/blend/tolblend_simple/A1
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 wedge s 10 7 10 5 5 5 5
 tscale s 0 0 0 SCALE1 
 explode s E
diff --git a/tests/blend/tolblend_simple/A2 b/tests/blend/tolblend_simple/A2
index c4a54afe21..f73e42098f 100644
--- a/tests/blend/tolblend_simple/A2
+++ b/tests/blend/tolblend_simple/A2
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 wedge s 10 7 10 5 5 5 5
 tscale s 0 0 0 SCALE1 
 explode s E
diff --git a/tests/blend/tolblend_simple/A3 b/tests/blend/tolblend_simple/A3
index fce53b36f2..9c00406237 100644
--- a/tests/blend/tolblend_simple/A3
+++ b/tests/blend/tolblend_simple/A3
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #polyline d 0 0 0  0 5 0 7 7 -1
 #polyline dd -5 0 -5  -5 0 5  5 0 5  5 0 -5 -5 0 -5
 #mkplane dd dd
diff --git a/tests/blend/tolblend_simple/A4 b/tests/blend/tolblend_simple/A4
index 92f444c629..278a59b8f7 100644
--- a/tests/blend/tolblend_simple/A4
+++ b/tests/blend/tolblend_simple/A4
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #polyline d 0 0 0  0 5 0 7 7 -1
 #polyline dd -5 0 -5  -5 0 5  5 0 5  5 0 -5 -5 0 -5
 #mkplane dd dd
diff --git a/tests/blend/tolblend_simple/A5 b/tests/blend/tolblend_simple/A5
index a45d516da5..2859d74e66 100644
--- a/tests/blend/tolblend_simple/A5
+++ b/tests/blend/tolblend_simple/A5
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_5_c12fgh.rle]  s
 tscale s 0 0 0 SCALE1 
 explode s E
diff --git a/tests/blend/tolblend_simple/A6 b/tests/blend/tolblend_simple/A6
index 148451919b..c6e721d4e4 100644
--- a/tests/blend/tolblend_simple/A6
+++ b/tests/blend/tolblend_simple/A6
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_5_c12fgh.rle]  s
 tscale s 0 0 0 SCALE1 
 explode s E
diff --git a/tests/blend/tolblend_simple/A7 b/tests/blend/tolblend_simple/A7
index 74ac85a1b1..6cd77ba39f 100644
--- a/tests/blend/tolblend_simple/A7
+++ b/tests/blend/tolblend_simple/A7
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #restore 5_L12.draw
 #explode 5_L12.draw F
 #sewing s 5_L12.draw_5 5_L12.draw_6 5_L12.draw_9 5_L12.draw_7 
diff --git a/tests/blend/tolblend_simple/A8 b/tests/blend/tolblend_simple/A8
index 1ad65b176a..0461d9ea34 100644
--- a/tests/blend/tolblend_simple/A8
+++ b/tests/blend/tolblend_simple/A8
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #restore 5_L12.draw
 #explode 5_L12.draw F
 #sewing s 5_L12.draw_5 5_L12.draw_6 5_L12.draw_9 5_L12.draw_7 
diff --git a/tests/blend/tolblend_simple/A9 b/tests/blend/tolblend_simple/A9
index 5de34cebbe..be9da7c079 100644
--- a/tests/blend/tolblend_simple/A9
+++ b/tests/blend/tolblend_simple/A9
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #wedge b 10 10 10 0 5 0 5
 #explode b f
 #depouille s1 b 1 0 0 b_5 15  0 0 10 5 0 0
diff --git a/tests/blend/tolblend_simple/B1 b/tests/blend/tolblend_simple/B1
index 364854c2f9..bb57536c40 100644
--- a/tests/blend/tolblend_simple/B1
+++ b/tests/blend/tolblend_simple/B1
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #wedge b 4 10 10 0 5 0 5
 #explode b f
 #depouille s1 b 1 0 0 b_5 30  0 0 10 5 0 0
diff --git a/tests/blend/tolblend_simple/B2 b/tests/blend/tolblend_simple/B2
index 72c776ee21..eb1dd997bb 100644
--- a/tests/blend/tolblend_simple/B2
+++ b/tests/blend/tolblend_simple/B2
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #wedge b 4 10 10 0 5 0 5
 #explode b f
 #depouille s1 b 1 0 0 b_5 30  0 0 10 5 0 0
diff --git a/tests/blend/tolblend_simple/B3 b/tests/blend/tolblend_simple/B3
index dc637c3395..9a7dfc75f6 100644
--- a/tests/blend/tolblend_simple/B3
+++ b/tests/blend/tolblend_simple/B3
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #box b 0 0 0 20 20 20
 #box b2 0 0 20 20 20 20
 #box b3 20 0 0 20 20 20
diff --git a/tests/blend/tolblend_simple/C5 b/tests/blend/tolblend_simple/C5
index 8cc962da96..d2387a337a 100644
--- a/tests/blend/tolblend_simple/C5
+++ b/tests/blend/tolblend_simple/C5
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_11_a2fex.rle]  s
 tscale s 0 0 0 SCALE1 
 explode s E 
diff --git a/tests/blend/tolblend_simple/D2 b/tests/blend/tolblend_simple/D2
index 31db0b5046..332ecf24a2 100644
--- a/tests/blend/tolblend_simple/D2
+++ b/tests/blend/tolblend_simple/D2
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_11_e2fff.rle]  s
 tscale s 0 0 0 SCALE1 
 explode s E 
diff --git a/tests/blend/tolblend_simple/D3 b/tests/blend/tolblend_simple/D3
index e3676ba657..836e09d2f8 100644
--- a/tests/blend/tolblend_simple/D3
+++ b/tests/blend/tolblend_simple/D3
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 wedge s 10 7 10 5 5 5 5
 tscale s 0 0 0 SCALE1 
 explode s E
diff --git a/tests/blend/tolblend_simple/D5 b/tests/blend/tolblend_simple/D5
index 27c3cf4579..8c135bdea6 100644
--- a/tests/blend/tolblend_simple/D5
+++ b/tests/blend/tolblend_simple/D5
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 wedge s 10 7 10 5 5 5 5
 tscale s 0 0 0 SCALE1 
 explode s E
diff --git a/tests/blend/tolblend_simple/D6 b/tests/blend/tolblend_simple/D6
index fa2e20a255..1da701c92e 100644
--- a/tests/blend/tolblend_simple/D6
+++ b/tests/blend/tolblend_simple/D6
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #polyline d 0 0 0  0 5 0 7 7 -1
 #polyline dd -5 0 -5  -5 0 5  5 0 5  5 0 -5 -5 0 -5
 #mkplane dd dd
diff --git a/tests/blend/tolblend_simple/D7 b/tests/blend/tolblend_simple/D7
index 6f976f6df3..5955301775 100644
--- a/tests/blend/tolblend_simple/D7
+++ b/tests/blend/tolblend_simple/D7
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #polyline d 0 0 0  0 5 0 7 7 -1
 #polyline dd -5 0 -5  -5 0 5  5 0 5  5 0 -5 -5 0 -5
 #mkplane dd dd
diff --git a/tests/blend/tolblend_simple/D8 b/tests/blend/tolblend_simple/D8
index 4ef6fd4550..ab217aa4e8 100644
--- a/tests/blend/tolblend_simple/D8
+++ b/tests/blend/tolblend_simple/D8
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #polyline d 0 0 0  0 5 0 7 7 -1
 #polyline dd -5 0 -5  -5 0 5  5 0 5  5 0 -5 -5 0 -5
 #mkplane dd dd
diff --git a/tests/blend/tolblend_simple/D9 b/tests/blend/tolblend_simple/D9
index 18fe6ca68f..18e57e0162 100644
--- a/tests/blend/tolblend_simple/D9
+++ b/tests/blend/tolblend_simple/D9
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_5_c12fgh.rle]  s
 tscale s 0 0 0 SCALE1 
 explode s E
diff --git a/tests/blend/tolblend_simple/E1 b/tests/blend/tolblend_simple/E1
index dae5936231..882807e137 100644
--- a/tests/blend/tolblend_simple/E1
+++ b/tests/blend/tolblend_simple/E1
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_5_c12fgh.rle]  s
 tscale s 0 0 0 SCALE1 
 explode s E
diff --git a/tests/blend/tolblend_simple/E2 b/tests/blend/tolblend_simple/E2
index 9207d2f9ae..4c11e89e64 100644
--- a/tests/blend/tolblend_simple/E2
+++ b/tests/blend/tolblend_simple/E2
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_5_c12fgh.rle]  s
 tscale s 0 0 0 SCALE1 
 explode s E
diff --git a/tests/blend/tolblend_simple/E3 b/tests/blend/tolblend_simple/E3
index fb00e6670b..42cef9974f 100644
--- a/tests/blend/tolblend_simple/E3
+++ b/tests/blend/tolblend_simple/E3
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #restore 5_L12.draw
 #explode 5_L12.draw F
 #sewing s 5_L12.draw_5 5_L12.draw_6 5_L12.draw_9 5_L12.draw_7 
diff --git a/tests/blend/tolblend_simple/E4 b/tests/blend/tolblend_simple/E4
index 5f57a0b685..e77ef742ab 100644
--- a/tests/blend/tolblend_simple/E4
+++ b/tests/blend/tolblend_simple/E4
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #restore 5_L12.draw
 #explode 5_L12.draw F
 #sewing s 5_L12.draw_5 5_L12.draw_6 5_L12.draw_9 5_L12.draw_7 
diff --git a/tests/blend/tolblend_simple/E5 b/tests/blend/tolblend_simple/E5
index 1b262955b8..9d921fbee0 100644
--- a/tests/blend/tolblend_simple/E5
+++ b/tests/blend/tolblend_simple/E5
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #restore 5_L12.draw
 #explode 5_L12.draw F
 #sewing s 5_L12.draw_5 5_L12.draw_6 5_L12.draw_9 5_L12.draw_7 
diff --git a/tests/blend/tolblend_simple/E6 b/tests/blend/tolblend_simple/E6
index 4987a083ed..f16c1ff7e3 100644
--- a/tests/blend/tolblend_simple/E6
+++ b/tests/blend/tolblend_simple/E6
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #wedge b 10 10 10 0 5 0 5
 #explode b f
 #depouille s1 b 1 0 0 b_5 15  0 0 10 5 0 0
diff --git a/tests/blend/tolblend_simple/E7 b/tests/blend/tolblend_simple/E7
index 6308e79699..19e14910c8 100644
--- a/tests/blend/tolblend_simple/E7
+++ b/tests/blend/tolblend_simple/E7
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #wedge b 10 10 10 0 5 0 5
 #explode b f
 #depouille s1 b 1 0 0 b_5 15  0 0 10 5 0 0
diff --git a/tests/blend/tolblend_simple/E8 b/tests/blend/tolblend_simple/E8
index 4ec7a3498d..38163d3ead 100644
--- a/tests/blend/tolblend_simple/E8
+++ b/tests/blend/tolblend_simple/E8
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #wedge b 10 10 10 0 5 0 5
 #explode b f
 #depouille s1 b 1 0 0 b_5 15  0 0 10 5 0 0
diff --git a/tests/blend/tolblend_simple/E9 b/tests/blend/tolblend_simple/E9
index 2fb2a4f507..0fe128f913 100644
--- a/tests/blend/tolblend_simple/E9
+++ b/tests/blend/tolblend_simple/E9
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 #modele fabrique dans STRIM et transfere dans DRAW
 
 restore [locate_data_file CFI_5_g12fgl.rle]  s
diff --git a/tests/blend/tolblend_simple/F1 b/tests/blend/tolblend_simple/F1
index 986a33a3bb..d27850e118 100644
--- a/tests/blend/tolblend_simple/F1
+++ b/tests/blend/tolblend_simple/F1
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_13_a1ffi.rle] s
 tscale s 0 0 0 SCALE1
 explode s E
diff --git a/tests/blend/tolblend_simple/F2 b/tests/blend/tolblend_simple/F2
index 305d128e81..fd28a04792 100644
--- a/tests/blend/tolblend_simple/F2
+++ b/tests/blend/tolblend_simple/F2
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_13_a1ffi.rle] s
 tscale s 0 0 0 SCALE1
 explode s E
diff --git a/tests/blend/tolblend_simple/F3 b/tests/blend/tolblend_simple/F3
index 81ede7bb25..2881868760 100644
--- a/tests/blend/tolblend_simple/F3
+++ b/tests/blend/tolblend_simple/F3
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_13_b1ffj.rle] s
 tscale s 0 0 0 SCALE1
 explode s E
diff --git a/tests/blend/tolblend_simple/F4 b/tests/blend/tolblend_simple/F4
index c7866578c6..6b3f70edf5 100644
--- a/tests/blend/tolblend_simple/F4
+++ b/tests/blend/tolblend_simple/F4
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_13_b1ffj.rle] s
 tscale s 0 0 0 SCALE1
 explode s E
diff --git a/tests/blend/tolblend_simple/F7 b/tests/blend/tolblend_simple/F7
index 009d0cee1b..67e53d9ff4 100644
--- a/tests/blend/tolblend_simple/F7
+++ b/tests/blend/tolblend_simple/F7
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_13_d1ffl.rle] s
 tscale s 0 0 0 SCALE1
 explode s E
diff --git a/tests/blend/tolblend_simple/F8 b/tests/blend/tolblend_simple/F8
index 9a0a08f40a..132ad2025a 100644
--- a/tests/blend/tolblend_simple/F8
+++ b/tests/blend/tolblend_simple/F8
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 restore [locate_data_file CFI_13_d1ffl.rle] s
 tscale s 0 0 0 SCALE1
 explode s E
diff --git a/tests/boolean/bopfuse_simple/ZP6 b/tests/boolean/bopfuse_simple/ZP6
index 1d808635aa..f8b2fb8f4e 100755
--- a/tests/boolean/bopfuse_simple/ZP6
+++ b/tests/boolean/bopfuse_simple/ZP6
@@ -1,5 +1,3 @@
-puts "TODO ?#22911 MacOS: Faulty shapes in variables faulty_1 to faulty_"
-
 #
 # *10603
 #
diff --git a/tests/boolean/gdml_private/B5 b/tests/boolean/gdml_private/B5
index 69ce142733..31276dc6e5 100644
--- a/tests/boolean/gdml_private/B5
+++ b/tests/boolean/gdml_private/B5
@@ -1,12 +1,5 @@
-# ? - because sometimes test is killed by elapsed time
 cpulimit 1000
-puts "TODO ?OCC26018 Windows: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO OCC26018 Linux: TEST INCOMPLETE"
-puts "TODO ?OCC26018 Linux: Process killed by CPU limit"
-puts "TODO ?OCC26018 ALL: Tcl Exception:"
-puts "TODO OCC26018 Linux: Error: sh59D36470_copy is not a valid shape"
-puts "TODO ?OCC26018 Windows: Error: sh59D36470_copy is not a valid shape"
-puts "TODO ?OCC26018 Windows: TEST INCOMPLETE"
-
+puts "TODO OCC26018 ALL: Tcl Exception:"
+puts "TODO OCC26018 ALL: Error: sh59D36470_copy is not a valid shape"
+puts "TODO ALL: TEST INCOMPLETE"
 source [locate_data_file 20000_asm-gene.asm.6.gdml.tcl]
-
diff --git a/tests/boolean/gdml_private/K8 b/tests/boolean/gdml_private/K8
index 6071518e62..bfedda007a 100644
--- a/tests/boolean/gdml_private/K8
+++ b/tests/boolean/gdml_private/K8
@@ -1,9 +1,2 @@
-# ? - because sometimes test is killed by elapsed time
-
-puts "TODO ?OCC26017 Linux: \\*\\* Exception"
-puts "TODO ?OCC26017 Linux: An exception was caught"
-puts "TODO ?OCC26017 ALL: TEST INCOMPLETE"
-puts "TODO ?OCC26017 ALL: Process killed by CPU limit"
-puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 20000_et6_401-ta6074.prt.2.gdml.tcl]
 
diff --git a/tests/boolean/gdml_private/L3 b/tests/boolean/gdml_private/L3
index eecc4a4c4e..7601e01c9c 100644
--- a/tests/boolean/gdml_private/L3
+++ b/tests/boolean/gdml_private/L3
@@ -1,7 +1 @@
-puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26017 Linux: \\*\\* Exception"
-puts "TODO ?OCC26017 Linux: An exception was caught"
-puts "TODO ?OCC26017 Linux: TEST INCOMPLETE"
-puts "TODO ?OCC26017 Linux: Process killed by CPU limit"
 source [locate_data_file 20000_g1-2_et1.asm.5.gdml.tcl]
-
diff --git a/tests/boolean/gdml_private/L5 b/tests/boolean/gdml_private/L5
index 6abb59c523..138b397f7c 100644
--- a/tests/boolean/gdml_private/L5
+++ b/tests/boolean/gdml_private/L5
@@ -1,7 +1 @@
-puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26017 Linux: XIO:  fatal IO error"
-puts "TODO ?OCC26017 Linux: TEST INCOMPLETE"
-puts "TODO ?OCC26017 Linux: Tcl Exception"
-puts "TODO ?OCC26017 Linux: Error: shC26D310_copy is not a valid shape"
 source [locate_data_file 20000_g1-2_et4.asm.3.gdml.tcl]
-
diff --git a/tests/boolean/gdml_private/L6 b/tests/boolean/gdml_private/L6
index 634858cdc3..b41e76a606 100644
--- a/tests/boolean/gdml_private/L6
+++ b/tests/boolean/gdml_private/L6
@@ -1,3 +1 @@
-puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 20000_g1-2_et5.asm.3.gdml.tcl]
-
diff --git a/tests/boolean/gdml_private/L7 b/tests/boolean/gdml_private/L7
index a20d479b03..1a5fc41fa8 100644
--- a/tests/boolean/gdml_private/L7
+++ b/tests/boolean/gdml_private/L7
@@ -1,5 +1 @@
-puts "TODO ?OCC26017 ALL: TEST INCOMPLETE"
-puts "TODO ?OCC26017 ALL: Process killed by CPU limit"
-puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 20000_g1-2_et6.asm.4.gdml.tcl]
-
diff --git a/tests/boolean/gdml_private/L9 b/tests/boolean/gdml_private/L9
index f2897a3e9b..9655a0fd7e 100644
--- a/tests/boolean/gdml_private/L9
+++ b/tests/boolean/gdml_private/L9
@@ -1,4 +1 @@
-puts "TODO ?OCC26017 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26017 ALL: TEST INCOMPLETE"
 source [locate_data_file 20000_g1-2_ss1.asm.2.gdml.tcl]
-
diff --git a/tests/boolean/gdml_private/P7 b/tests/boolean/gdml_private/P7
index a29697aeb3..4692392bc4 100644
--- a/tests/boolean/gdml_private/P7
+++ b/tests/boolean/gdml_private/P7
@@ -1,3 +1 @@
-puts "TODO ?OCC26018 ALL: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 20000_h1-2_ss1_401-ta13402.prt.2.gdml.tcl]
-
diff --git a/tests/boolean/gdml_private/P9 b/tests/boolean/gdml_private/P9
index 010ae03feb..1206891fda 100644
--- a/tests/boolean/gdml_private/P9
+++ b/tests/boolean/gdml_private/P9
@@ -1,3 +1 @@
-puts "TODO ?OCC26018 ALL: Faulty shapes in variables faulty_1 to faulty_"
 source [locate_data_file 20000_h1-2_ss1_401-ta13442.prt.2.gdml.tcl]
-
diff --git a/tests/boolean/gdml_private/ZI5 b/tests/boolean/gdml_private/ZI5
index 4540588e57..7fc4a44d0f 100644
--- a/tests/boolean/gdml_private/ZI5
+++ b/tests/boolean/gdml_private/ZI5
@@ -1,4 +1,2 @@
-puts "TODO ?OCC27052 All: Faulty shapes in variables faulty_1 to"
-
 source [locate_data_file equipement_chambre.asm.1.gdml.tcl]
 
diff --git a/tests/boolean/gdml_private/bug27052_ZI5 b/tests/boolean/gdml_private/bug27052_ZI5
index 0a13d0904e..5de360cc53 100644
--- a/tests/boolean/gdml_private/bug27052_ZI5
+++ b/tests/boolean/gdml_private/bug27052_ZI5
@@ -1,5 +1,3 @@
-puts "TODO ?OCC27052 All: Faulty shapes in variables faulty_1 to"
-
 source [locate_data_file equipement_chambre.asm.1.gdml.tcl]
 
 set So_N [llength [explode result So]]
diff --git a/tests/boolean/volumemaker/A8 b/tests/boolean/volumemaker/A8
index d1c71d03aa..09609a7601 100644
--- a/tests/boolean/volumemaker/A8
+++ b/tests/boolean/volumemaker/A8
@@ -1,7 +1,6 @@
 # test script on make volume operation
 # plane sphere
-
-puts "TODO ?OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO OCC26020 ALL: Error: bopcheck failed"
 puts "TODO OCC26020 ALL: Error : The area of result shape is"
 
diff --git a/tests/boolean/volumemaker/B8 b/tests/boolean/volumemaker/B8
index bba7a1e433..c7ab96a7e2 100644
--- a/tests/boolean/volumemaker/B8
+++ b/tests/boolean/volumemaker/B8
@@ -1,9 +1,6 @@
 # test script on make volume operation
 # plane
 
-puts "TODO ?OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26020 ALL: Error: bopcheck failed"
-
 # planar face 
 plane pln_f1 675.40193739250992 -18.500000000000014 -849.55972443208043 -0.78282540776981002 -2.2204460492503131e-016 -0.62224141693560608
 erase pln_f1
diff --git a/tests/boolean/volumemaker/C1 b/tests/boolean/volumemaker/C1
index 5ed7bc6490..38497b72c9 100644
--- a/tests/boolean/volumemaker/C1
+++ b/tests/boolean/volumemaker/C1
@@ -1,10 +1,6 @@
 # test script on make volume operation
 # plane
 
-puts "TODO ?OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26020 ALL: Error : The area of the resulting shape is"
-puts "TODO ?OCC26020 ALL: Error: bopcheck failed"
-
 # planar face 
 plane pln_f1 -331.49269816258993 -487.15663197846379 -460.05843051255943 -0.29784456643004237 0.75470958022277179 -0.58455287508322795
 erase pln_f1
diff --git a/tests/boolean/volumemaker/D6 b/tests/boolean/volumemaker/D6
index 668c18825a..1805aeeea6 100644
--- a/tests/boolean/volumemaker/D6
+++ b/tests/boolean/volumemaker/D6
@@ -1,9 +1,6 @@
 # test script on make volume operation
 # cylinder plane
 
-puts "TODO ?OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26020 ALL: Error: bopcheck failed"
-
 # planar face 
 plane pln_f1 -1677.4339210099999 -825 347.58541137999993 -2.2204460492503131e-016 -1.1102230246251565e-016 1
 erase pln_f1
diff --git a/tests/boolean/volumemaker/D8 b/tests/boolean/volumemaker/D8
index bc39dc4fa0..f94f6a0449 100644
--- a/tests/boolean/volumemaker/D8
+++ b/tests/boolean/volumemaker/D8
@@ -1,15 +1,12 @@
 # test script on make volume operation
 # cylinder plane
-
-puts "TODO ?OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC26020 ALL: Error: bopcheck failed"
-puts "TODO ?OCC26020 ALL: Error : The area of result shape is"
-
+puts "TODO OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC26020 ALL: Error: bopcheck failed"
+puts "TODO OCC26020 ALL: Error : The area of result shape is"
 # planar face 
 plane pln_f1 -335.23319463083521 698.25 1031.741684575172 0.95105651629515375 3.3306690738754676e-016 0.30901699437494723
 erase pln_f1
 mkface f1 pln_f1 -1000000 1000000 -1000000 1000000
-
 # planar face 
 plane pln_f2 -361.48545975741939 698.25 1112.3677894628579 0.94413350938426932 -2.7755575615628914e-017 0.32956322072971667
 erase pln_f2
diff --git a/tests/boolean/volumemaker/D9 b/tests/boolean/volumemaker/D9
index 87ba1e7f51..4c388102bb 100644
--- a/tests/boolean/volumemaker/D9
+++ b/tests/boolean/volumemaker/D9
@@ -1,8 +1,6 @@
 # test script on make volume operation
 # cylinder plane
 
-puts "TODO ?OCC26020 ALL: Faulty shapes in variables faulty_1 to faulty_"
-
 # planar face 
 plane pln_f1 0 825 4.163336342344337e-015 0 -1 -1.1102230246251565e-016
 erase pln_f1
diff --git a/tests/boolean/volumemaker/E4 b/tests/boolean/volumemaker/E4
index b553c3f00a..059b82fffc 100644
--- a/tests/boolean/volumemaker/E4
+++ b/tests/boolean/volumemaker/E4
@@ -1,9 +1,5 @@
 # test script on make volume operation
 # cone plane killed by cpulimit 300 
-# ? - because sometimes test is killed by elapsed time
-
-#puts "TODO OCC26020 Windows: Error : The area of result shape is"
-puts "TODO ?OCC26020 ALL: Error: bopcheck failed"
 
 # planar face 
 plane pln_f1 460.8377555733228 -1160 121.87519451048833 -0.17364817766693036 1.1223734950417248e-017 0.98480775301220813
diff --git a/tests/boolean/volumemaker/E5 b/tests/boolean/volumemaker/E5
index 5188c30e0d..14e037511e 100644
--- a/tests/boolean/volumemaker/E5
+++ b/tests/boolean/volumemaker/E5
@@ -1,8 +1,7 @@
 # test script on make volume operation
 # cone plane killed by cpulimit 300
-# ? - because sometimes test is killed by elapsed time
-puts "TODO ?OCC26020 ALL: Error: bopcheck failed"
 
+puts "TODO OCC26020 ALL: Error: bopcheck failed"
 # planar face 
 plane pln_f1 460.8377555733228 -1160 121.87519451048833 -0.17364817766693036 1.1223734950417248e-017 0.98480775301220813
 erase pln_f1
diff --git a/tests/bugs/caf/bug1138 b/tests/bugs/caf/bug1138
index fa28f79dd8..73ae77dd0e 100755
--- a/tests/bugs/caf/bug1138
+++ b/tests/bugs/caf/bug1138
@@ -1,8 +1,3 @@
-puts "TODO ?OCC12345 Linux: An exception was caught"
-puts "TODO ?OCC12345 Linux: Faulty OCC1138 : here is reading problem when the filename is a directory name."
-puts "TODO ?OCC12345 Linux: Faulty OCC1138"
-puts "TODO ?OCC12345 Linux: \\*\\* Exception \\*\\*"
-
 puts "================"
 puts "OCC1138"
 puts "================"
diff --git a/tests/bugs/fclasses/bug309 b/tests/bugs/fclasses/bug309
index 201a2034f2..f4a742a13a 100644
--- a/tests/bugs/fclasses/bug309
+++ b/tests/bugs/fclasses/bug309
@@ -1,4 +1,5 @@
-puts "TODO ?OCC24296 ALL: OCC309: Error 2"
+puts "TODO OCC24296 Linux: OCC309: Error 2"
+puts "TODO OCC24296 MacOS: OCC309: Error 2"
 
 puts "================"
 puts "OCC309"
diff --git a/tests/bugs/fclasses/bug7287_1 b/tests/bugs/fclasses/bug7287_1
index 93ce439337..9c87d5ee3d 100755
--- a/tests/bugs/fclasses/bug7287_1
+++ b/tests/bugs/fclasses/bug7287_1
@@ -1,3 +1,8 @@
+puts "TODO ?OCC7287 Linux: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC7287 MacOS: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 MacOS: TEST INCOMPLETE"
+
 puts "============"
 puts "OCC7287"
 puts "============"
diff --git a/tests/bugs/fclasses/bug7287_2 b/tests/bugs/fclasses/bug7287_2
index 82469ebf25..a21bc81fd1 100755
--- a/tests/bugs/fclasses/bug7287_2
+++ b/tests/bugs/fclasses/bug7287_2
@@ -1,5 +1,7 @@
-puts "TODO ?OCC25921 Linux: Tcl Exception: Memory leak detected"
-puts "TODO ?OCC25921 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC7287 Linux: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC7287 MacOS: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 MacOS: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC7287"
diff --git a/tests/bugs/fclasses/bug7287_3 b/tests/bugs/fclasses/bug7287_3
index 28488b74d5..1003fd8962 100755
--- a/tests/bugs/fclasses/bug7287_3
+++ b/tests/bugs/fclasses/bug7287_3
@@ -1,5 +1,7 @@
-puts "TODO ?OCC25921 Linux: Tcl Exception: Memory leak detected"
-puts "TODO ?OCC25921 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC7287 Linux: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC7287 MacOS: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 MacOS: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC7287"
diff --git a/tests/bugs/fclasses/bug7287_4 b/tests/bugs/fclasses/bug7287_4
index 9213c7c693..661ab4352e 100755
--- a/tests/bugs/fclasses/bug7287_4
+++ b/tests/bugs/fclasses/bug7287_4
@@ -1,5 +1,7 @@
-puts "TODO ?OCC25921 Linux: Tcl Exception: Memory leak detected"
-puts "TODO ?OCC25921 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC7287 Linux: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC7287 MacOS: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 MacOS: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC7287"
diff --git a/tests/bugs/fclasses/bug7287_5 b/tests/bugs/fclasses/bug7287_5
index 4e6b93397a..929094e2da 100755
--- a/tests/bugs/fclasses/bug7287_5
+++ b/tests/bugs/fclasses/bug7287_5
@@ -1,6 +1,7 @@
-puts "TODO ?OCC25921 Linux: Tcl Exception: Memory leak detected"
-puts "TODO ?OCC25921 Linux: TEST INCOMPLETE"
-
+puts "TODO ?OCC7287 Linux: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC7287 MacOS: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 MacOS: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC7287"
diff --git a/tests/bugs/fclasses/bug7287_6 b/tests/bugs/fclasses/bug7287_6
index 09bc1380f2..e40799f71e 100755
--- a/tests/bugs/fclasses/bug7287_6
+++ b/tests/bugs/fclasses/bug7287_6
@@ -1,5 +1,7 @@
-puts "TODO ?OCC25921 Linux: Tcl Exception: Memory leak detected"
-puts "TODO ?OCC25921 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC7287 Linux: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 Linux: TEST INCOMPLETE"
+puts "TODO ?OCC7287 MacOS: Tcl Exception: Memory leak detected"
+puts "TODO ?OCC7287 MacOS: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC7287"
diff --git a/tests/bugs/modalg_1/bug140 b/tests/bugs/modalg_1/bug140
index 91291c056f..7db6547afa 100755
--- a/tests/bugs/modalg_1/bug140
+++ b/tests/bugs/modalg_1/bug140
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: Tcl Exception: tolerance ang"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "================"
 puts "OCC140"
 puts "================"
diff --git a/tests/bugs/modalg_1/bug15836 b/tests/bugs/modalg_1/bug15836
index 2a499f33c4..daca109f3f 100755
--- a/tests/bugs/modalg_1/bug15836
+++ b/tests/bugs/modalg_1/bug15836
@@ -1,6 +1,3 @@
-puts "TODO OCC24156 MacOS: Tcl Exception:"
-puts "TODO ?OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "============"
 puts "OCC15836"
 puts "============"
diff --git a/tests/bugs/modalg_2/bug472_3 b/tests/bugs/modalg_2/bug472_3
index 95a738b5cb..55fef09fac 100755
--- a/tests/bugs/modalg_2/bug472_3
+++ b/tests/bugs/modalg_2/bug472_3
@@ -1,5 +1,4 @@
 puts "TODO OCC25917 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC25917 ALL: Error : The area of result shape is"
 puts "TODO OCC25917 ALL: Error :  is WRONG because number of "
 puts "========================"
 puts " OCC472 "
@@ -9,7 +8,6 @@ puts ""
 #####################################################
 ## Bad result of Fuse Operation (Cut&Common - bad too). SAM1470 (#2634) 
 #####################################################
-
 restore [locate_data_file OCC472a.brep] b1 
 checkshape b1
 
diff --git a/tests/bugs/modalg_5/bug23952_1 b/tests/bugs/modalg_5/bug23952_1
index 29deb5079a..46b30b752d 100644
--- a/tests/bugs/modalg_5/bug23952_1
+++ b/tests/bugs/modalg_5/bug23952_1
@@ -1,9 +1,3 @@
-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"
-
 puts "================"
 puts "OCC23952"
 puts "================"
diff --git a/tests/bugs/modalg_7/bug26933 b/tests/bugs/modalg_7/bug26933
index cdbf211723..44e3ce1090 100644
--- a/tests/bugs/modalg_7/bug26933
+++ b/tests/bugs/modalg_7/bug26933
@@ -1,5 +1,3 @@
-puts "TODO ?OCC26933 All: Error : The length of result shape is"
-
 puts "========"
 puts "OCC26933"
 puts "========"
diff --git a/tests/bugs/moddata_1/bug22759 b/tests/bugs/moddata_1/bug22759
index c9d306eb31..16d73547bd 100755
--- a/tests/bugs/moddata_1/bug22759
+++ b/tests/bugs/moddata_1/bug22759
@@ -1,6 +1,3 @@
-#puts "TODO OCC27416 Linux: Process killed by CPU limit"
-puts "TODO ?OCC26339 ALL: TEST INCOMPLETE"
-
 puts "============"
 puts "OCC22759"
 puts "============"
diff --git a/tests/bugs/moddata_2/bug567 b/tests/bugs/moddata_2/bug567
index cb44a2561f..d6f396f2ea 100755
--- a/tests/bugs/moddata_2/bug567
+++ b/tests/bugs/moddata_2/bug567
@@ -1,5 +1,6 @@
 puts "TODO OCC12345 ALL: Faulty OCC565: function intersection works wrongly with trimmed Surfaces"
-puts "TODO ?OCC12345 ALL: Faulty OCC565: function intersection works wrongly with infinite Surfaces"
+puts "TODO OCC12345 Linux: Faulty OCC565: function intersection works wrongly with infinite Surfaces"
+puts "TODO OCC12345 MacOS: Faulty OCC565: function intersection works wrongly with infinite Surfaces"
 
 puts "========"
 puts "OCC567"
diff --git a/tests/bugs/moddata_3/bug24621 b/tests/bugs/moddata_3/bug24621
new file mode 100755
index 0000000000..bfb93bb1dd
--- /dev/null
+++ b/tests/bugs/moddata_3/bug24621
@@ -0,0 +1,17 @@
+puts "TODO OCC24621 Windows: An exception was caught"
+puts "TODO OCC24621 Windows: \\*\\* Exception \\*\\*.*"
+puts "TODO OCC24621 Windows: TEST INCOMPLETE"
+
+puts "========"
+puts "OCC24621"
+puts "========"
+puts ""
+##################################################
+# Failed to build Geom_OffsetSurface on B-Spline
+##################################################
+
+restore [locate_data_file bug24621_bs.draw] bs
+
+offset obs bs -2
+setunotperiodic bs
+offset obs bs -2
diff --git a/tests/bugs/vis/bug27318 b/tests/bugs/vis/bug27318
index 45da40a8f0..d16d06216e 100644
--- a/tests/bugs/vis/bug27318
+++ b/tests/bugs/vis/bug27318
@@ -1,3 +1,5 @@
+puts "TODO OCC27318 MacOS: Error : TEST FAILED"
+
 puts "========"
 puts "OCC27318"
 puts "========"
diff --git a/tests/draft/angle/L4 b/tests/draft/angle/L4
index 51cda02706..f49e5caec6 100644
--- a/tests/draft/angle/L4
+++ b/tests/draft/angle/L4
@@ -1,8 +1,6 @@
 # Original bug : cts20194
 # Date : 23 Nov 98
-
 puts "TODO OCC22803 All:Faulty shapes in variables faulty_1 to faulty_2"
-puts "TODO ?OCC22803 ALL: Error : The area of the resulting shape is"
 
 restore [locate_data_file CFE903_cts20ggq.rle] base
 
diff --git a/tests/offset/bugs/bug26030 b/tests/offset/bugs/bug26030
new file mode 100755
index 0000000000..a7adfc18d6
--- /dev/null
+++ b/tests/offset/bugs/bug26030
@@ -0,0 +1,19 @@
+puts "TODO OCC26030 ALL: Error : The offset cannot be built"
+
+puts "========"
+puts "OCC26030"
+puts "========"
+puts ""
+#################################################
+# Offset of a lofted body fails after long time
+#################################################
+
+restore [locate_data_file bug26030_thickness-crash1-tcl-Loft001-00-section.brep] Loft001-00-section
+restore [locate_data_file bug26030_thickness-crash1-tcl-Loft001-01-section.brep] Loft001-01-section
+
+thrusections Loft001 1 0 Loft001-00-section Loft001-01-section
+explode Loft001 F
+offsetparameter 1e-7 p i
+offsetload Loft001 1
+
+offsetperform Offset
diff --git a/tests/offset/compshape/A1 b/tests/offset/compshape/A1
index 4b86d703c4..f8634f4642 100644
--- a/tests/offset/compshape/A1
+++ b/tests/offset/compshape/A1
@@ -1,5 +1,5 @@
-puts "TODO ?OCC23068 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC23068 ALL: Error : The volume of result shape "
+puts "TODO OCC23068 ALL: ERROR. offsetperform operation not done."
+puts "TODO OCC23068 ALL: Error : The volume of result shape "
 
 ## ======================================
 ## Grid    : CCV002
diff --git a/tests/offset/compshape/A3 b/tests/offset/compshape/A3
index efdf9e76df..d512b2edd2 100644
--- a/tests/offset/compshape/A3
+++ b/tests/offset/compshape/A3
@@ -4,10 +4,8 @@
 ## Comment : From CV tests serie page 58/59
 ## ==========================================
 
-puts "TODO ?OCC23068 ALL:Error\\s*:\\s*The offset is not valid. The volume is"
 puts "TODO ?OCC23068 ALL:Error\\s*:\\s*.*The volume"
 puts "TODO ?OCC23068 ALL:Faulty shapes in variables faulty_1 to faulty_"
-
 restore [locate_data_file CCV_2_c1_gsv.rle] s
 explode s F
 catch {offsetcompshape result s -10 s_8 s_10}
diff --git a/tests/offset/compshape/A4 b/tests/offset/compshape/A4
index 9fb9d695b4..f13e7a83c6 100755
--- a/tests/offset/compshape/A4
+++ b/tests/offset/compshape/A4
@@ -4,8 +4,7 @@
 ## Comment : From CV tests serie page 60
 ## ======================================
 
-puts "TODO ?OCC26556 ALL: ERROR. offsetperform operation not done."
-
+puts "TODO OCC26556 ALL: ERROR. offsetperform operation not done."
 restore [locate_data_file CCV_2_d1_gsw.rle] s
 explode s F
 catch {offsetcompshape result s -2 s_17}
diff --git a/tests/offset/faces_type_i/B2 b/tests/offset/faces_type_i/B2
index 32266ad40f..10f36fb06e 100644
--- a/tests/offset/faces_type_i/B2
+++ b/tests/offset/faces_type_i/B2
@@ -1,7 +1,5 @@
-puts "TODO ?OCC23068 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC23068 ALL: Error : The volume of result shape is"
-puts "TODO ?OCC23068 ALL: TEST INCOMPLETE"
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC23068 ALL: Error : The volume of result shape is"
 
 pcone s 5 0 12 90
 trotate s 0 0 0 0 0 1 90
diff --git a/tests/offset/faces_type_i/B8 b/tests/offset/faces_type_i/B8
index e1ba46160c..91fd2858a1 100644
--- a/tests/offset/faces_type_i/B8
+++ b/tests/offset/faces_type_i/B8
@@ -1,7 +1,5 @@
-puts "TODO ?OCC23068 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC23068 ALL: Error : The volume of result shape is"
-puts "TODO ?OCC23068 ALL: TEST INCOMPLETE"
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC23068 ALL: Error : The volume of result shape is"
 
 psphere s 15 -90 60 90
 trotate s 0 0 0 0 0 1 90
diff --git a/tests/offset/faces_type_i/B9 b/tests/offset/faces_type_i/B9
index 33e1188217..e0cc2a6200 100644
--- a/tests/offset/faces_type_i/B9
+++ b/tests/offset/faces_type_i/B9
@@ -1,7 +1,5 @@
-puts "TODO ?OCC23068 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC23068 ALL: Error : The volume of result shape is"
-puts "TODO ?OCC23068 ALL: TEST INCOMPLETE"
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC23068 ALL: Error : The volume of result shape is"
 
 psphere s 15 -90 60 90
 trotate s 0 0 0 0 0 1 90
diff --git a/tests/offset/faces_type_i/C4 b/tests/offset/faces_type_i/C4
index dc67985a00..9caebcfa1a 100644
--- a/tests/offset/faces_type_i/C4
+++ b/tests/offset/faces_type_i/C4
@@ -1,7 +1,5 @@
-puts "TODO ?OCC23068 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC23068 ALL: Error : The volume of result shape is"
-puts "TODO ?OCC23068 ALL: TEST INCOMPLETE"
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC23068 ALL: Error : The volume of result shape is"
 
 psphere s 15 -90 60 270
 
diff --git a/tests/offset/grids.list b/tests/offset/grids.list
index e4364ebb5f..0b9af3ed6e 100644
--- a/tests/offset/grids.list
+++ b/tests/offset/grids.list
@@ -17,3 +17,4 @@
 017 with_intersect_80
 018 shape_type_i_c
 019 simple
+020 bugs
\ No newline at end of file
diff --git a/tests/offset/shape_type_i/B3 b/tests/offset/shape_type_i/B3
index 06643666e2..7929fc0a41 100644
--- a/tests/offset/shape_type_i/B3
+++ b/tests/offset/shape_type_i/B3
@@ -1,8 +1,7 @@
-puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC23068 ALL: Error : The area of face "
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC23068 ALL: Error : The area of face "
 puts "TODO OCC23068 ALL: Error : The volume of result shape "
 puts "TODO OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
-
 psphere s 15 -90 60 270
 
 OFFSETSHAPE -1 {} $calcul $type
diff --git a/tests/offset/shape_type_i/C7 b/tests/offset/shape_type_i/C7
index 9fdc741d97..73b22252c9 100755
--- a/tests/offset/shape_type_i/C7
+++ b/tests/offset/shape_type_i/C7
@@ -1,10 +1,5 @@
-puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*"
-puts "TODO OCC24156 MacOS: An exception was caught"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-puts "TODO ?OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
 puts "TODO OCC25406 ALL: Error: bsection of the result and s is not equal to zero"
 puts "TODO OCC23068 ALL:Error\\s*:\\s*.*The volume"
-
 ellipse w1 0 0 0 15 10
 mkedge w1 w1 0 pi/2
 trotate w1 0 0 0 1 0 0 90
diff --git a/tests/offset/wire_closed_inside_0_025/A2 b/tests/offset/wire_closed_inside_0_025/A2
index 263650532d..6316164dd6 100644
--- a/tests/offset/wire_closed_inside_0_025/A2
+++ b/tests/offset/wire_closed_inside_0_025/A2
@@ -1,8 +1,3 @@
-#puts "TODO ?OCC23068 ALL: An exception was caught"
-#puts "TODO ?OCC23068 ALL: \\*\\* Exception \\*\\*.*"
-#puts "TODO ?OCC23748 ALL: Error: Offset is not done."
-#puts "TODO ?OCC23068 ALL: Error : The offset cannot be built."
-
 restore [locate_data_file offset_wire_003.brep] s
 
 set length 787.515
diff --git a/tests/perf/modalg/bug26980 b/tests/perf/modalg/bug26980
index 997bce58ee..d384b579ca 100644
--- a/tests/perf/modalg/bug26980
+++ b/tests/perf/modalg/bug26980
@@ -1,3 +1,5 @@
+puts "TODO OCC26980 MacOS: Error : there is memory problem"
+
 puts "========"
 puts "OCC26980"
 puts "========"
diff --git a/tests/perf/modalg/bug453_2 b/tests/perf/modalg/bug453_2
index 3ea921a5f4..226e29edc2 100644
--- a/tests/perf/modalg/bug453_2
+++ b/tests/perf/modalg/bug453_2
@@ -1,7 +1,3 @@
-puts "TODO ?OCC25918 Windows: Error : The area of result shape is"
-puts "TODO OCC24156 MacOS: Tcl Exception:"
-puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
-
 puts "========"
 puts "OCC453"
 puts "(case 2)"
diff --git a/tests/perf/ncollection/A3 b/tests/perf/ncollection/A3
index fb45495fa3..a704b43edd 100644
--- a/tests/perf/ncollection/A3
+++ b/tests/perf/ncollection/A3
@@ -1,5 +1,8 @@
 pload QAcommands
 
+puts "TODO ?OCC29132 Windows: ERROR: performance"
+
+
 set info [QANTestNCollectionIndexedDataMap]
 
 set keys {}
diff --git a/tests/pipe/bugs/bug24909_1 b/tests/pipe/bugs/bug24909_1
new file mode 100755
index 0000000000..de4e431b85
--- /dev/null
+++ b/tests/pipe/bugs/bug24909_1
@@ -0,0 +1,26 @@
+puts "TODO ?OCC24909 ALL: An exception was caught"
+puts "TODO ?OCC24909 ALL: \\*\\* Exception \\*\\*.*"
+puts "TODO ?OCC24909 ALL: TEST INCOMPLETE"
+puts "TODO ?OCC24909 ALL: Tcl Exception: Buildsweep : Not Done"
+
+puts "========"
+puts "OCC24909"
+puts "========"
+puts ""
+##################################
+# 0024909: SIGSEGV in buildsweep
+##################################
+
+restore [locate_data_file bug24909_sweep3-draw-Sweep-0-spine.brep] Sweep-0-spine
+
+mksweep Sweep-0-spine
+setsweep -CF
+
+restore [locate_data_file bug24909_sweep3-draw-Sweep-0-section-00-Sketch.brep] Sweep-0-section-00-Sketch
+
+addsweep Sweep-0-section-00-Sketch
+
+restore [locate_data_file bug24909_sweep3-draw-Sweep-0-section-01-Sketch001.brep] Sweep-0-section-01-Sketch001
+addsweep Sweep-0-section-01-Sketch001
+
+buildsweep Sweep
diff --git a/tests/pipe/bugs/bug24909_2 b/tests/pipe/bugs/bug24909_2
new file mode 100755
index 0000000000..25784a151b
--- /dev/null
+++ b/tests/pipe/bugs/bug24909_2
@@ -0,0 +1,29 @@
+puts "TODO ?OCC24909 ALL: An exception was caught"
+puts "TODO ?OCC24909 ALL: \\*\\* Exception \\*\\*.*"
+puts "TODO ?OCC24909 ALL: TEST INCOMPLETE"
+puts "TODO ?OCC24909 ALL: Tcl Exception: Buildsweep : Not Done"
+
+puts "========"
+puts "OCC24909"
+puts "========"
+puts ""
+##################################
+# 0024909: SIGSEGV in buildsweep
+##################################
+
+circle c1 0 0 0 40
+mkedge e1 c1
+wire w1 e1
+tcopy w1 Sketch002
+tcopy w1 Sketch001
+renamevar w1 Sketch
+trotate Sketch 0 0 0 0. 1. 0. 90
+ttranslate Sketch 0. 0. 75.
+trotate Sketch001 0 0 0 0. 1. 0. 90
+ttranslate Sketch001 0. 0. -75.
+ttranslate Sketch002 50. 0. 0.
+mksweep Sketch002
+setsweep -CF
+addsweep Sketch001
+addsweep Sketch
+buildsweep Sweep
diff --git a/tests/pipe/bugs/bug24909_3 b/tests/pipe/bugs/bug24909_3
new file mode 100755
index 0000000000..13a024d834
--- /dev/null
+++ b/tests/pipe/bugs/bug24909_3
@@ -0,0 +1,32 @@
+puts "TODO OCC24909 ALL: Tcl Exception: Buildsweep : Not Done"
+puts "TODO OCC24909 ALL: TEST INCOMPLETE"
+
+puts "========"
+puts "OCC24909"
+puts "========"
+puts ""
+##################################
+# 0024909: SIGSEGV in buildsweep
+##################################
+
+restore [locate_data_file bug24909_minihyd-draw-BezCurve.brep] BezCurve
+
+ttranslate BezCurve 0 -8 0
+explode BezCurve E
+wire Sweep001-0-spine BezCurve_1
+mksweep Sweep001-0-spine
+setsweep -CF
+circle Circle-curve 0 0 0 18
+mkedge Circle-edge Circle-curve 0 0
+wire Circle Circle-edge
+trotate Circle 0 0 0 0.577350269189625731 0.577350269189625731 0.577350269189625731 120
+ttranslate Circle 0 -71 203.5
+addsweep Circle
+circle Circle001-curve 0 0 0 16
+mkedge Circle001-edge Circle001-curve 0 0
+wire Circle001 Circle001-edge
+trotate Circle001 0 0 0 0.577350269189625731 0.577350269189625731 0.577350269189625731 120
+ttranslate Circle001 0 -71 203.5
+addsweep Circle001
+
+buildsweep Sweep001 -C -S
diff --git a/tests/pipe/bugs/bug25110 b/tests/pipe/bugs/bug25110
new file mode 100755
index 0000000000..ea49e844da
--- /dev/null
+++ b/tests/pipe/bugs/bug25110
@@ -0,0 +1,20 @@
+puts "TODO OCC25110 ALL: An exception was caught"
+puts "TODO OCC25110 ALL: \\*\\* Exception \\*\\*.*"
+puts "TODO OCC25110 ALL: TEST INCOMPLETE"
+
+puts "========"
+puts "OCC25110"
+puts "========"
+puts ""
+########################################################################################
+# TCollection_IndexedDataMap::FindFromKey error when sweeping circle along BezierCurve
+########################################################################################
+
+restore [locate_data_file bug25110_unsweepable1-draw-Sweep-0-spine.brep] Sweep-0-spine
+restore [locate_data_file bug25110_unsweepable1-draw-Sweep-0-section-00-Circle.brep] Sweep-0-section-00-Circle
+
+mksweep Sweep-0-spine
+setsweep -CF
+addsweep Sweep-0-section-00-Circle
+
+buildsweep Sweep -C -S
diff --git a/tests/pipe/bugs/bug26088 b/tests/pipe/bugs/bug26088
new file mode 100755
index 0000000000..d8358a80b9
--- /dev/null
+++ b/tests/pipe/bugs/bug26088
@@ -0,0 +1,16 @@
+puts "TODO OCC26088 ALL: An exception was caught"
+puts "TODO OCC26088 ALL: \\*\\* Exception \\*\\*.*"
+puts "TODO OCC26088 ALL: TEST INCOMPLETE"
+
+puts "========"
+puts "OCC26088"
+puts "========"
+puts ""
+###############################
+# Exception in pipe algorithm
+###############################
+
+restore [locate_data_file bug26088_path0.brep] p
+restore [locate_data_file bug26088_profile0.brep] pr
+
+pipe result p pr
diff --git a/tests/pipe/grids.list b/tests/pipe/grids.list
index 249ea40bb2..342a16f01d 100755
--- a/tests/pipe/grids.list
+++ b/tests/pipe/grids.list
@@ -1,6 +1,6 @@
 001 specific
 002 standard
-
+003 bugs
 
 
 
diff --git a/tests/sewing/tol_0_01/F8 b/tests/sewing/tol_0_01/F8
index ec980d397d..f7b147bb69 100644
--- a/tests/sewing/tol_0_01/F8
+++ b/tests/sewing/tol_0_01/F8
@@ -1,6 +1,4 @@
-#puts "TODO OCC23674 ALL: Error : Number of faults is"
-puts "TODO ?OCC24592 ALL: Error : Number of free edges is"
-
+puts "TODO OCC24592 ALL: Error : Number of free edges is"
 restore [locate_data_file CCH_indusheq.rle] a
 
 sewing result $tol a
diff --git a/tests/sewing/tol_100/C5 b/tests/sewing/tol_100/C5
index 35fdd42eb8..05c52f2cee 100644
--- a/tests/sewing/tol_100/C5
+++ b/tests/sewing/tol_100/C5
@@ -1,5 +1,3 @@
-puts "TODO ?OCC24592 ALL: Error: Max tolerance"
-
 restore [locate_data_file CFI_pro11907.rle] a
 
 sewing result $tol a
diff --git a/tests/sewing/tol_100/D3 b/tests/sewing/tol_100/D3
index 6d6cd20b17..aee1cbeca6 100644
--- a/tests/sewing/tol_100/D3
+++ b/tests/sewing/tol_100/D3
@@ -1,4 +1,3 @@
-puts "TODO ?OCC24592 ALL: Error: Max tolerance"
 puts "TODO OCC23674 ALL: Error : Number of faults is"
 
 restore [locate_data_file CFI_pro15441.rle] a
diff --git a/tests/sewing/tol_100/J4 b/tests/sewing/tol_100/J4
index 9ddffc03d5..1fb29d8925 100644
--- a/tests/sewing/tol_100/J4
+++ b/tests/sewing/tol_100/J4
@@ -1,6 +1,4 @@
-puts "TODO ?OCC24592 ALL: Error : Number of faults is"
-puts "TODO ?OCC24592 ALL: Error: Max tolerance"
-
+puts "TODO OCC24592 ALL: Error: Max tolerance"
 restore [locate_data_file CIN902_intcqhmq.rle] a
 
 sewing result $tol a
diff --git a/tests/sewing/tol_100/J5 b/tests/sewing/tol_100/J5
index 7ec3ad7624..5198e6cda4 100644
--- a/tests/sewing/tol_100/J5
+++ b/tests/sewing/tol_100/J5
@@ -1,7 +1,4 @@
-puts "TODO ?OCC24592 ALL: Error: Max tolerance"
-puts "TODO ?OCC24592 ALL: Error : Number of faults is"
-puts "TODO ?OCC24592 ALL: Error : Number of free edges is"
-
+puts "TODO OCC24592 ALL: Error : Number of free edges is"
 restore [locate_data_file CIN902_intcqhmr.rle] a
 
 sewing result $tol a
diff --git a/tests/sewing/tol_100/J6 b/tests/sewing/tol_100/J6
index bede0bf8fd..abb2495246 100644
--- a/tests/sewing/tol_100/J6
+++ b/tests/sewing/tol_100/J6
@@ -1,7 +1,5 @@
-puts "TODO ?OCC24592 ALL: Error: Max tolerance"
-puts "TODO ?OCC24592 ALL: Error : Number of faults is"
-puts "TODO ?OCC24592 ALL: Error : Number of free edges is"
-
+puts "TODO OCC24592 ALL: Error : Number of faults is"
+puts "TODO OCC24592 ALL: Error : Number of free edges is"
 restore [locate_data_file CIN902_intcqhms.rle] a
 
 sewing result $tol a
diff --git a/tests/sewing/tol_100/K1 b/tests/sewing/tol_100/K1
index 645d410b8e..07e93e08df 100644
--- a/tests/sewing/tol_100/K1
+++ b/tests/sewing/tol_100/K1
@@ -1,6 +1,5 @@
-puts "TODO ?OCC24592 ALL: Error : Number of free edges is"
-puts "TODO ?OCC24592 ALL: Error : Number of faults is"
-
+puts "TODO OCC24592 ALL: Error : Number of free edges is"
+puts "TODO OCC24592 ALL: Error : Number of faults is"
 restore [locate_data_file CNP002_projoiep.rle] a
 
 sewing result $tol a
diff --git a/tests/thrusection/bugs/bug24997 b/tests/thrusection/bugs/bug24997
new file mode 100755
index 0000000000..5a8bb5fc04
--- /dev/null
+++ b/tests/thrusection/bugs/bug24997
@@ -0,0 +1,15 @@
+puts "TODO OCC24997 ALL: An exception was caught"
+puts "TODO OCC24997 ALL: \\*\\* Exception \\*\\*.*"
+puts "TODO OCC24997 ALL: TEST INCOMPLETE"
+
+puts "========"
+puts "OCC24997"
+puts "========"
+puts ""
+#########################################
+# SIGSEGV in BRepOffsetAPI_ThruSections
+#########################################
+
+restore [locate_data_file bug24997_loft3-draw-Loft-00-section.brep] Loft-00-section
+restore [locate_data_file bug24997_loft3-draw-Loft-01-section.brep] Loft-01-section
+thrusections Loft 0 0 Loft-00-section Loft-01-section
diff --git a/tests/thrusection/grids.list b/tests/thrusection/grids.list
index 8128400a90..2d2da6b56c 100644
--- a/tests/thrusection/grids.list
+++ b/tests/thrusection/grids.list
@@ -1,4 +1,5 @@
 001 solids
 002 not_solids
 003 specific
+004 bugs