diff --git a/wst/trunk/tests/test_suite/wst_test_suite.lpi b/wst/trunk/tests/test_suite/wst_test_suite.lpi
index 6ddabb906..f7dfac0f6 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite.lpi
+++ b/wst/trunk/tests/test_suite/wst_test_suite.lpi
@@ -4,10 +4,10 @@
     <PathDelim Value="\"/>
     <Version Value="6"/>
     <General>
+      <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="6"/>
     </General>
     <PublishOptions>
       <Version Value="2"/>
@@ -27,480 +27,173 @@
         <PackageName Value="FPCUnitTestRunner"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="47">
+    <Units Count="33">
       <Unit0>
         <Filename Value="wst_test_suite.lpr"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="wst_test_suite"/>
-        <CursorPos X="41" Y="108"/>
-        <TopLine Value="95"/>
-        <UsageCount Value="200"/>
       </Unit0>
       <Unit1>
         <Filename Value="testformatter_unit.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="testformatter_unit"/>
-        <CursorPos X="17" Y="3717"/>
-        <TopLine Value="3715"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="200"/>
-        <Bookmarks Count="1">
-          <Item0 X="17" Y="1128" ID="3"/>
-        </Bookmarks>
-        <Loaded Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="..\..\server_service_soap.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="server_service_soap"/>
-        <CursorPos X="3" Y="83"/>
-        <TopLine Value="81"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="200"/>
-        <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\..\soap_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="soap_formatter"/>
-        <CursorPos X="1" Y="260"/>
-        <TopLine Value="246"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="200"/>
-        <Loaded Value="True"/>
       </Unit3>
       <Unit4>
         <Filename Value="..\..\base_binary_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_binary_formatter"/>
-        <CursorPos X="24" Y="27"/>
-        <TopLine Value="7"/>
-        <EditorIndex Value="10"/>
-        <UsageCount Value="200"/>
-        <Loaded Value="True"/>
       </Unit4>
       <Unit5>
         <Filename Value="..\..\base_service_intf.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_service_intf"/>
-        <CursorPos X="1" Y="4086"/>
-        <TopLine Value="4072"/>
-        <EditorIndex Value="13"/>
-        <UsageCount Value="200"/>
-        <Bookmarks Count="2">
-          <Item0 X="33" Y="1201" ID="0"/>
-          <Item1 X="5" Y="1255" ID="1"/>
-        </Bookmarks>
-        <Loaded Value="True"/>
       </Unit5>
       <Unit6>
         <Filename Value="..\..\base_soap_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_soap_formatter"/>
-        <CursorPos X="3" Y="37"/>
-        <TopLine Value="23"/>
-        <EditorIndex Value="7"/>
-        <UsageCount Value="200"/>
-        <Loaded Value="True"/>
       </Unit6>
       <Unit7>
         <Filename Value="..\..\binary_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="binary_formatter"/>
-        <CursorPos X="9" Y="177"/>
-        <TopLine Value="169"/>
-        <EditorIndex Value="9"/>
-        <UsageCount Value="200"/>
-        <Loaded Value="True"/>
       </Unit7>
       <Unit8>
         <Filename Value="..\..\binary_streamer.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="binary_streamer"/>
-        <CursorPos X="1" Y="14"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="200"/>
       </Unit8>
       <Unit9>
         <Filename Value="..\..\server_binary_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="server_binary_formatter"/>
-        <CursorPos X="1" Y="24"/>
-        <TopLine Value="12"/>
-        <EditorIndex Value="3"/>
-        <UsageCount Value="200"/>
-        <Loaded Value="True"/>
       </Unit9>
       <Unit10>
         <Filename Value="..\..\metadata_repository.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="metadata_repository"/>
-        <CursorPos X="51" Y="18"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="200"/>
       </Unit10>
       <Unit11>
         <Filename Value="testmetadata_unit.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="testmetadata_unit"/>
-        <CursorPos X="64" Y="22"/>
-        <TopLine Value="12"/>
-        <UsageCount Value="202"/>
       </Unit11>
       <Unit12>
         <Filename Value="..\..\ws_helper\metadata_generator.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="metadata_generator"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="40"/>
-        <UsageCount Value="202"/>
       </Unit12>
       <Unit13>
         <Filename Value="..\..\ws_helper\parserdefs.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="parserdefs"/>
