diff --git a/tests/bugs/modalg_2/bug399 b/tests/bugs/modalg_2/bug399
index 1a4f9fc8b0..4858b91cdd 100755
--- a/tests/bugs/modalg_2/bug399
+++ b/tests/bugs/modalg_2/bug399
@@ -2,8 +2,8 @@ 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"
+   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/bug426 b/tests/bugs/modalg_2/bug426
index 4fca715779..9ce4d59911 100755
--- a/tests/bugs/modalg_2/bug426
+++ b/tests/bugs/modalg_2/bug426
@@ -2,9 +2,9 @@ if {[array get env os_type] != ""} {
     set os $env(os_type)
 }
 if {[string compare $os "windows"] != 0 } {
-    puts "TODO OCC12345 ALL: \\*\\* Exception"
-    puts "TODO OCC12345 ALL: An exception was caught"
-    puts "TODO OCC12345 ALL: TEST INCOMPLETE"
+    puts "TODO ?OCC12345 ALL: \\*\\* Exception"
+    puts "TODO ?OCC12345 ALL: An exception was caught"
+    puts "TODO ?OCC12345 ALL: TEST INCOMPLETE"
 }
 
 pload QAcommands
diff --git a/tests/bugs/modalg_4/bug770 b/tests/bugs/modalg_4/bug770
index a16f240721..6adcfab41c 100755
--- a/tests/bugs/modalg_4/bug770
+++ b/tests/bugs/modalg_4/bug770
@@ -1,4 +1,6 @@
 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"
 
diff --git a/tests/bugs/moddata_1/bug165_2 b/tests/bugs/moddata_1/bug165_2
index 624eb3d75c..6e112cd3b2 100755
--- a/tests/bugs/moddata_1/bug165_2
+++ b/tests/bugs/moddata_1/bug165_2
@@ -2,9 +2,9 @@ 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: OCC165 Faulty"
+    puts "TODO ?OCC12345 ALL: An exception was caught"
+    puts "TODO ?OCC12345 ALL: \\*\\* Exception \\*\\*.*"
+    puts "TODO ?OCC12345 ALL: OCC165 Faulty"
 }
 
 puts "========"
diff --git a/tests/bugs/moddata_2/bug567 b/tests/bugs/moddata_2/bug567
index 67c35d401c..ceb511343d 100755
--- a/tests/bugs/moddata_2/bug567
+++ b/tests/bugs/moddata_2/bug567
@@ -1,4 +1,5 @@
 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 MacOS: Faulty OCC565: function intersection works wrongly with infinite Surfaces"
 
 puts "========"
diff --git a/tests/bugs/vis/bug23652 b/tests/bugs/vis/bug23652
index fd172cd845..7b9b8a4dd9 100755
--- a/tests/bugs/vis/bug23652
+++ b/tests/bugs/vis/bug23652
@@ -26,8 +26,8 @@ set at_Z     0
 
 vviewparams ${scale} ${center_X} ${center_Y} ${proj_X} ${proj_Y} ${proj_Z} ${up_X} ${up_Y} ${up_Z} ${at_X} ${at_Y} ${at_Z}
 
-set x_coord 36
-set y_coord 201
+set x_coord 210
+set y_coord 204
 
 checkcolor $x_coord $y_coord 0.6 0.6 0.6
 
diff --git a/tests/bugs/xde/bug22898 b/tests/bugs/xde/bug22898
index ae19c8a696..75bc38d5b0 100644
--- a/tests/bugs/xde/bug22898
+++ b/tests/bugs/xde/bug22898
@@ -3,7 +3,7 @@
 # check that the result is good shape with expected area
 
 set anOS $tcl_platform(os)
