diff --git a/ClosedXML_Examples/Creating/CreateFiles.cs b/ClosedXML_Examples/Creating/CreateFiles.cs
index 81d3867..956a13d 100644
--- a/ClosedXML_Examples/Creating/CreateFiles.cs
+++ b/ClosedXML_Examples/Creating/CreateFiles.cs
@@ -14,78 +14,78 @@
         {
             var path = Program.BaseCreatedDirectory;
 
-            new HelloWorld().Create(path + @"\HelloWorld.xlsx");
-            new BasicTable().Create(path + @"\BasicTable.xlsx");
+            new HelloWorld().Create(Path.Combine(path, "HelloWorld.xlsx"));
+            new BasicTable().Create(Path.Combine(path, "BasicTable.xlsx"));
 
             new StyleExamples().Create();
-            new ChangingBasicTable().Create(path + @"\BasicTable_Modified.xlsx");
-            new ShiftingRanges().Create(path + @"\ShiftingRanges.xlsx");
-            new ColumnSettings().Create(path + @"\ColumnSettings.xlsx");
-            new RowSettings().Create(path + @"\RowSettings.xlsx");
-            new MergeCells().Create(path + @"\MergedCells.xlsx");
-            new InsertRows().Create(path + @"\InsertRows.xlsx");
-            new InsertColumns().Create(path + @"\InsertColumns.xlsx");
-            new ColumnCollection().Create(path + @"\ColumnCollection.xlsx");
-            new DataTypes().Create(path + @"\DataTypes.xlsx");
-            new MultipleSheets().Create(path + @"\MultipleSheets.xlsx");
-            new RowCollection().Create(path + @"\RowCollection.xlsx");
-            new DefiningRanges().Create(path + @"\DefiningRanges.xlsx");
-            new ClearingRanges().Create(path + @"\ClearingRanges.xlsx");
-            new DeletingRanges().Create(path + @"\DeletingRanges.xlsx");
-            new Margins().Create(path + @"\Margins.xlsx");
-            new Page().Create(path + @"\Page.xlsx");
-            new HeaderFooters().Create(path + @"\HeaderFooters.xlsx");
-            new Sheets().Create(path + @"\Sheets.xlsx");
-            new SheetTab().Create(path + @"\SheetTab.xlsx");
-            new MultipleRanges().Create(path + @"\MultipleRanges.xlsx");
-            new StyleWorksheet().Create(path + @"\StyleWorksheet.xlsx");
-            new StyleRowsColumns().Create(path + @"\StyleRowsColumns.xlsx");
-            new InsertingDeletingRows().Create(path + @"\InsertingDeletingRows.xlsx");
-            new InsertingDeletingColumns().Create(path + @"\InsertingDeletingColumns.xlsx");
-            new DeletingColumns().Create(path + @"\DeletingColumns.xlsx");
-            new CellValues().Create(path + @"\CellValues.xlsx");
-            new LambdaExpressions().Create(path + @"\LambdaExpressions.xlsx");
-            new DefaultStyles().Create(path + @"\DefaultStyles.xlsx");
-            new TransposeRanges().Create(path + @"\TransposeRanges.xlsx");
-            new TransposeRangesPlus().Create(path + @"\TransposeRangesPlus.xlsx");
-            new MergeMoves().Create(path + @"\MergedMoves.xlsx");
-            new WorkbookProperties().Create(path + @"\WorkbookProperties.xlsx");
-            new AdjustToContents().Create(path + @"\AdjustToContents.xlsx");
-            new HideUnhide().Create(path + @"\HideUnhide.xlsx");
-            new Outline().Create(path + @"\Outline.xlsx");
-            new Formulas().Create(path + @"\Formulas.xlsx");
-            new Collections().Create(path + @"\Collections.xlsx");
-            new NamedRanges().Create(path + @"\NamedRanges.xlsx");
-            new CopyingRanges().Create(path + @"\CopyingRanges.xlsx");
-            new BlankCells().Create(path + @"\BlankCells.xlsx");
-            new TwoPages().Create(path + @"\TwoPages.xlsx");
-            new UsingColors().Create(path + @"\UsingColors.xlsx");
+            new ChangingBasicTable().Create(Path.Combine(path, "BasicTable_Modified.xlsx"));
+            new ShiftingRanges().Create(Path.Combine(path, "ShiftingRanges.xlsx"));
+            new ColumnSettings().Create(Path.Combine(path, "ColumnSettings.xlsx"));
+            new RowSettings().Create(Path.Combine(path, "RowSettings.xlsx"));
+            new MergeCells().Create(Path.Combine(path, "MergedCells.xlsx"));
+            new InsertRows().Create(Path.Combine(path, "InsertRows.xlsx"));
+            new InsertColumns().Create(Path.Combine(path, "InsertColumns.xlsx"));
+            new ColumnCollection().Create(Path.Combine(path, "ColumnCollection.xlsx"));
+            new DataTypes().Create(Path.Combine(path, "DataTypes.xlsx"));
+            new MultipleSheets().Create(Path.Combine(path, "MultipleSheets.xlsx"));
+            new RowCollection().Create(Path.Combine(path, "RowCollection.xlsx"));
+            new DefiningRanges().Create(Path.Combine(path, "DefiningRanges.xlsx"));
+            new ClearingRanges().Create(Path.Combine(path, "ClearingRanges.xlsx"));
+            new DeletingRanges().Create(Path.Combine(path, "DeletingRanges.xlsx"));
+            new Margins().Create(Path.Combine(path, "Margins.xlsx"));
+            new Page().Create(Path.Combine(path, "Page.xlsx"));
+            new HeaderFooters().Create(Path.Combine(path, "HeaderFooters.xlsx"));
+            new Sheets().Create(Path.Combine(path, "Sheets.xlsx"));
+            new SheetTab().Create(Path.Combine(path, "SheetTab.xlsx"));
+            new MultipleRanges().Create(Path.Combine(path, "MultipleRanges.xlsx"));
+            new StyleWorksheet().Create(Path.Combine(path, "StyleWorksheet.xlsx"));
+            new StyleRowsColumns().Create(Path.Combine(path, "StyleRowsColumns.xlsx"));
+            new InsertingDeletingRows().Create(Path.Combine(path, "InsertingDeletingRows.xlsx"));
+            new InsertingDeletingColumns().Create(Path.Combine(path, "InsertingDeletingColumns.xlsx"));
+            new DeletingColumns().Create(Path.Combine(path, "DeletingColumns.xlsx"));
+            new CellValues().Create(Path.Combine(path, "CellValues.xlsx"));
+            new LambdaExpressions().Create(Path.Combine(path, "LambdaExpressions.xlsx"));
+            new DefaultStyles().Create(Path.Combine(path, "DefaultStyles.xlsx"));
+            new TransposeRanges().Create(Path.Combine(path, "TransposeRanges.xlsx"));
+            new TransposeRangesPlus().Create(Path.Combine(path, "TransposeRangesPlus.xlsx"));
+            new MergeMoves().Create(Path.Combine(path, "MergedMoves.xlsx"));
+            new WorkbookProperties().Create(Path.Combine(path, "WorkbookProperties.xlsx"));
+            new AdjustToContents().Create(Path.Combine(path, "AdjustToContents.xlsx"));
+            new HideUnhide().Create(Path.Combine(path, "HideUnhide.xlsx"));
+            new Outline().Create(Path.Combine(path, "Outline.xlsx"));
+            new Formulas().Create(Path.Combine(path, "Formulas.xlsx"));
+            new Collections().Create(Path.Combine(path, "Collections.xlsx"));
+            new NamedRanges().Create(Path.Combine(path, "NamedRanges.xlsx"));
+            new CopyingRanges().Create(Path.Combine(path, "CopyingRanges.xlsx"));
+            new BlankCells().Create(Path.Combine(path, "BlankCells.xlsx"));
+            new TwoPages().Create(Path.Combine(path, "TwoPages.xlsx"));
+            new UsingColors().Create(Path.Combine(path, "UsingColors.xlsx"));
 
-            new ColumnCells().Create(path + @"\ColumnCells.xlsx");
-            new RowCells().Create(path + @"\RowCells.xlsx");
-            new FreezePanes().Create(path + @"\FreezePanes.xlsx");
-            new UsingTables().Create(path + @"\UsingTables.xlsx");
-            new AddingRowToTables().Create(path + @"\AddingRowToTables.xlsx");
-            new ShowCase().Create(path + @"\ShowCase.xlsx");
-            new CopyingWorksheets().Create(path + @"\CopyingWorksheets.xlsx");
-            new InsertingTables().Create(path + @"\InsertingTables.xlsx");
-            new InsertingData().Create(path + @"\InsertingData.xlsx");
-            new Hyperlinks().Create(path + @"\Hyperlinks.xlsx");
-            new DataValidation().Create(path + @"\DataValidation.xlsx");
-            new HideSheets().Create(path + @"\HideSheets.xlsx");
-            new SheetProtection().Create(path + @"\SheetProtection.xlsx");
-            new AutoFilter().Create(path + @"\AutoFilter.xlsx");
-            new Sorting().Create(path + @"\Sorting.xlsx");
-            new SortExample().Create(path + @"\SortExample.xlsx");
-            new AddingDataSet().Create(path + @"\AddingDataSet.xlsx");
-            new AddingDataTableAsWorksheet().Create(path + @"\AddingDataTableAsWorksheet.xlsx");
-            new TabColors().Create(path + @"\TabColors.xlsx");
-            new ShiftingFormulas().Create(path + @"\ShiftingFormulas.xlsx");
-            new CopyingRowsAndColumns().Create(path + @"\CopyingRowsAndColumns.xlsx");
-            new UsingRichText().Create(path + @"\UsingRichText.xlsx");
-            new UsingPhonetics().Create(path + @"\UsingPhonetics.xlsx");
-            new WalkingRanges().Create(path + @"\CellMoves.xlsx");
-            new AddingComments().Create(path + @"\AddingComments.xlsx");
+            new ColumnCells().Create(Path.Combine(path, "ColumnCells.xlsx"));
+            new RowCells().Create(Path.Combine(path, "RowCells.xlsx"));
+            new FreezePanes().Create(Path.Combine(path, "FreezePanes.xlsx"));
+            new UsingTables().Create(Path.Combine(path, "UsingTables.xlsx"));
+            new AddingRowToTables().Create(Path.Combine(path, "AddingRowToTables.xlsx"));
+            new ShowCase().Create(Path.Combine(path, "ShowCase.xlsx"));
+            new CopyingWorksheets().Create(Path.Combine(path, "CopyingWorksheets.xlsx"));
+            new InsertingTables().Create(Path.Combine(path, "InsertingTables.xlsx"));
+            new InsertingData().Create(Path.Combine(path, "InsertingData.xlsx"));
+            new Hyperlinks().Create(Path.Combine(path, "Hyperlinks.xlsx"));
+            new DataValidation().Create(Path.Combine(path, "DataValidation.xlsx"));
+            new HideSheets().Create(Path.Combine(path, "HideSheets.xlsx"));
+            new SheetProtection().Create(Path.Combine(path, "SheetProtection.xlsx"));
+            new AutoFilter().Create(Path.Combine(path, "AutoFilter.xlsx"));
+            new Sorting().Create(Path.Combine(path, "Sorting.xlsx"));
+            new SortExample().Create(Path.Combine(path, "SortExample.xlsx"));
+            new AddingDataSet().Create(Path.Combine(path, "AddingDataSet.xlsx"));
+            new AddingDataTableAsWorksheet().Create(Path.Combine(path, "AddingDataTableAsWorksheet.xlsx"));
+            new TabColors().Create(Path.Combine(path, "TabColors.xlsx"));
+            new ShiftingFormulas().Create(Path.Combine(path, "ShiftingFormulas.xlsx"));
+            new CopyingRowsAndColumns().Create(Path.Combine(path, "CopyingRowsAndColumns.xlsx"));
+            new UsingRichText().Create(Path.Combine(path, "UsingRichText.xlsx"));
+            new UsingPhonetics().Create(Path.Combine(path, "UsingPhonetics.xlsx"));
+            new WalkingRanges().Create(Path.Combine(path, "CellMoves.xlsx"));
+            new AddingComments().Create(Path.Combine(path, "AddingComments.xlsx"));
         }
     }
 }