-        <CursorPos X="1" Y="1024"/>
-        <TopLine Value="1010"/>
-        <UsageCount Value="202"/>
-        <Bookmarks Count="1">
-          <Item0 X="18" Y="1133" ID="2"/>
-        </Bookmarks>
       </Unit13>
       <Unit14>
         <Filename Value="..\..\metadata_wsdl.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="metadata_wsdl"/>
-        <CursorPos X="40" Y="836"/>
-        <TopLine Value="828"/>
-        <UsageCount Value="206"/>
       </Unit14>
       <Unit15>
         <Filename Value="..\..\server_service_intf.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="server_service_intf"/>
-        <CursorPos X="25" Y="14"/>
-        <TopLine Value="97"/>
-        <UsageCount Value="203"/>
       </Unit15>
       <Unit16>
         <Filename Value="test_parserdef.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_parserdef"/>
-        <CursorPos X="93" Y="76"/>
-        <TopLine Value="11"/>
-        <UsageCount Value="200"/>
       </Unit16>
       <Unit17>
         <Filename Value="..\..\base_xmlrpc_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_xmlrpc_formatter"/>
-        <CursorPos X="14" Y="1589"/>
-        <TopLine Value="1587"/>
-        <EditorIndex Value="5"/>
-        <UsageCount Value="200"/>
-        <Loaded Value="True"/>
       </Unit17>
       <Unit18>
-        <Filename Value="..\..\ws_helper\pascal_parser_intf.pas"/>
-        <UnitName Value="pascal_parser_intf"/>
-        <CursorPos X="62" Y="217"/>
-        <TopLine Value="200"/>
-        <EditorIndex Value="14"/>
-        <UsageCount Value="98"/>
-        <Loaded Value="True"/>
-      </Unit18>
-      <Unit19>
         <Filename Value="..\..\wst_fpc_xml.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="wst_fpc_xml"/>
-        <CursorPos X="65" Y="85"/>
-        <TopLine Value="56"/>
-        <UsageCount Value="201"/>
-      </Unit19>
-      <Unit20>
+      </Unit18>
+      <Unit19>
         <Filename Value="test_utilities.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_utilities"/>
-        <CursorPos X="59" Y="740"/>
-        <TopLine Value="711"/>
-        <EditorIndex Value="15"/>
-        <UsageCount Value="207"/>
-        <Loaded Value="True"/>
-      </Unit20>
-      <Unit21>
+      </Unit19>
+      <Unit20>
         <Filename Value="..\..\server_service_xmlrpc.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="server_service_xmlrpc"/>
-        <CursorPos X="38" Y="33"/>
-        <TopLine Value="27"/>
-        <UsageCount Value="214"/>
-      </Unit21>
-      <Unit22>
+      </Unit20>
+      <Unit21>
         <Filename Value="test_parsers.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_parsers"/>
-        <CursorPos X="33" Y="1106"/>
-        <TopLine Value="1106"/>
-        <UsageCount Value="200"/>
-      </Unit22>
-      <Unit23>
-        <Filename Value="..\..\ws_helper\xsd_parser.pas"/>
-        <UnitName Value="xsd_parser"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="58"/>
-      </Unit23>
-      <Unit24>
-        <Filename Value="..\..\ws_helper\parserutils.pas"/>
-        <UnitName Value="parserutils"/>
-        <CursorPos X="98" Y="94"/>
-        <TopLine Value="71"/>
-        <UsageCount Value="20"/>
-      </Unit24>
-      <Unit25>
-        <Filename Value="..\..\ws_helper\ws_parser_imp.pas"/>
-        <UnitName Value="ws_parser_imp"/>
-        <CursorPos X="71" Y="386"/>
-        <TopLine Value="363"/>
-        <UsageCount Value="57"/>
-      </Unit25>
-      <Unit26>
+      </Unit21>
+      <Unit22>
         <Filename Value="..\..\ws_helper\wsdl_generator.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="wsdl_generator"/>
-        <CursorPos X="27" Y="146"/>
-        <TopLine Value="124"/>
-        <UsageCount Value="219"/>
-      </Unit26>
-      <Unit27>
+      </Unit22>
+      <Unit23>
         <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="xsd_generator"/>
-        <CursorPos X="3" Y="81"/>
-        <TopLine Value="261"/>
-        <UsageCount Value="202"/>
-      </Unit27>
-      <Unit28>
+      </Unit23>
+      <Unit24>
         <Filename Value="..\..\ws_helper\xsd_consts.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="xsd_consts"/>
