diff --git a/tests/bugs/mesh/bug25364 b/tests/bugs/mesh/bug25364
index 130c8b5f76..a9393f27a4 100755
--- a/tests/bugs/mesh/bug25364
+++ b/tests/bugs/mesh/bug25364
@@ -66,7 +66,7 @@ puts "mem_heap_2=${mem_heap_2}"
 
 set mem_delta_private 180
 set mem_delta_swap 100
-set mem_delta_swappeak 150
+set mem_delta_swappeak 250
 set mem_delta_wset 180
 set mem_delta_wsetpeak 180
 set mem_delta_virt 180
diff --git a/tests/bugs/modalg_4/bug697_2 b/tests/bugs/modalg_4/bug697_2
index d706ae12ca..ac2599bea5 100755
--- a/tests/bugs/modalg_4/bug697_2
+++ b/tests/bugs/modalg_4/bug697_2
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The square of result shape is"
-puts "TODO OCC25735 ALL: Faulty shapes in variables faulty_1 to"
+puts "TODO ?OCC25735 ALL: Faulty shapes in variables faulty_1 to"
 
 puts "============"
 puts "OCC697"
diff --git a/tests/bugs/modalg_4/bug697_4 b/tests/bugs/modalg_4/bug697_4
index dc752baeab..ec5f11ebd8 100755
--- a/tests/bugs/modalg_4/bug697_4
+++ b/tests/bugs/modalg_4/bug697_4
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The square of result shape is"
-puts "TODO OCC25735 ALL: Faulty shapes in variables faulty_1 to"
+puts "TODO ?OCC25735 ALL: Faulty shapes in variables faulty_1 to"
 
 puts "============"
 puts "OCC697"
diff --git a/tests/bugs/modalg_4/bug697_7 b/tests/bugs/modalg_4/bug697_7
index 54a47084d4..f67ce5dfd3 100755
--- a/tests/bugs/modalg_4/bug697_7
+++ b/tests/bugs/modalg_4/bug697_7
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The square of result shape is"
-puts "TODO OCC25735 ALL: Faulty shapes in variables faulty_1 to"
+puts "TODO ?OCC25735 ALL: Faulty shapes in variables faulty_1 to"
 
 puts "============"
 puts "OCC697"
diff --git a/tests/bugs/modalg_4/bug697_8 b/tests/bugs/modalg_4/bug697_8
index b832ac3899..8151cb284a 100755
--- a/tests/bugs/modalg_4/bug697_8
+++ b/tests/bugs/modalg_4/bug697_8
@@ -1,5 +1,5 @@
 puts "TODO OCC12345 ALL: Error : The square of result shape is"
-puts "TODO OCC25735 ALL: Faulty shapes in variables faulty_1 to"
+puts "TODO ?OCC25735 ALL: Faulty shapes in variables faulty_1 to"
 
 puts "============"
 puts "OCC697"
diff --git a/tests/de/step_1/R9 b/tests/de/step_1/R9
index 3ce172db0e..1b547c2fe2 100644
--- a/tests/de/step_1/R9
+++ b/tests/de/step_1/R9
@@ -3,7 +3,7 @@ set filename stepBF3.stp
 
 set ref_data {
 DATA        : Faulties = 0  ( 26 )  Warnings = 0  ( 0 )  Summary  = 0  ( 26 )
-TPSTAT      : Faulties = 0  ( 1 )  Warnings = 0  ( 0 )  Summary  = 0  ( 1 )
+TPSTAT      : Faulties = 0  ( 2 )  Warnings = 0  ( 0 )  Summary  = 0  ( 2 )
 CHECKSHAPE  : Wires    = 0  ( 0 )  Faces    = 0  ( 0 )  Shells   = 0  ( 0 )   Solids   = 0 ( 0 )
 NBSHAPES    : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   Summary  = 1  ( 1 )
 STATSHAPE   : Solid    = 0  ( 0 )  Shell    = 0  ( 0 )  Face     = 0  ( 0 )   FreeWire = 0  ( 0 )   FreeEdge  = 0 ( 0 )   SharedEdge = 0  ( 0 )
diff --git a/tests/de/step_1/ZQ2 b/tests/de/step_1/ZQ2
index 13592457fe..da588e0a4a 100644
--- a/tests/de/step_1/ZQ2
+++ b/tests/de/step_1/ZQ2
@@ -1,3 +1,6 @@
+puts "TODO OCC25848 Windows: LABELS : Faulty"
+puts "TODO OCC25848 Windows: Error : 1 differences with reference data found"
+
 # !!!! This file is generated automatically, do not edit manually! See end script
 set filename trj12_gd1-id-214.stp
 
diff --git a/tests/de/step_3/D8 b/tests/de/step_3/D8
index 7290d62c4b..0ff3be404b 100755
--- a/tests/de/step_3/D8
+++ b/tests/de/step_3/D8
@@ -1,6 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
+puts "TODO CR23096 Debian60-64: CHECKSHAPE : Faulty" 
 
+# No checkape error on WNT in 64-bit only (after 22598 and issue 25797 was registered for that)
 
 set filename trj6_pm4-hc-214.stp
 
diff --git a/tests/draft/angle/G8 b/tests/draft/angle/G8
index 5b89565a8a..663e8be13e 100644
--- a/tests/draft/angle/G8
+++ b/tests/draft/angle/G8
@@ -1,6 +1,7 @@
 #F6----------------------------------------------
-puts "TODO OCC22803 All:Error in depouille"
-puts "TODO OCC22803 All:Error : The skin cannot be built."
+puts "TODO OCC22803 Debian60-64: Error in depouille"
+puts "TODO OCC22803 Debian60-64: Error : The skin cannot be built."
+puts "TODO OCC22803 Windows: Faulty shapes in variables faulty_1 to faulty_"
 polyline p 0 0 3  0 0 0  10 0 0  10 0 3  
 beziercurve bc 4 10 0 3  7 0 2  3 0 3  0 0 3
 mkedge bc bc
@@ -16,4 +17,4 @@ if { [catch { depouille result f 0 0 1 f_4 3 0 0 10 0 0 1 } ] != 0 } {
   puts "Error in depouille"
 }
 
-set square 0
+set square 492.768
\ No newline at end of file
diff --git a/tests/perf/ncollection/A1 b/tests/perf/ncollection/A1
index f7a8f290e9..3f5497433b 100644
--- a/tests/perf/ncollection/A1
+++ b/tests/perf/ncollection/A1
@@ -31,13 +31,13 @@ if { [string compare $tcl_platform(platform) "windows"] != 0 } {
 } else {
   set check_values  { 1.383409071179103
                       5.1472531605899908
-                      1.35719377028335395
+                      5.55719377028335395
                       5.5309830187022213
-                      1.18734859347377246
+                      1.58734859347377246
                       1.18885181806915312
                       1.4285334583511072
                       0.20619280354776386
-                      0.05983563611646603
+                      0.21983563611646603
                     }
 }
 set index 0