diff --git a/ClosedXML_Examples/ModifyFiles.cs b/ClosedXML_Examples/ModifyFiles.cs
index 9e2cc47..048525e 100644
--- a/ClosedXML_Examples/ModifyFiles.cs
+++ b/ClosedXML_Examples/ModifyFiles.cs
@@ -1,4 +1,5 @@
 using ClosedXML_Examples.Delete;
+using System.IO;
 
 namespace ClosedXML_Examples
 {
@@ -6,7 +7,8 @@
     {
         public static void Run()
         {
-            new DeleteRows().Create(@"C:\ClosedXML_Tests\Modified\DeleteRows.xlsx");
+            var path = Program.BaseModifiedDirectory;
+            new DeleteRows().Create(Path.Combine(path, "DeleteRows.xlsx"));
         }
     }
-}
+}
\ No newline at end of file
diff --git a/ClosedXML_Examples/StyleExamples.cs b/ClosedXML_Examples/StyleExamples.cs
index 74717e5..adeb703 100644
--- a/ClosedXML_Examples/StyleExamples.cs
+++ b/ClosedXML_Examples/StyleExamples.cs
@@ -1,4 +1,5 @@
 using ClosedXML_Examples.Styles;
+using System.IO;
 
 namespace ClosedXML_Examples
 {
@@ -54,12 +55,12 @@
         // Public
         public void Create()
         {
-            var path = @"C:\ClosedXML_Tests\Created";
-            new StyleFont().Create(path + @"\styleFont.xlsx");
-            new StyleFill().Create(path + @"\styleFill.xlsx");
-            new StyleBorder().Create(path + @"\styleBorder.xlsx");
-            new StyleAlignment().Create(path + @"\styleAlignment.xlsx");
-            new StyleNumberFormat().Create(path + @"\styleNumberFormat.xlsx");
+            var path = Program.BaseCreatedDirectory;
+            new StyleFont().Create(Path.Combine(path, "styleFont.xlsx"));
+            new StyleFill().Create(Path.Combine(path, "styleFill.xlsx"));
+            new StyleBorder().Create(Path.Combine(path, "styleBorder.xlsx"));
+            new StyleAlignment().Create(Path.Combine(path, "styleAlignment.xlsx"));
+            new StyleNumberFormat().Create(Path.Combine(path, "styleNumberFormat.xlsx"));
         }
 
         // Private
diff --git a/ClosedXML_Sandbox/Program.cs b/ClosedXML_Sandbox/Program.cs
index f01eb1d..0cb47d1 100644
--- a/ClosedXML_Sandbox/Program.cs
+++ b/ClosedXML_Sandbox/Program.cs
@@ -1,27 +1,15 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using ClosedXML.Excel;
-using ClosedXML;
-using System.Drawing;
-using System.IO;
-using DocumentFormat.OpenXml.Spreadsheet;
-using DocumentFormat.OpenXml;
+
 namespace ClosedXML_Sandbox
 {
     class Program
     {
         private static void Main(string[] args)
         {
-            //var wb = new XLWorkbook();
-            //wb.SaveAs(@"c:\temp\saved.xlsx");
-            //Console.WriteLine("Done");
             PerformanceRunner.TimeAction(PerformanceRunner.RunInsertTable);
 
             Console.WriteLine("Press any key to continue");
             Console.ReadKey();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/ClosedXML_Tests/Excel/Tables/TablesTests.cs b/ClosedXML_Tests/Excel/Tables/TablesTests.cs
index 8bd1f63..7ebf9bc 100644
--- a/ClosedXML_Tests/Excel/Tables/TablesTests.cs
+++ b/ClosedXML_Tests/Excel/Tables/TablesTests.cs
@@ -312,7 +312,7 @@
         [Test]
         public void ChangeFieldName()
         {
-            XLWorkbook wb = new XLWorkbook(); //( @"c:\temp\test.xlsx");
+            XLWorkbook wb = new XLWorkbook();
 
             var ws = wb.AddWorksheet("Sheet");
             ws.Cell("A1").SetValue("FName")