-        <CursorPos X="8" Y="78"/>
-        <TopLine Value="51"/>
-        <UsageCount Value="201"/>
-      </Unit28>
-      <Unit29>
+      </Unit24>
+      <Unit25>
         <Filename Value="..\..\ws_helper\wsdl_parser.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="wsdl_parser"/>
-        <CursorPos X="49" Y="21"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="200"/>
-      </Unit29>
-      <Unit30>
+      </Unit25>
+      <Unit26>
         <Filename Value="..\..\base_json_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_json_formatter"/>
-        <CursorPos X="22" Y="23"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="11"/>
-        <UsageCount Value="237"/>
-        <Loaded Value="True"/>
-      </Unit30>
-      <Unit31>
-        <Filename Value="..\..\fcl-json\src\fpjson.pp"/>
-        <UnitName Value="fpjson"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="330"/>
-        <UsageCount Value="35"/>
-      </Unit31>
-      <Unit32>
-        <Filename Value="..\..\library_imp_utils.pas"/>
-        <UnitName Value="library_imp_utils"/>
-        <CursorPos X="92" Y="21"/>
-        <TopLine Value="1"/>
-        <EditorIndex Value="17"/>
-        <UsageCount Value="100"/>
-        <Loaded Value="True"/>
-      </Unit32>
-      <Unit33>
+      </Unit26>
+      <Unit27>
         <Filename Value="test_support.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_support"/>
-        <CursorPos X="3" Y="109"/>
-        <TopLine Value="95"/>
-        <EditorIndex Value="16"/>
-        <UsageCount Value="188"/>
-        <Loaded Value="True"/>
-      </Unit33>
-      <Unit34>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-fpcunit\src\fpcunit.pp"/>
-        <UnitName Value="fpcunit"/>
-        <CursorPos X="1" Y="446"/>
-        <TopLine Value="432"/>
-        <UsageCount Value="9"/>
-      </Unit34>
-      <Unit35>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\rtl\objpas\typinfo.pp"/>
-        <UnitName Value="typinfo"/>
-        <CursorPos X="20" Y="38"/>
-        <TopLine Value="24"/>
-        <UsageCount Value="8"/>
-      </Unit35>
-      <Unit36>
-        <Filename Value="..\..\xmlrpc_formatter.pas"/>
-        <UnitName Value="xmlrpc_formatter"/>
-        <CursorPos X="1" Y="169"/>
-        <TopLine Value="155"/>
-        <EditorIndex Value="8"/>
-        <UsageCount Value="70"/>
-        <Loaded Value="True"/>
-      </Unit36>
-      <Unit37>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\fpjson.pp"/>
-        <UnitName Value="fpjson"/>
-        <CursorPos X="17" Y="312"/>
-        <TopLine Value="317"/>
-        <EditorIndex Value="12"/>
-        <UsageCount Value="69"/>
-        <Loaded Value="True"/>
-      </Unit37>
-      <Unit38>
+      </Unit27>
+      <Unit28>
         <Filename Value="..\..\basex_encode.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="basex_encode"/>
-        <CursorPos X="45" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="101"/>
-      </Unit38>
-      <Unit39>
+      </Unit28>
+      <Unit29>
         <Filename Value="test_basex_encode.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_basex_encode"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="101"/>
-      </Unit39>
-      <Unit40>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\jsonparser.pp"/>
-        <UnitName Value="jsonparser"/>
-        <CursorPos X="35" Y="22"/>
-        <TopLine Value="6"/>
-        <UsageCount Value="15"/>
-      </Unit40>
-      <Unit41>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-fpcunit\src\testregistry.pp"/>
-        <UnitName Value="testregistry"/>
-        <CursorPos X="11" Y="32"/>
-        <TopLine Value="24"/>
-        <UsageCount Value="8"/>
-      </Unit41>
-      <Unit42>
-        <Filename Value="..\..\wst_global.inc"/>
-        <CursorPos X="22" Y="17"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="8"/>
-      </Unit42>
-      <Unit43>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-base\src\inc\contnrs.pp"/>
-        <UnitName Value="contnrs"/>
-        <CursorPos X="3" Y="1403"/>
-        <TopLine Value="1398"/>
-        <UsageCount Value="9"/>
-      </Unit43>
-      <Unit44>
-        <Filename Value="..\..\..\..\..\..\..\lazarus\fpc\2.2.1\source\packages\fcl-json\src\jsonscanner.pp"/>
-        <UnitName Value="jsonscanner"/>
-        <CursorPos X="11" Y="258"/>
-        <TopLine Value="210"/>
-        <UsageCount Value="10"/>
-      </Unit44>
-      <Unit45>
+      </Unit29>
+      <Unit30>
         <Filename Value="..\..\json_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="json_formatter"/>
