diff --git a/wst/trunk/base_service_intf.pas b/wst/trunk/base_service_intf.pas
index 5f98cd55e..b7479c9e3 100644
--- a/wst/trunk/base_service_intf.pas
+++ b/wst/trunk/base_service_intf.pas
@@ -969,7 +969,7 @@ type
     FList : TObjectList;
   protected
     function GetItem(AIndex : PtrInt) : TBaseRemotable;{$IFDEF USE_INLINE}inline;{$ENDIF}
-    function GetLength : PtrInt; override;
+    function GetLength() : Integer; override;
   public
     class procedure Save(
             AObject   : TBaseRemotable;
@@ -3560,7 +3560,7 @@ begin
   Result := TBaseRemotable(FList[AIndex]);
 end;
 
-function TObjectCollectionRemotable.GetLength : PtrInt;
+function TObjectCollectionRemotable.GetLength() : Integer;
 begin
   Result := FList.Count;
 end;
diff --git a/wst/trunk/tests/test_suite/test_suite_utils.pas b/wst/trunk/tests/test_suite/test_suite_utils.pas
index b5b5642e4..b2a2546e4 100644
--- a/wst/trunk/tests/test_suite/test_suite_utils.pas
+++ b/wst/trunk/tests/test_suite/test_suite_utils.pas
@@ -33,6 +33,7 @@ type
   TWstBaseTest = class(TTestCase)
   protected
     procedure CheckEquals(expected, actual: TByteDynArray; msg: string = ''; const AStrict : Boolean = True); overload;
+    procedure CheckEquals(expected, actual: Currency; msg: string = ''); overload;
 {$IFDEF FPC}
     procedure CheckEquals(expected, actual: Int64; msg: string = ''; const AStrict : Boolean = True); overload;
     procedure CheckEquals(expected, actual: QWord; msg: string = ''; const AStrict : Boolean = True); overload;
@@ -173,4 +174,10 @@ begin
   end;
 end;
 
+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});
+end;
+
 end.
diff --git a/wst/trunk/tests/test_suite/testformatter_unit.pas b/wst/trunk/tests/test_suite/testformatter_unit.pas
index b96774b02..24f5d1751 100644
--- a/wst/trunk/tests/test_suite/testformatter_unit.pas
+++ b/wst/trunk/tests/test_suite/testformatter_unit.pas
@@ -4801,8 +4801,8 @@ begin
     s := TMemoryStream.Create();
     f.SaveToStream(s);
     FreeAndNil(a);
-    if not IsStrEmpty(AFilename) then
-      s.SaveToFile(wstExpandLocalFileName(AFilename));
+  //  if not IsStrEmpty(AFilename) then
+    //  s.SaveToFile(wstExpandLocalFileName(AFilename));
 
     a := TClass_B.Create();
     f := CreateFormatter(TypeInfo(TClass_B));