diff --git a/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.cfg b/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.cfg
index 3215ee3f4..40ce41371 100644
--- a/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.cfg
+++ b/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.cfg
@@ -24,6 +24,7 @@
 -$X+
 -$YD
 -$Z1
+-GD
 -cg
 -AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 -H+
diff --git a/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dof b/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dof
index a40901640..d1decad22 100644
--- a/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dof
+++ b/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dof
@@ -80,7 +80,7 @@ UnsafeType=0
 UnsafeCode=0
 UnsafeCast=0
 [Linker]
-MapFile=0
+MapFile=3
 OutputObjs=0
 ConsoleApp=1
 DebugInfo=0
diff --git a/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dpr b/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dpr
index 2d8a75cd5..fb6257a34 100644
--- a/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dpr
+++ b/wst/trunk/tests/test_suite/delphi/gui_wst_test_suite.dpr
@@ -13,7 +13,14 @@ uses
   testformatter_unit in '..\testformatter_unit.pas',
   base_service_intf in '..\..\..\base_service_intf.pas',
   basex_encode in '..\..\..\basex_encode.pas',
-  test_basex_encode in '..\test_basex_encode.pas';
+  test_basex_encode in '..\test_basex_encode.pas',
+  xsd_parser in '..\..\..\ws_helper\xsd_parser.pas',
+  pascal_parser_intf in '..\..\..\ws_helper\pascal_parser_intf.pas',
+  ws_parser_imp in '..\..\..\ws_helper\ws_parser_imp.pas',
+  xsd_consts in '..\..\..\ws_helper\xsd_consts.pas',
+  xsd_generator in '..\..\..\ws_helper\xsd_generator.pas',
+  test_generators in '..\test_generators.pas',
+  test_suite_utils in '..\test_suite_utils.pas';
 
 {$R *.res}
 
diff --git a/wst/trunk/tests/test_suite/wst_test_suite.lpi b/wst/trunk/tests/test_suite/wst_test_suite.lpi
index f7dfac0f6..4f1dfcfa5 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite.lpi
+++ b/wst/trunk/tests/test_suite/wst_test_suite.lpi
@@ -11,7 +11,6 @@
     </General>
     <PublishOptions>
       <Version Value="2"/>
-      <IgnoreBinaries Value="False"/>
       <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
       <ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
     </PublishOptions>
@@ -27,7 +26,7 @@
         <PackageName Value="FPCUnitTestRunner"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="33">
+    <Units Count="35">
       <Unit0>
         <Filename Value="wst_test_suite.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -193,6 +192,16 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_json"/>
       </Unit32>
+      <Unit33>
+        <Filename Value="test_generators.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="test_generators"/>
+      </Unit33>
+      <Unit34>
+        <Filename Value="test_suite_utils.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="test_suite_utils"/>
+      </Unit34>
     </Units>
   </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 3cda6d8ef..ceb016960 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite.lpr
+++ b/wst/trunk/tests/test_suite/wst_test_suite.lpr
@@ -18,7 +18,8 @@ uses
   test_parserdef, base_xmlrpc_formatter, wst_fpc_xml, test_utilities,
   server_service_xmlrpc, test_parsers, wsdl_generator, xsd_generator, 
 xsd_consts, base_json_formatter, wsdl_parser, test_support, basex_encode,
-test_basex_encode, json_formatter, server_service_json, test_json;
+test_basex_encode, json_formatter, server_service_json, test_json,
+test_suite_utils, test_generators;
 
 Const
   ShortOpts = 'alh';
diff --git a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
index 4a556e104..40dfe494a 100644
--- a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
+++ b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
@@ -25,13 +25,13 @@
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
-        <PackageName Value="LCL"/>
+        <PackageName Value="SynEdit"/>
       </Item1>
       <Item2>
-        <PackageName Value="SynEdit"/>
+        <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="26">
+    <Units Count="24">
       <Unit0>
         <Filename Value="typ_lib_edtr.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -110,91 +110,81 @@
         <UnitName Value="pascal_parser_intf"/>
       </Unit11>
       <Unit12>
-        <Filename Value="..\ws_helper\pparser.pp"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="PParser"/>
-      </Unit12>
-      <Unit13>
-        <Filename Value="..\ws_helper\pastree.pp"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="PasTree"/>
-      </Unit13>
-      <Unit14>
         <Filename Value="..\ws_helper\generator.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="generator"/>