-if { ${anOS} == "Darwin" } {
+if { ${anOS} == "Linux" } {
   dlocale LC_ALL fr_FR
 } else {
   dlocale LC_ALL French
diff --git a/tests/chamfer/data/complex/B9 b/tests/chamfer/data/complex/B9
index 47fbd49f90..99513620a4 100644
--- a/tests/chamfer/data/complex/B9
+++ b/tests/chamfer/data/complex/B9
@@ -15,12 +15,12 @@ if { [string compare $command chamf_sequence] == 0 } {
   if { [string compare ${os} "Windows-64-VC9"] != 0 && [string compare ${os} "Windows-64-VC10"] != 0} {
     set nf 0
     if { [string compare $group equal_dist] == 0 } {
-      if {[string compare $os "Debian40"] == 0 || [string compare $os "Mandriva2008"] == 0 || [string compare $os "Mandriva2010"] == 0 } {
+      if {[string compare $os "Debian40"] == 0 || [string compare $os "Debian60-64"] == 0 || [string compare $os "Mandriva2008"] == 0 || [string compare $os "Mandriva2010"] == 0 } {
         set nf 4
       }
     }
     if { [string compare $group dist_dist] == 0 } {
-      if {[string compare $os "Mandriva2010"] == 0} {
+      if {[string compare $os "Mandriva2010"] == 0 || [string compare $os "Debian60-64"] == 0 } {
         set nf 2
       ##set nf 0
       }
diff --git a/tests/de/iges_1/K9 b/tests/de/iges_1/K9
index dabae680ff..27e3a80efa 100644
--- a/tests/de/iges_1/K9
+++ b/tests/de/iges_1/K9
@@ -5,6 +5,7 @@ puts "TODO CR23096 ALL: LABELS : Faulty"
 puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
 puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty" 
 puts "TODO CR23096 Mandriva2010: TOLERANCE : Faulty"
+puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty"
 
 set LinuxDiff 3
 set LinuxFaulties {STATSHAPE TOLERANCE}
diff --git a/tests/de/iges_1/M1 b/tests/de/iges_1/M1
index 8fdf41f954..d5f8c9bf59 100644
--- a/tests/de/iges_1/M1
+++ b/tests/de/iges_1/M1
@@ -1,6 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 Windows: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
+puts "TODO ?CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :"
 
 set LinuxDiff 4
diff --git a/tests/de/iges_1/P8 b/tests/de/iges_1/P8
index 177ab2e76d..5cc4026539 100644
--- a/tests/de/iges_1/P8
+++ b/tests/de/iges_1/P8
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 Windows: CHECKSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
 
 set LinuxDiff 2
diff --git a/tests/de/iges_2/F4 b/tests/de/iges_2/F4
index e042092517..350484e2c0 100644
--- a/tests/de/iges_2/F4
+++ b/tests/de/iges_2/F4
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 Windows: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 Windows: STATSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty"
 puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
diff --git a/tests/de/iges_2/G4 b/tests/de/iges_2/G4
index e7d2d453bc..48d63f946d 100644
--- a/tests/de/iges_2/G4
+++ b/tests/de/iges_2/G4
@@ -1,5 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 Windows: STATSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :"
 
diff --git a/tests/de/iges_2/H9 b/tests/de/iges_2/H9
index 07d4f6914e..b5399bce12 100644
--- a/tests/de/iges_2/H9
+++ b/tests/de/iges_2/H9
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 Windows: NBSHAPES : Faulty" 
+puts "TODO ?CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :"
diff --git a/tests/de/iges_3/A3 b/tests/de/iges_3/A3
index 194156ac27..74609b6355 100644
--- a/tests/de/iges_3/A3
+++ b/tests/de/iges_3/A3
@@ -4,7 +4,7 @@ puts "TODO CR23096 ALL: NBSHAPES : Faulty"
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 ALL: COLORS : Faulty" 
 puts "TODO CR23096 ALL: LAYERS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :"
+puts "TODO ?CR23096 ALL: Error : 1 differences with reference data found :"
 
 set LinuxDiff 1
 set filename UKI60107-6.igs
diff --git a/tests/de/iges_3/A5 b/tests/de/iges_3/A5
index f92bbc4d54..814a333e7f 100644
--- a/tests/de/iges_3/A5
+++ b/tests/de/iges_3/A5
@@ -1,10 +1,10 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 Windows: STATSHAPE : Faulty" 
-puts "TODO CR23096 Windows: TOLERANCE : Faulty" 
+puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 5 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: CHECKSHAPE : Faulty"
+puts "TODO ?CR23096 ALL: Error : 5 differences with reference data found :"
+puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty"
 
 set LinuxDiff 5
 set LinuxFaulties {CHECKSHAPE}
diff --git a/tests/de/iges_3/B2 b/tests/de/iges_3/B2
index c0703b6bcd..22ea1ea2d7 100644
--- a/tests/de/iges_3/B2
+++ b/tests/de/iges_3/B2
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 Windows: STATSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
diff --git a/tests/de/step_1/N6 b/tests/de/step_1/N6
index ed85f41430..c332536480 100644
--- a/tests/de/step_1/N6
+++ b/tests/de/step_1/N6
@@ -1,5 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 Windows: LABELS : Faulty" 
+puts "TODO ?CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty " 
 puts "TODO CR23096 Mandriva2010: TPSTAT : Faulty " 
 puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :" 
diff --git a/tests/de/step_2/D8 b/tests/de/step_2/D8
index 15673ea6c4..dadd7a9dbc 100644
--- a/tests/de/step_2/D8
+++ b/tests/de/step_2/D8
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 Windows: STATSHAPE : Faulty" 
-puts "TODO CR23096 Windows: LABELS : Faulty" 
+puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: LABELS : Faulty" 
 puts "TODO CR23096 Mandriva2010: Error : 4 differences with reference data found :"
 puts "TODO CR23096 Mandriva2010: STATSHAPE : Faulty " 
 
diff --git a/tests/de/step_2/E6 b/tests/de/step_2/E6
index 09171c1419..00b7d1bd92 100644
--- a/tests/de/step_2/E6
+++ b/tests/de/step_2/E6
@@ -1,5 +1,5 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 Windows: TPSTAT : Faulty" 
+puts "TODO ?CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: LABELS : Faulty" 
 
diff --git a/tests/de/step_3/C5 b/tests/de/step_3/C5
index f5c309f3cd..3c43f1f69a 100644
--- a/tests/de/step_3/C5
+++ b/tests/de/step_3/C5
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 Windows: CHECKSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 
 
diff --git a/tests/de/step_3/D3 b/tests/de/step_3/D3
index ba0e7f2d8d..6eee261871 100644
--- a/tests/de/step_3/D3
+++ b/tests/de/step_3/D3
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 Mandriva2010: Error : 1 differences with reference data found :"
-puts "TODO CR23096 Mandriva2010: CHECKSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: Error : 1 differences with reference data found :"
+puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
 
 set LinuxDiff 1
 set LinuxFaulties {CHECKSHAPE}
diff --git a/tests/de/step_3/E6 b/tests/de/step_3/E6
index 0388f7174e..07efe2e145 100644
--- a/tests/de/step_3/E6
+++ b/tests/de/step_3/E6
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
-puts "TODO CR23096 Windows: TOLERANCE : Faulty" 
+puts "TODO ?CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 Mandriva2010: Error : 3 differences with reference data found :"
 
 set LinuxDiff 3
diff --git a/tests/de/step_3/F2 b/tests/de/step_3/F2
index 14a23ea88b..4a66cc8215 100644
--- a/tests/de/step_3/F2
+++ b/tests/de/step_3/F2
@@ -1,6 +1,6 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
 puts "TODO CR23096 ALL: TPSTAT : Faulty" 
-puts "TODO CR23096 Windows: CHECKSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
 
 
diff --git a/tests/de/step_3/F3 b/tests/de/step_3/F3
index 06b962010b..928dffd5cc 100644
--- a/tests/de/step_3/F3
+++ b/tests/de/step_3/F3
@@ -3,7 +3,7 @@ puts "TODO CR23096 ALL: TPSTAT : Faulty"
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
 puts "TODO CR23096 ALL: STATSHAPE : Faulty" 
 puts "TODO CR23096 ALL: TOLERANCE : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
+puts "TODO ?CR23096 ALL: Error : 2 differences with reference data found :"
 
 
 set LinuxDiff 2
diff --git a/tests/de/step_4/G7 b/tests/de/step_4/G7
index a6593b88b4..de3e4efa0e 100644
--- a/tests/de/step_4/G7
+++ b/tests/de/step_4/G7
@@ -1,8 +1,8 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 Windows: CHECKSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
 puts "TODO CR23096 ALL: NBSHAPES : Faulty" 
-puts "TODO CR23096 Windows: TOLERANCE : Faulty" 
-puts "TODO CR23096 Mandriva2010: Error : 2 differences with reference data found :"
+puts "TODO ?CR23096 ALL: TOLERANCE : Faulty" 
+puts "TODO ?CR23096 ALL: Error : 2 differences with reference data found :"
 
 set LinuxDiff 2
 set filename BUC61004.stp
diff --git a/tests/de/step_5/A1 b/tests/de/step_5/A1
index 6d705016c5..2fc429f4df 100644
--- a/tests/de/step_5/A1
+++ b/tests/de/step_5/A1
@@ -1,7 +1,7 @@
 # !!!! This file is generated automatically, do not edit manually! See end script
-puts "TODO CR23096 Windows: CHECKSHAPE : Faulty" 
-puts "TODO CR23096 Windows: STATSHAPE : Faulty" 
-puts "TODO CR23096 Windows: TOLERANCE : Faulty" 
+puts "TODO ?CR23096 ALL: CHECKSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: STATSHAPE : Faulty" 
+puts "TODO ?CR23096 ALL: TOLERANCE : Faulty" 
 puts "TODO CR23096 Mandriva2010: TEST INCOMPLETE"
 
 set filename Z8INV5.stp