diff --git a/tests/bugs/modalg_2/bug453_2 b/tests/bugs/modalg_2/bug453_2
index 00080b18da..c73dadf3e0 100755
--- a/tests/bugs/modalg_2/bug453_2
+++ b/tests/bugs/modalg_2/bug453_2
@@ -1,4 +1,4 @@
-puts "TODO OCC25918 Windows: Error : The square of result shape is"
+puts "TODO ?OCC25918 Windows: Error : The square of result shape is"
 puts "TODO OCC24156 MacOS: Tcl Exception:"
 puts "TODO OCC24156 MacOS: TEST INCOMPLETE"
 
diff --git a/tests/bugs/modalg_2/bug5805_17 b/tests/bugs/modalg_2/bug5805_17
index 3c9772a2ca..682d9c6292 100755
--- a/tests/bugs/modalg_2/bug5805_17
+++ b/tests/bugs/modalg_2/bug5805_17
@@ -1,9 +1,6 @@
-puts "TODO ?OCC25718 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO ?OCC25718 ALL: result is not a topological shape"
-puts "TODO ?OCC25718 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC25718 ALL: Error : The square of result shape is"
-puts "TODO ?OCC25718 ALL: Error : Result shape is WRONG"
-puts "TODO ?OCC25718 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
+puts "TODO OCC25925 ALL: result is not a topological shape"
+puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_18 b/tests/bugs/modalg_2/bug5805_18
index 6f47d9a638..17673bb251 100755
--- a/tests/bugs/modalg_2/bug5805_18
+++ b/tests/bugs/modalg_2/bug5805_18
@@ -1,7 +1,7 @@
-puts "TODO ?OCC25718 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC25718 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO ?OCC25718 ALL: Tcl Exception: result is not a topological shape!!!"
-puts "TODO ?OCC25718 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
+puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
+puts "TODO OCC25925 ALL: Tcl Exception: result is not a topological shape!!!"
+puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_19 b/tests/bugs/modalg_2/bug5805_19
index 7134dd1f46..a9823466ad 100755
--- a/tests/bugs/modalg_2/bug5805_19
+++ b/tests/bugs/modalg_2/bug5805_19
@@ -1,10 +1,7 @@
-puts "TODO ?OCC25718 ALL: Error : Result shape is WRONG"
-puts "TODO ?OCC25718 ALL: Error : The square of result shape is"
-puts "TODO ?OCC25718 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC25718 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC25718 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO ?OCC25718 ALL: Tcl Exception: result is not a topological shape!!!"
-puts "TODO ?OCC25718 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
+puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
+puts "TODO OCC25925 ALL: Tcl Exception: result is not a topological shape!!!"
+puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_20 b/tests/bugs/modalg_2/bug5805_20
index e6050c237f..3104407c1b 100755
--- a/tests/bugs/modalg_2/bug5805_20
+++ b/tests/bugs/modalg_2/bug5805_20
@@ -1,7 +1,7 @@
-puts "TODO ?OCC25718 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC25718 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO ?OCC25718 ALL: Tcl Exception: result is not a topological shape!!!"
-puts "TODO ?OCC25718 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
+puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
+puts "TODO OCC25925 ALL: Tcl Exception: result is not a topological shape!!!"
+puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_30 b/tests/bugs/modalg_2/bug5805_30
index 9c755c7b3b..b0be04b1da 100755
--- a/tests/bugs/modalg_2/bug5805_30
+++ b/tests/bugs/modalg_2/bug5805_30
@@ -1,4 +1,4 @@
-puts "TODO OCC25718 ALL: Error : The square of result shape is"
+puts "TODO OCC25925 ALL: Error : The square of result shape is"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_32 b/tests/bugs/modalg_2/bug5805_32
index ced4b14aa2..e9d508280f 100755
--- a/tests/bugs/modalg_2/bug5805_32
+++ b/tests/bugs/modalg_2/bug5805_32
@@ -1,4 +1,4 @@
-puts "TODO OCC25718 ALL: Error : The square of result shape is"
+puts "TODO OCC25925 ALL: Error : The square of result shape is"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_4 b/tests/bugs/modalg_2/bug5805_4
index 1dd1ffb859..2e5b337f63 100755
--- a/tests/bugs/modalg_2/bug5805_4
+++ b/tests/bugs/modalg_2/bug5805_4
@@ -1,8 +1,8 @@
-puts "TODO ?OCC25718 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC25718 ALL: Faulty OCC5805 : offsetshape is wrong"
-puts "TODO ?OCC25718 ALL: Faulty OCC5805 : tolmax is wrong"
-puts "TODO ?OCC25718 ALL: Tcl Exception: can't read"
-puts "TODO ?OCC25718 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
+puts "TODO OCC25925 ALL: Faulty OCC5805 : offsetshape is wrong"
+puts "TODO OCC25925 ALL: Faulty OCC5805 : tolmax is wrong"
+puts "TODO OCC25925 ALL: Tcl Exception: can't read"
+puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_41 b/tests/bugs/modalg_2/bug5805_41
index f1faf667d3..6f1dbf1644 100755
--- a/tests/bugs/modalg_2/bug5805_41
+++ b/tests/bugs/modalg_2/bug5805_41
@@ -1,10 +1,6 @@
-puts "TODO ?OCC25718 ALL: Error : Result shape is WRONG"
-puts "TODO ?OCC25718 ALL: Error : The square of result shape is"
-puts "TODO ?OCC25718 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO ?OCC25718 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC25718 ALL: Error : The command is not valid"
-puts "TODO ?OCC25718 ALL: result is not a topological shape"
-puts "TODO ?OCC25718 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
+puts "TODO OCC25925 ALL: result is not a topological shape"
+puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_42 b/tests/bugs/modalg_2/bug5805_42
index a4bfe39f59..7a15c2f721 100755
--- a/tests/bugs/modalg_2/bug5805_42
+++ b/tests/bugs/modalg_2/bug5805_42
@@ -1,11 +1,5 @@
-puts "TODO ?OCC25718 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO ?OCC25718 ALL: Tcl Exception: result is not a topological shape!!!"
-puts "TODO ?OCC25718 ALL: Faulty shapes in variables faulty_1 to fauly_"
-puts "TODO ?OCC25718 ALL: Error : The square of result shape is"
-puts "TODO ?OCC25718 ALL: Error : Result shape is WRONG"
-puts "TODO ?OCC25718 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC25718 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC25718 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: Faulty shapes in variables faulty_1 to faulty_"
+puts "TODO OCC25925 ALL: Error : Result shape is WRONG"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_43 b/tests/bugs/modalg_2/bug5805_43
index f0a754f919..8f84630a3e 100755
--- a/tests/bugs/modalg_2/bug5805_43
+++ b/tests/bugs/modalg_2/bug5805_43
@@ -1,10 +1,7 @@
-puts "TODO ?OCC25718 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO ?OCC25718 ALL: Tcl Exception: result is not a topological shape!!!"
-puts "TODO ?OCC25718 ALL: Faulty shapes in variables faulty_1 to faulty_"
-puts "TODO ?OCC25718 ALL: Error : The square of result shape is"
-puts "TODO ?OCC25718 ALL: Error : Result shape is WRONG"
-puts "TODO ?OCC25718 ALL: ERROR. offsetperform operation not done"
-puts "TODO ?OCC25718 ALL: TEST INCOMPLETE"
+puts "TODO OCC25925 ALL: Tcl Exception: result is not a topological shape!!!"
+puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done"
+puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
+puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_2/bug5805_44 b/tests/bugs/modalg_2/bug5805_44
index dffce8094a..bd9dc83af1 100755
--- a/tests/bugs/modalg_2/bug5805_44
+++ b/tests/bugs/modalg_2/bug5805_44
@@ -1,9 +1,7 @@
-puts "TODO ?OCC25718 ALL: ERROR. offsetperform operation not done."
-puts "TODO ?OCC25718 ALL: Faulty OCC5805 : result is not Closed shape"
-puts "TODO ?OCC25718 ALL: Tcl Exception: result is not a topological shape!!!"
-puts "TODO ?OCC25718 ALL: TEST INCOMPLETE"
-puts "TODO ?OCC25718 ALL: Error : The square of result shape is"
-puts "TODO ?OCC25718 ALL: Error : Result shape is WRONG"
+puts "TODO OCC25925 ALL: ERROR. offsetperform operation not done."
+puts "TODO OCC25925 ALL: Faulty OCC5805 : result is not Closed shape"
+puts "TODO OCC25925 ALL: Tcl Exception: result is not a topological shape!!!"
+puts "TODO OCC25925 ALL: TEST INCOMPLETE"
 
 puts "============"
 puts "OCC5805"