-        <CursorPos X="3" Y="66"/>
-        <TopLine Value="43"/>
-        <EditorIndex Value="6"/>
-        <UsageCount Value="34"/>
-        <Loaded Value="True"/>
-      </Unit45>
-      <Unit46>
+      </Unit30>
+      <Unit31>
         <Filename Value="..\..\server_service_json.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="server_service_json"/>
-        <CursorPos X="60" Y="54"/>
-        <TopLine Value="40"/>
-        <EditorIndex Value="4"/>
-        <UsageCount Value="30"/>
-        <Loaded Value="True"/>
-      </Unit46>
+      </Unit31>
+      <Unit32>
+        <Filename Value="test_json.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="test_json"/>
+      </Unit32>
     </Units>
-    <JumpHistory Count="16" HistoryIndex="15">
-      <Position1>
-        <Filename Value="..\..\server_binary_formatter.pas"/>
-        <Caret Line="135" Column="45" TopLine="113"/>
-      </Position1>
-      <Position2>
-        <Filename Value="..\..\json_formatter.pas"/>
-        <Caret Line="52" Column="3" TopLine="50"/>
-      </Position2>
-      <Position3>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="56" Column="49" TopLine="45"/>
-      </Position3>
-      <Position4>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="57" Column="46" TopLine="36"/>
-      </Position4>
-      <Position5>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="21" Column="16" TopLine="4"/>
-      </Position5>
-      <Position6>
-        <Filename Value="..\..\json_formatter.pas"/>
-        <Caret Line="165" Column="6" TopLine="151"/>
-      </Position6>
-      <Position7>
-        <Filename Value="..\..\json_formatter.pas"/>
-        <Caret Line="166" Column="11" TopLine="145"/>
-      </Position7>
-      <Position8>
-        <Filename Value="..\..\binary_formatter.pas"/>
-        <Caret Line="177" Column="9" TopLine="169"/>
-      </Position8>
-      <Position9>
-        <Filename Value="testformatter_unit.pas"/>
-        <Caret Line="3717" Column="17" TopLine="3715"/>
-      </Position9>
-      <Position10>
-        <Filename Value="..\..\soap_formatter.pas"/>
-        <Caret Line="240" Column="8" TopLine="223"/>
-      </Position10>
-      <Position11>
-        <Filename Value="..\..\json_formatter.pas"/>
-        <Caret Line="29" Column="35" TopLine="7"/>
-      </Position11>
-      <Position12>
-        <Filename Value="..\..\server_service_json.pas"/>
-        <Caret Line="21" Column="16" TopLine="4"/>
-      </Position12>
-      <Position13>
-        <Filename Value="..\..\soap_formatter.pas"/>
-        <Caret Line="271" Column="14" TopLine="246"/>
-      </Position13>
-      <Position14>
-        <Filename Value="..\..\json_formatter.pas"/>
-        <Caret Line="170" Column="11" TopLine="157"/>
-      </Position14>
-      <Position15>
-        <Filename Value="..\..\json_formatter.pas"/>
-        <Caret Line="194" Column="48" TopLine="174"/>
-      </Position15>
-      <Position16>
-        <Filename Value="..\..\json_formatter.pas"/>
-        <Caret Line="189" Column="34" TopLine="174"/>
-      </Position16>
-    </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="5"/>
@@ -537,20 +230,4 @@
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
-  <Debugging>
-    <BreakPoints Count="1">
-      <Item1>
-        <Source Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\fcl-xml\src\xmlread.pp"/>
-        <Line Value="1975"/>
-      </Item1>
-    </BreakPoints>
-    <Watches Count="2">
-      <Item1>
-        <Expression Value="c"/>
-      </Item1>
-      <Item2>
-        <Expression Value="i"/>
-      </Item2>
-    </Watches>
-  </Debugging>
 </CONFIG>