diff --git a/tests/boolean/bsection/M5 b/tests/boolean/bsection/M5
index c5e2d6c3b3..8118b86efd 100644
--- a/tests/boolean/bsection/M5
+++ b/tests/boolean/bsection/M5
@@ -1,3 +1,8 @@
+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
 bsection result a_1 a_2
diff --git a/tests/boolean/bsection/N7 b/tests/boolean/bsection/N7
index 3a52c7c63f..001be5d1a4 100644
--- a/tests/boolean/bsection/N7
+++ b/tests/boolean/bsection/N7
@@ -1,11 +1,6 @@
-if { [array get env os_type] != "" } {
-	set os $env(os_type)
-}
-if { [string compare $os "windows"] == 0 } {
-	puts "TODO #22911 ALL: An exception was caught"
-	puts "TODO #22911 ALL: \\*\\* Exception \\*\\*.*"
-	puts "TODO #22911 ALL: TEST INCOMPLETE"
-}
+puts "TODO ?#22911 ALL: An exception was caught"
+puts "TODO ?#22911 ALL: \\*\\* Exception \\*\\*.*"
+puts "TODO ?#22911 ALL: TEST INCOMPLETE"
 
 cpulimit 900
 
diff --git a/tests/bugs/modalg_1/bug1477_11 b/tests/bugs/modalg_1/bug1477_11
index 440c532c4d..3dda566007 100755
--- a/tests/bugs/modalg_1/bug1477_11
+++ b/tests/bugs/modalg_1/bug1477_11
@@ -1,6 +1,7 @@
 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 "============"
diff --git a/tests/bugs/modalg_2/bug453_2 b/tests/bugs/modalg_2/bug453_2
index da70eca5d0..e2d4aaf2c7 100755
--- a/tests/bugs/modalg_2/bug453_2
+++ b/tests/bugs/modalg_2/bug453_2
@@ -1,3 +1,4 @@
+puts "TODO ?OCC453 ALL: Error : The square of result shape is"
 
 puts "========"
 puts "OCC453"
diff --git a/tests/bugs/xde/bug22982 b/tests/bugs/xde/bug22982
index 44ea8d17fc..efc373b79a 100755
--- a/tests/bugs/xde/bug22982
+++ b/tests/bugs/xde/bug22982
@@ -2,6 +2,7 @@ puts "TODO ?OCC11111 ALL: Error on Record"
 puts "TODO ?OCC11111 ALL: Error : Colors are not equal"
 puts "TODO ?OCC11111 ALL: \\*\\* Exception"
 puts "TODO ?OCC11111 ALL: Faulty : colors are not equal."
+puts "TODO ?OCC11111 ALL: Tcl Exception"
 puts "TODO ?OCC11111 ALL: TEST INCOMPLETE"
 
 pload QAcommands
diff --git a/tests/caf/driver/B6 b/tests/caf/driver/B6
index 75482c66d9..bc2e30fa0c 100755
--- a/tests/caf/driver/B6
+++ b/tests/caf/driver/B6
@@ -1,4 +1,5 @@
 puts "TODO ?CR23788 ALL: Failed units"
+puts "TODO ?CR23788 ALL: DNaming_SolveFlatFrom: Driver failed"
 #1 - create 4 Pnts
 NewCommand D
 AddDriver D PntXYZ PntRLT Line3D Attach;
diff --git a/tests/offset/faces_type_i/C8 b/tests/offset/faces_type_i/C8
index 5f8c93f09d..ddbb4ad3d3 100644
--- a/tests/offset/faces_type_i/C8
+++ b/tests/offset/faces_type_i/C8
@@ -1,7 +1,17 @@
-puts "TODO OCC23068 ALL: Error : The offset is not valid"
-psphere s 15 90
-trotate s 0 0 0 0 0 1 90
+puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO ?OCC23068 ALL: Error : The volume of the resulting shape is"
+puts "TODO ?OCC23068 ALL: Exception"
+puts "TODO ?OCC23068 ALL: An exception was caught"
+puts "TODO ?OCC23068 ALL: TEST INCOMPLETE"
 
-OFFSETSHAPE -1 {s_2 s_3} $calcul $type
+ellipse w1 0 0 0 15 10
+mkedge w1 w1 0 pi/2
+trotate w1 0 0 0 1 0 0 90
+polyline w2 0 0 10 0 0 -10 25 0 -10 15 0 0
+wire w w1 w2
+mkplane w w
+revol s w 0 0 0 0 0 1 270
+
+OFFSETSHAPE -1 {} $calcul $type
 
 set volume 0
diff --git a/tests/offset/faces_type_i/D7 b/tests/offset/faces_type_i/D7
index e484bdcb9e..162893d846 100644
--- a/tests/offset/faces_type_i/D7
+++ b/tests/offset/faces_type_i/D7
@@ -1,5 +1,14 @@
-ptorus s 10 10 0 45
+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_"
+ellipse w1 0 0 0 15 10
+mkedge w1 w1 0 pi/2
+trotate w1 0 0 0 1 0 0 90
+polyline w2 0 0 10 0 0 -10 25 0 -10 15 0 0
+wire w w1 w2
+mkplane w w
+revol s w 0 0 0 0 0 1 360
 
-OFFSETSHAPE -1 {s_2 s_3} $calcul $type
+OFFSETSHAPE -1 {} $calcul $type
 
-set volume 923.572
+set volume 13139