-      </Unit14>
-      <Unit15>
+      </Unit12>
+      <Unit13>
         <Filename Value="uprocedit.pas"/>
         <ComponentName Value="fProcEdit"/>
         <IsPartOfProject Value="True"/>
         <ResourceFilename Value="uprocedit.lrs"/>
         <UnitName Value="uprocedit"/>
-      </Unit15>
-      <Unit16>
+      </Unit13>
+      <Unit14>
         <Filename Value="common_gui_utils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="common_gui_utils"/>
-      </Unit16>
-      <Unit17>
+      </Unit14>
+      <Unit15>
         <Filename Value="uargedit.pas"/>
         <ComponentName Value="fArgEdit"/>
         <IsPartOfProject Value="True"/>
         <ResourceFilename Value="uargedit.lrs"/>
         <UnitName Value="uargedit"/>
-      </Unit17>
-      <Unit18>
+      </Unit15>
+      <Unit16>
         <Filename Value="umoduleedit.pas"/>
         <ComponentName Value="fModuleEdit"/>
         <IsPartOfProject Value="True"/>
         <ResourceFilename Value="umoduleedit.lrs"/>
         <UnitName Value="umoduleedit"/>
-      </Unit18>
-      <Unit19>
+      </Unit16>
+      <Unit17>
         <Filename Value="ubindingedit.pas"/>
         <ComponentName Value="fBindingEdit"/>
         <IsPartOfProject Value="True"/>
         <ResourceFilename Value="ubindingedit.lrs"/>
         <UnitName Value="ubindingedit"/>
-      </Unit19>
-      <Unit20>
+      </Unit17>
+      <Unit18>
         <Filename Value="ufrmsaveoption.pas"/>
         <ComponentName Value="frmSaveOptions"/>
         <IsPartOfProject Value="True"/>
         <ResourceFilename Value="ufrmsaveoption.lrs"/>
         <UnitName Value="ufrmsaveoption"/>
-      </Unit20>
-      <Unit21>
+      </Unit18>
+      <Unit19>
         <Filename Value="ufarrayedit.pas"/>
         <ComponentName Value="fArrayEdit"/>
         <IsPartOfProject Value="True"/>
         <ResourceFilename Value="ufarrayedit.lrs"/>
         <UnitName Value="ufarrayedit"/>
-      </Unit21>
-      <Unit22>
+      </Unit19>
+      <Unit20>
         <Filename Value="uftypealiasedit.pas"/>
         <ComponentName Value="fTypeAliasEdit"/>
         <IsPartOfProject Value="True"/>
         <ResourceFilename Value="uftypealiasedit.lrs"/>
         <UnitName Value="uftypealiasedit"/>
-      </Unit22>
-      <Unit23>
+      </Unit20>
+      <Unit21>
         <Filename Value="ufrecordedit.pas"/>
         <ComponentName Value="fRecordEdit"/>
         <IsPartOfProject Value="True"/>
         <ResourceFilename Value="ufrecordedit.lrs"/>
         <UnitName Value="ufrecordedit"/>
-      </Unit23>
-      <Unit24>
+      </Unit21>
+      <Unit22>
         <Filename Value="..\ws_helper\wsdl_generator.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="wsdl_generator"/>
-      </Unit24>
-      <Unit25>
+      </Unit22>
+      <Unit23>
         <Filename Value="..\ws_helper\xsd_parser.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="xsd_parser"/>
-      </Unit25>
+      </Unit23>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpr b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpr
index 3695c65d6..bf02e5ba1 100644
--- a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpr
+++ b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpr
@@ -10,7 +10,7 @@ uses
   Forms
   , uwsttypelibraryedit, view_helper, uabout, ufEnumedit,
   edit_helper, ufclassedit, ufpropedit, uinterfaceedit, udm,
-  pascal_parser_intf, PasTree, PParser, uprocedit, common_gui_utils, uargedit,
+  pascal_parser_intf, uprocedit, common_gui_utils, uargedit,
   umoduleedit, ubindingedit, ufrmsaveoption, ufarrayedit, generator,
   uftypealiasedit, ufrecordedit, wsdl_generator, xsd_parser;