diff --git a/components/fpspreadsheet/tests/internaltests.pas b/components/fpspreadsheet/tests/internaltests.pas
index a05b7fe1e..77d305bde 100644
--- a/components/fpspreadsheet/tests/internaltests.pas
+++ b/components/fpspreadsheet/tests/internaltests.pas
@@ -156,11 +156,22 @@ begin
 end;
 
 procedure TSpreadInternalTests.TestCellString;
+var
+  r,c: Cardinal;
+  s: String;
+  flags: TsRelFlags;
 begin
   CheckEquals('$A$1',GetCellString(0,0,[]));
   CheckEquals('$Z$1',GetCellString(0,25,[])); //bug 26447
   CheckEquals('$AA$2',GetCellString(1,26,[])); //just past the last letter
   CheckEquals('$GW$5',GetCellString(4,204,[])); //some big value
+  CheckEquals('$IV$1',GetCellString(0,255,[])); //the last column of xls
+  CheckEquals('$XFD$1',GetCellString(0,16383,[])); // the last column of xlsx
+
+  // Something VERY big, beyond xlsx
+  s := 'ZZZZ1';
+  ParseCellString(s, r, c, flags);
+  CheckEquals(s, GetCellString(r, c, flags));
 end;
 
 
diff --git a/components/fpspreadsheet/tests/spreadtestgui.lpi b/components/fpspreadsheet/tests/spreadtestgui.lpi
index 2f84e4173..84f5e5934 100644
--- a/components/fpspreadsheet/tests/spreadtestgui.lpi
+++ b/components/fpspreadsheet/tests/spreadtestgui.lpi
@@ -80,17 +80,14 @@
       <Unit1>
         <Filename Value="datetests.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="datetests"/>
       </Unit1>
       <Unit2>
         <Filename Value="stringtests.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="stringtests"/>
       </Unit2>
       <Unit3>
         <Filename Value="numberstests.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="numberstests"/>
       </Unit3>
       <Unit4>
         <Filename Value="manualtests.pas"/>
@@ -99,7 +96,6 @@
       <Unit5>
         <Filename Value="testsutility.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="testsutility"/>
       </Unit5>
       <Unit6>
         <Filename Value="internaltests.pas"/>
@@ -109,7 +105,6 @@
       <Unit7>
         <Filename Value="formattests.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="formattests"/>
       </Unit7>
       <Unit8>
         <Filename Value="colortests.pas"/>
@@ -118,7 +113,6 @@
       <Unit9>
         <Filename Value="fonttests.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="fonttests"/>
       </Unit9>
       <Unit10>
         <Filename Value="optiontests.pas"/>
@@ -131,10 +125,12 @@
       <Unit12>
         <Filename Value="rpnformulaunit.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="rpnFormulaUnit"/>
       </Unit12>
       <Unit13>
         <Filename Value="formulatests.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="formulatests"/>
       </Unit13>
       <Unit14>
         <Filename Value="emptycelltests.pas"/>