diff --git a/tests/bugs/modalg_4/bug8842_7 b/tests/bugs/modalg_4/bug8842_7
index 8f6219567b..9f08c0dcf5 100755
--- a/tests/bugs/modalg_4/bug8842_7
+++ b/tests/bugs/modalg_4/bug8842_7
@@ -1,7 +1,3 @@
-puts "TODO ?OCC25913 ALL: OCC8842: Faulty"
-puts "TODO ?OCC25913 ALL: \\*\\* Exception"
-puts "TODO ?OCC25913 ALL: An exception was caught"
-
 puts "============"
 puts "OCC8842"
 puts "============"
diff --git a/tests/bugs/moddata_1/bug22759 b/tests/bugs/moddata_1/bug22759
index ff61bdbc87..af641bd28b 100755
--- a/tests/bugs/moddata_1/bug22759
+++ b/tests/bugs/moddata_1/bug22759
@@ -35,9 +35,9 @@ if { [string compare $os "windows"] != 0 } {
    set good_defl 0.0026800432954056617
 } else {
    puts "OS = Windows NT"
-   set good_tri  523436
-   set good_nod  265456
-   set good_defl 0.0028033497029316067
+   set good_tri  524278
+   set good_nod  265870
+   set good_defl 0.0026800432954056617
 }
 
 proc GetPercent {Value GoodValue} {
diff --git a/tests/bugs/vis/bug21091_4 b/tests/bugs/vis/bug21091_4
index 3f940cd076..afc202bc89 100755
--- a/tests/bugs/vis/bug21091_4
+++ b/tests/bugs/vis/bug21091_4
@@ -1,4 +1,4 @@
-puts "============"
+puts "MKV============"
 puts "OCC21091"
 puts "OCC21450"
 puts "============"
@@ -42,7 +42,7 @@ vexport ${aFile} PDF
 if { [string compare $tcl_platform(platform) "windows"] != 0 } {
    set refsize 10091
 } else {
-   set refsize 10079
+   set refsize 10115
 }
 
 if { [file exists ${aFile}] } {
diff --git a/tests/bugs/vis/bug21091_5 b/tests/bugs/vis/bug21091_5
index 9ac5df35d3..1e5e0165a4 100755
--- a/tests/bugs/vis/bug21091_5
+++ b/tests/bugs/vis/bug21091_5
@@ -42,7 +42,7 @@ vexport ${aFile} PS
 if { [string compare $tcl_platform(platform) "windows"] != 0 } {
    set refsize 10370
 } else {
-   set refsize 10365
+   set refsize 10394
 }
 
 if { [file exists ${aFile}] } {
diff --git a/tests/bugs/vis/bug21091_6 b/tests/bugs/vis/bug21091_6
index 7a4ba34555..4852b39157 100755
--- a/tests/bugs/vis/bug21091_6
+++ b/tests/bugs/vis/bug21091_6
@@ -42,7 +42,7 @@ vexport ${aFile} EPS
 if { [string compare $tcl_platform(platform) "windows"] != 0 } {
    set refsize 10314
 } else {
-   set refsize 10309
+   set refsize 10338
 }
 
 if { [file exists ${aFile}] } {
diff --git a/tests/bugs/vis/bug21091_9 b/tests/bugs/vis/bug21091_9
index 5df466239b..7fbaeab5ad 100755
--- a/tests/bugs/vis/bug21091_9
+++ b/tests/bugs/vis/bug21091_9
@@ -42,7 +42,7 @@ vexport ${aFile} PGF
 if { [string compare $tcl_platform(platform) "windows"] != 0 } {
    set refsize 20438
 } else {
-   set refsize 20770
+   set refsize 20810
 }
 
 if { [file exists ${aFile}] } {
diff --git a/tests/sewing/tol_100/K1 b/tests/sewing/tol_100/K1
index aaeed87a80..4f648fc780 100644
--- a/tests/sewing/tol_100/K1
+++ b/tests/sewing/tol_100/K1
@@ -1,4 +1,4 @@
-puts "TODO OCC23150 Windows: Error : Number of faults is"
+puts "TODO ?OCC23150 Windows: Error : Number of faults is"
 puts "TODO OCC24592 ALL: Error : Number of free edges is"
 
 restore [locate_data_file CNP002_projoiep.rle] a