diff --git a/main/HSSF/UserModel/StaticFontMetrics.cs b/main/HSSF/UserModel/StaticFontMetrics.cs
index 7806062c4..43da7dd31 100644
--- a/main/HSSF/UserModel/StaticFontMetrics.cs
+++ b/main/HSSF/UserModel/StaticFontMetrics.cs
@@ -35,8 +35,12 @@ namespace NPOI.HSSF.UserModel
      */
     class StaticFontMetrics
     {
-        const string FONT_METRICS_PROPERTIES_FILE_NAME = "font_metrics.properties";
-
+#if NETSTANDARD2_0
+        private const String FONT_METRICS_PROPERTIES_FILE_NAME = "NPOI.Resources.font_metrics.properties";
+#else
+        private const String FONT_METRICS_PROPERTIES_FILE_NAME = "font_metrics.properties";
+#endif
+        
         /** The font metrics property file we're using */
         private static Properties fontMetricsProps;
         /** Our cache of font details we've alReady looked up */
diff --git a/testcases/ooxml/App.config b/testcases/ooxml/App.config
index a6df1cb42..8b936a261 100644
--- a/testcases/ooxml/App.config
+++ b/testcases/ooxml/App.config
@@ -6,14 +6,8 @@
       </sectionGroup>
    </configSections>
    <appSettings>
-      <add key="POI.testdata.path" value="..\..\..\testcases\test-data"/>
+      <add key="POI.testdata.path" value="..\..\..\..\test-data"/>
    </appSettings>
-   <system.diagnostics>
-      <switches>
-         <!-- Store the Source file of the [De-]Serialization process accessible for Debugging. -->
-         <add name="XmlSerialization.Compilation" value="1"/>
-      </switches>
-   </system.diagnostics>
    <userSettings>
       <ooxml.Testcases.Properties.Settings>
          <setting name="TEST_PROPERTY" serializeAs="String">
diff --git a/testcases/ooxml/SS/TestWorkbookFactory.cs b/testcases/ooxml/SS/TestWorkbookFactory.cs
index 31adb1dee..152e92ec6 100644
--- a/testcases/ooxml/SS/TestWorkbookFactory.cs
+++ b/testcases/ooxml/SS/TestWorkbookFactory.cs
@@ -92,7 +92,7 @@ public void TestCreateGeneric()
             Assert.IsTrue(wb is XSSFWorkbook);
             // File -> either
             wb = WorkbookFactory.Create(
-                  testdataPath + xls
+                  Path.GetFullPath(testdataPath + xls)
             );
             Assert.IsNotNull(wb);
             Assert.IsTrue(wb is HSSFWorkbook);
diff --git a/testcases/openxml4net/App.config b/testcases/openxml4net/App.config
index db1d7dd49..cb2e8cbad 100644
--- a/testcases/openxml4net/App.config
+++ b/testcases/openxml4net/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
 	<appSettings>
-		<add key="POI.testdata.path" value="..\..\..\TestCases\test-data"/>
+		<add key="POI.testdata.path" value="..\..\..\..\test-data"/>
 	</appSettings>
 	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>