diff --git a/ClosedXML/Excel/Cells/XLCell.cs b/ClosedXML/Excel/Cells/XLCell.cs
index cee10df..f8707cb 100644
--- a/ClosedXML/Excel/Cells/XLCell.cs
+++ b/ClosedXML/Excel/Cells/XLCell.cs
@@ -306,57 +306,21 @@
 
         public string GetFormattedString()
         {
-            String cValue;
-            if (HasFormula)
-            {
-                try
-                {
-                    cValue = GetString();
-                }
-                catch
-                {
-                    cValue = String.Empty;
-                }
-            }
-            else
-            {
-                cValue = _cellValue;
-            }
-
             var format = GetFormat();
-
-            if (_dataType == XLDataType.Boolean)
-                return (cValue != "0").ToExcelFormat(format);
-            else if (_dataType == XLDataType.TimeSpan)
+            try
             {
-                if (Double.TryParse(cValue, XLHelper.NumberStyle, XLHelper.ParseCulture, out Double dTest))
-                {
-                    return TimeSpan.FromDays(dTest).ToExcelFormat(format);
-                }
-
-                return cValue;
+                return Value.ToExcelFormat(format);
             }
-            else if (_dataType == XLDataType.DateTime || IsDateFormat())
+            catch { }
+
+            try
             {
-                if (Double.TryParse(cValue, XLHelper.NumberStyle, XLHelper.ParseCulture, out Double dTest)
-                    && dTest.IsValidOADateNumber())
-                {
-                    return DateTime.FromOADate(dTest).ToExcelFormat(format);
-                }
-
-                return cValue;
+                return CachedValue.ToExcelFormat(format);
             }
-            else if (_dataType == XLDataType.Number)
-            {
-                if (Double.TryParse(cValue, XLHelper.NumberStyle, XLHelper.ParseCulture, out Double dTest))
-                {
-                    return dTest.ToExcelFormat(format);
-                }
+            catch { }
 
-                return cValue;
-            }
-            else
-                return cValue;
+            return _cellValue;
+
         }
 
         /// <summary>
diff --git a/ClosedXML_Tests/Excel/Saving/SavingTests.cs b/ClosedXML_Tests/Excel/Saving/SavingTests.cs
index 1b0326b..08587b1 100644
--- a/ClosedXML_Tests/Excel/Saving/SavingTests.cs
+++ b/ClosedXML_Tests/Excel/Saving/SavingTests.cs
@@ -160,7 +160,6 @@
                     sheet.Cell("A3").FormulaA1 = "TEXT(A2, \"# ###\")";
                     var options = new SaveOptions { EvaluateFormulasBeforeSaving = true };
 
-                    book1.SaveAs(@"c:\temp\formulas.xlsx", options);
                     book1.SaveAs(ms, options);
                 }
                 ms.Position = 0;
diff --git a/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx b/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx
index e7f5df0..6d774db 100644
--- a/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx
+++ b/ClosedXML_Tests/Resource/Examples/Misc/CopyingWorksheets.xlsx
Binary files differ
diff --git a/ClosedXML_Tests/Resource/Examples/Tables/UsingTables.xlsx b/ClosedXML_Tests/Resource/Examples/Tables/UsingTables.xlsx
index 7d8f1a8..11fc4fe 100644
--- a/ClosedXML_Tests/Resource/Examples/Tables/UsingTables.xlsx
+++ b/ClosedXML_Tests/Resource/Examples/Tables/UsingTables.xlsx
Binary files differ