diff --git a/wst/trunk/tests/test_suite/testformatter_unit.pas b/wst/trunk/tests/test_suite/testformatter_unit.pas
index e2b55635f..af834a116 100644
--- a/wst/trunk/tests/test_suite/testformatter_unit.pas
+++ b/wst/trunk/tests/test_suite/testformatter_unit.pas
@@ -703,7 +703,7 @@ begin
     f.EndScope();
 
     s := TMemoryStream.Create();
-    f.SaveToStream(s);
+    f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Single_4.xml');
     tmpVal := 0;
 
     f := CreateFormatter(TypeInfo(TClass_Float));
@@ -739,7 +739,7 @@ begin
     f.EndScope();
 
     s := TMemoryStream.Create();
-    f.SaveToStream(s);
+    f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Double_8.xml');
     tmpVal := 0;
 
     f := CreateFormatter(TypeInfo(TClass_Float));
@@ -775,7 +775,7 @@ begin
     f.EndScope();
 
     s := TMemoryStream.Create();
-    f.SaveToStream(s);
+    f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Currency_8.xml');
     tmpVal := 0;
 
     f := CreateFormatter(TypeInfo(TClass_Float));
@@ -811,7 +811,7 @@ begin
     f.EndScope();
 
     s := TMemoryStream.Create();
-    f.SaveToStream(s);
+    f.SaveToStream(s);s.SaveToFile(ClassName + '.Test_Extended_10.xml');
     tmpVal := 0;
 
     f := CreateFormatter(TypeInfo(TClass_Float));
diff --git a/wst/trunk/tests/test_suite/wst_test_suite.lpi b/wst/trunk/tests/test_suite/wst_test_suite.lpi
index 4a0f9cc41..dd11d30d6 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite.lpi
+++ b/wst/trunk/tests/test_suite/wst_test_suite.lpi
@@ -7,7 +7,7 @@
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="2"/>
+      <ActiveEditorIndexAtStart Value="5"/>
     </General>
     <PublishOptions>
       <Version Value="2"/>
@@ -32,16 +32,18 @@
         <Filename Value="wst_test_suite.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="wst_test_suite"/>
-        <CursorPos X="8" Y="6"/>
+        <CursorPos X="9" Y="5"/>
         <TopLine Value="1"/>
+        <EditorIndex Value="5"/>
         <UsageCount Value="200"/>
+        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="testformatter_unit.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="testformatter_unit"/>
-        <CursorPos X="52" Y="984"/>
-        <TopLine Value="958"/>
+        <CursorPos X="48" Y="814"/>
+        <TopLine Value="796"/>
         <EditorIndex Value="4"/>
         <UsageCount Value="200"/>
         <Bookmarks Count="1">
@@ -71,7 +73,7 @@
         <UnitName Value="base_binary_formatter"/>
         <CursorPos X="15" Y="1479"/>
         <TopLine Value="1464"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="6"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit4>
@@ -93,8 +95,8 @@
         <Filename Value="..\..\base_soap_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_soap_formatter"/>
-        <CursorPos X="1" Y="1677"/>
-        <TopLine Value="1664"/>
+        <CursorPos X="1" Y="1705"/>
+        <TopLine Value="1676"/>
         <EditorIndex Value="1"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
@@ -113,7 +115,7 @@
         <UnitName Value="binary_streamer"/>
         <CursorPos X="14" Y="14"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="10"/>
+        <EditorIndex Value="11"/>
         <UsageCount Value="200"/>
         <Bookmarks Count="1">
           <Item0 X="38" Y="490" ID="2"/>
@@ -142,7 +144,7 @@
         <UnitName Value="testmetadata_unit"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="8"/>
         <UsageCount Value="202"/>
         <Loaded Value="True"/>
       </Unit11>
@@ -172,7 +174,7 @@
         <UnitName Value="metadata_wsdl"/>
         <CursorPos X="44" Y="21"/>
         <TopLine Value="209"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="7"/>
         <UsageCount Value="206"/>
         <Loaded Value="True"/>
       </Unit14>
@@ -471,7 +473,7 @@
         <UnitName Value="test_utilities"/>
         <CursorPos X="29" Y="43"/>
         <TopLine Value="3"/>
-        <EditorIndex Value="9"/>
+        <EditorIndex Value="10"/>
         <UsageCount Value="48"/>
         <Loaded Value="True"/>
       </Unit57>
@@ -487,7 +489,7 @@
         <UnitName Value="testregistry"/>
         <CursorPos X="39" Y="27"/>
         <TopLine Value="17"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="9"/>
         <UsageCount Value="15"/>
         <Loaded Value="True"/>
       </Unit59>
@@ -524,23 +526,19 @@
         <UsageCount Value="11"/>
       </Unit64>
     </Units>
-    <JumpHistory Count="4" HistoryIndex="3">
+    <JumpHistory Count="3" HistoryIndex="2">
       <Position1>
-        <Filename Value="..\..\base_binary_formatter.pas"/>
-        <Caret Line="21" Column="14" TopLine="13"/>
+        <Filename Value="testformatter_unit.pas"/>
+        <Caret Line="314" Column="36" TopLine="301"/>
       </Position1>
       <Position2>
-        <Filename Value="..\..\base_binary_formatter.pas"/>
-        <Caret Line="1410" Column="3" TopLine="1393"/>
+        <Filename Value="testformatter_unit.pas"/>
+        <Caret Line="724" Column="3" TopLine="695"/>
       </Position2>
       <Position3>
-        <Filename Value="..\..\base_xmlrpc_formatter.pas"/>
-        <Caret Line="1341" Column="9" TopLine="1319"/>
+        <Filename Value="testformatter_unit.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position3>
-      <Position4>
-        <Filename Value="..\..\base_xmlrpc_formatter.pas"/>
-        <Caret Line="1274" Column="15" TopLine="1259"/>
-      </Position4>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/wst/trunk/tests/test_suite/wst_test_suite.lpr b/wst/trunk/tests/test_suite/wst_test_suite.lpr
index 2d48456d0..c561f7d8a 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite.lpr
+++ b/wst/trunk/tests/test_suite/wst_test_suite.lpr
@@ -2,7 +2,13 @@ program wst_test_suite;
 
 {$mode objfpc}{$H+}
 
+{$DEFINE UseCThreads}
+
 uses
+  {$IFDEF UNIX}{$IFDEF UseCThreads}
+  cthreads,
+  {$ENDIF}{$ENDIF}
+
   custapp, classes, sysutils, fpcunit, testreport, testregistry, 
   TestFormatter_unit, testmetadata_unit,
   server_service_soap, soap_formatter, base_binary_formatter,