diff --git a/wst/trunk/tests/test_suite/test_date_utils.pas b/wst/trunk/tests/test_suite/test_date_utils.pas
index 203f1088a..980256ddd 100644
--- a/wst/trunk/tests/test_suite/test_date_utils.pas
+++ b/wst/trunk/tests/test_suite/test_date_utils.pas
@@ -20,13 +20,13 @@ uses
 {$ELSE}
   TestFrameWork,
 {$ENDIF}
-  date_utils;
+  test_suite_utils, date_utils;
 
 type
 
   { TTest_DateUtils }
 
-  TTest_DateUtils = class(TTestCase)
+  TTest_DateUtils = class(TWstBaseTest)
   protected
 {$IFDEF FPC}
     class procedure CheckEquals(expected, actual: TTimeRec; msg: string = ''); overload;
diff --git a/wst/trunk/tests/test_suite/test_suite_utils.pas b/wst/trunk/tests/test_suite/test_suite_utils.pas
index c1ce28089..df4d9c692 100644
--- a/wst/trunk/tests/test_suite/test_suite_utils.pas
+++ b/wst/trunk/tests/test_suite/test_suite_utils.pas
@@ -38,6 +38,10 @@ type
     procedure CheckEquals(expected, actual: QWord; msg: string = ''; const AStrict : Boolean = True); overload;
     procedure CheckEquals(expected, actual: Currency; msg: string = ''); overload;
 {$ENDIF FPC}
+{$IFDEF WST_DELPHI}
+    procedure CheckEquals(expected, actual: Word; msg: string = ''); overload;
+    procedure CheckEquals(expected, actual: Byte; msg: string = ''); overload;
+{$ENDIF WST_DELPHI}
   end;
 
   function CompareNodes(const A,B : TDOMNode) : Boolean;overload;
@@ -160,7 +164,7 @@ begin
     FailNotEquals(IntToStr(expected), IntToStr(actual), msg{$IFDEF WST_DELPHI}, CallerAddr{$ENDIF WST_DELPHI});
 end;
 
-procedure TWstBaseTest.CheckEquals(expected, actual : Currency; msg : string); 
+procedure TWstBaseTest.CheckEquals(expected, actual : Currency; msg : string);
 begin
   if (expected <> actual) then
     FailNotEquals(CurrToStr(expected), CurrToStr(actual), msg{$IFDEF WST_DELPHI}, CallerAddr{$ENDIF WST_DELPHI});
@@ -180,5 +184,18 @@ begin
   end;
 end;
 
+{$IFDEF WST_DELPHI}
+procedure TWstBaseTest.CheckEquals(expected, actual: Word; msg: string);
+begin
+  if (expected <> actual) then
+    FailNotEquals(IntToStr(expected), IntToStr(actual), msg, CallerAddr);
+end;
+
+procedure TWstBaseTest.CheckEquals(expected, actual: Byte; msg: string);
+begin
+  if (expected <> actual) then
+    FailNotEquals(IntToStr(expected), IntToStr(actual), msg,CallerAddr);
+end;
+{$ENDIF WST_DELPHI}
 
 end.
diff --git a/wst/trunk/tests/test_suite/test_support.pas b/wst/trunk/tests/test_suite/test_support.pas
index eb1ad7e6f..d0858ab6f 100644
--- a/wst/trunk/tests/test_suite/test_support.pas
+++ b/wst/trunk/tests/test_suite/test_support.pas
@@ -106,7 +106,7 @@ type
 
   { TTest_TBaseComplexRemotable }
 
-  TTest_TBaseComplexRemotable = class(TTestCase)
+  TTest_TBaseComplexRemotable = class(TWstBaseTest)
   protected
     procedure Compare(const a,b : TClass_A);overload;
     procedure Compare(const a,b : TClass_B);overload;
@@ -117,7 +117,7 @@ type
   
   { TTest_TBaseArrayRemotable }
 
-  TTest_TBaseArrayRemotable = class(TTestCase)
+  TTest_TBaseArrayRemotable = class(TWstBaseTest)
   protected
     class function CreateArray() : TBaseArrayRemotable;virtual;abstract;
     class function GetTypeInfo() : PTypeInfo;virtual;abstract;
@@ -298,7 +298,7 @@ type
   
   { TTest_TDateTimeRemotable }
 
-  TTest_TDateTimeRemotable = class(TTestCase)
+  TTest_TDateTimeRemotable = class(TWstBaseTest)
   published
     procedure FormatDate();
     procedure FormatDate_ZERO();
@@ -316,7 +316,7 @@ type
 
   { TTest_TDateTimeRemotable }
 
-  TTest_TDateRemotable = class(TTestCase)
+  TTest_TDateRemotable = class(TWstBaseTest)
   published
     procedure FormatDate();
     procedure FormatDate_ZERO();
@@ -355,7 +355,7 @@ type
 
   { TTest_TTimeRemotable }
 
-  TTest_TTimeRemotable = class(TTestCase)
+  TTest_TTimeRemotable = class(TWstBaseTest)
   protected
 {$IFDEF FPC}
     class procedure CheckEquals(expected, actual: TTimeRec; msg: string = ''); overload;
diff --git a/wst/trunk/tests/test_suite/testformatter_unit.pas b/wst/trunk/tests/test_suite/testformatter_unit.pas
index c7eda5189..ce357841f 100644
--- a/wst/trunk/tests/test_suite/testformatter_unit.pas
+++ b/wst/trunk/tests/test_suite/testformatter_unit.pas
@@ -633,7 +633,7 @@ type
   
   { TTestArray }
 
-  TTestArray= class(TTestCase)
+  TTestArray= class(TWstBaseTest)
   published
     procedure Test_StringArray();
     procedure Test_BooleanArray();
diff --git a/wst/trunk/tests/test_suite/testmetadata_unit.pas b/wst/trunk/tests/test_suite/testmetadata_unit.pas
index 9310dbf94..d839ff774 100644
--- a/wst/trunk/tests/test_suite/testmetadata_unit.pas
+++ b/wst/trunk/tests/test_suite/testmetadata_unit.pas
@@ -23,15 +23,14 @@ uses
 {$ELSE}
   TestFrameWork, xmldom, wst_delphi_xml,
 {$ENDIF}
-  metadata_generator, binary_streamer, metadata_repository, pastree,
-  pascal_parser_intf,
-  metadata_wsdl;
+  test_suite_utils, metadata_generator, binary_streamer, metadata_repository,
+  pastree, pascal_parser_intf, metadata_wsdl;
 
 type
 
   { TTestMetadata }
 
-  TTestMetadata= class(TTestCase)
+  TTestMetadata= class(TWstBaseTest)
   protected
     function CreateSymbolTable():TwstPasTreeContainer;
   published