diff --git a/components/fpspreadsheet/tests/spreadtestgui.lpi b/components/fpspreadsheet/tests/spreadtestgui.lpi
index 64a77e915..14a5c9ebc 100644
--- a/components/fpspreadsheet/tests/spreadtestgui.lpi
+++ b/components/fpspreadsheet/tests/spreadtestgui.lpi
@@ -12,9 +12,6 @@
     <i18n>
       <EnableI18N LFM="False"/>
     </i18n>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>
     </BuildModes>
diff --git a/components/fpspreadsheet/tests/virtualmodetests.pas b/components/fpspreadsheet/tests/virtualmodetests.pas
index 939954555..b07e53c9f 100644
--- a/components/fpspreadsheet/tests/virtualmodetests.pas
+++ b/components/fpspreadsheet/tests/virtualmodetests.pas
@@ -17,7 +17,7 @@ type
 
   TSpreadVirtualModeTests= class(TTestCase)
   private
-    procedure WriteVirtualCellDataHandler(Sender: TObject; ARow, ACol: Cardinal;
+    procedure WriteVirtualCellDataHandler(Sender: TsWorksheet; ARow, ACol: Cardinal;
       var AValue:Variant; var AStyleCell: PCell);
   protected
     // Set up expected values:
@@ -56,7 +56,7 @@ procedure TSpreadVirtualModeTests.TearDown;
 begin
 end;
 
-procedure TSpreadVirtualModeTests.WriteVirtualCellDataHandler(Sender: TObject;
+procedure TSpreadVirtualModeTests.WriteVirtualCellDataHandler(Sender: TsWorksheet;
   ARow, ACol: Cardinal; var AValue:Variant; var AStyleCell: PCell);
 begin
   Unused(ACol);
@@ -86,10 +86,10 @@ begin
       workbook.Options := workbook.Options + [boVirtualMode];
       if ABufStreamMode then
         workbook.Options := workbook.Options + [boBufStream];
-      workbook.VirtualColCount := 1;
-      workbook.VirtualRowCount := Length(SollNumbers) + 4;
+      worksheet.VirtualColCount := 1;
+      worksheet.VirtualRowCount := Length(SollNumbers) + 4;
       // We'll use only the first 4 SollStrings, the others cause trouble due to utf8 and formatting.
-      workbook.OnWriteCellData := @WriteVirtualCellDataHandler;
+      worksheet.OnWriteCellData := @WriteVirtualCellDataHandler;
       tempFile:=NewTempFile;
       workbook.WriteToFile(tempfile, AFormat, true);
     finally