563 files changed, 701 insertions, 1100 deletions

diff --git a/build.xml b/build.xml
index 1bc0579ab2..49a9d901e0 100644
--- a/build.xml
+++ b/build.xml
@@ -76,6 +76,7 @@ under the License.
   <property name="main.lib" location="lib"/>
   <property name="ooxml.lib" location="ooxml-lib"/>
   <property name="main.reports.test" location="build/test-results"/>
+  <property name="poi.test.dir" location="test-data"/>
 
   <property name="main.commons-logging.jar" location="${main.lib}/commons-logging-1.1.jar"/>
   <property name="main.commons-logging.url" value="${repository.m2}/maven2/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
@@ -566,12 +567,7 @@ under the License.
       <classpath refid="test.classpath"/>
       <sysproperty key="user.language" value="en"/> 
       <sysproperty key="user.country" value="US"/> 
-      <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/> 
-      <sysproperty key="HSLF.testdata.path" file="${main.src.test}/org/apache/poi/hslf/data"/> 
-      <sysproperty key="HWPF.testdata.path" file="${main.src.test}/org/apache/poi/hwpf/data"/> 
-      <sysproperty key="HPSF.testdata.path" file="${main.src.test}/org/apache/poi/hpsf/data"/> 
-      <sysproperty key="POIFS.testdata.path" file="${main.src.test}/org/apache/poi/poifs/data"/> 
-      <sysproperty key="DDF.testdata.path" file="${main.src.test}/org/apache/poi/ddf/data"/> 
+      <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
       <sysproperty key="java.awt.headless" value="true"/>
       <formatter type="plain"/>
       <formatter type="xml"/>
@@ -602,10 +598,7 @@ under the License.
       </classpath>
       <sysproperty key="user.language" value="en"/> 
       <sysproperty key="user.country" value="US"/> 
-      <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
-      <sysproperty key="HPSF.testdata.path" file="${main.src.test}/org/apache/poi/hpsf/data"/>
-      <sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
-      <sysproperty key="POIFS.testdata.path" file="${main.src.test}/org/apache/poi/poifs/data"/> 
+      <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
       <sysproperty key="java.awt.headless" value="true"/>
       <formatter type="plain" usefile="no"/>
       <batchtest todir="${main.reports.test}">
@@ -631,16 +624,8 @@ under the License.
             </classpath>
             <sysproperty key="user.language" value="en"/> 
             <sysproperty key="user.country" value="US"/> 
-            <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
-            <sysproperty key="HPSF.testdata.path" file="${main.src.test}/org/apache/poi/hpsf/data"/>
-            <sysproperty key="HSLF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hslf/data"/>
-            <sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
-            <sysproperty key="HSMF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hsmf/data"/>
-            <sysproperty key="HDGF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdgf/data"/>
-            <sysproperty key="HPBF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hpbf/data"/>
-            <sysproperty key="POIFS.testdata.path" file="${main.src.test}/org/apache/poi/poifs/data"/> 
-            <sysproperty key="OOXML.testdata.path" file="${ooxml.src.test}/org/apache/poi/ooxml/data"/> 
-                <sysproperty key="java.awt.headless" value="true"/>
+            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
+            <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain" usefile="no"/>
             <formatter type="xml"/>
             <test name="${testcase}"/>
@@ -675,15 +660,7 @@ under the License.
             </classpath>
             <sysproperty key="user.language" value="en"/> 
             <sysproperty key="user.country" value="US"/> 
-            <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
-            <sysproperty key="HPSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hpsf/data"/>
-            <sysproperty key="HDF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdf/data"/>
-            <sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
-            <sysproperty key="HSLF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hslf/data"/>
-            <sysproperty key="HSMF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hsmf/data"/>
-            <sysproperty key="HDGF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdgf/data"/>
-            <sysproperty key="HPBF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hpbf/data"/>
-            <sysproperty key="POIFS.testdata.path" file="${main.src.test}/org/apache/poi/poifs/data"/> 
+            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
             <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -714,14 +691,7 @@ under the License.
 	        </classpath>
               <sysproperty key="user.language" value="en"/> 
               <sysproperty key="user.country" value="US"/> 
-              <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
-	            <sysproperty key="HPSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hpsf/data"/>
-	            <sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
-              <sysproperty key="HSLF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hslf/data"/>
-              <sysproperty key="HSMF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hsmf/data"/>
-              <sysproperty key="HDGF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdgf/data"/>
-              <sysproperty key="HPBF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hpbf/data"/>
-              <sysproperty key="POIFS.testdata.path" file="${main.src.test}/org/apache/poi/poifs/data"/> 
+              <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
 	            <sysproperty key="java.awt.headless" value="true"/>
 	            <sysproperty key="java.awt.headless" value="true"/>
 	            <formatter type="plain" usefile="no"/>
@@ -748,8 +718,6 @@ under the License.
             </classpath>
             <sysproperty key="user.language" value="en"/> 
             <sysproperty key="user.country" value="US"/> 
-            <sysproperty key="HSSF.testdata.path" file="${contrib.src.test}/org/apache/poi/hssf/data"/>
-            <sysproperty key="HPSF.testdata.path" file="${contrib.src.test}/org/apache/poi/hpsf/data"/>
             <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -780,14 +748,7 @@ under the License.
             <classpath refid="test.ooxml.classpath" />
             <sysproperty key="user.language" value="en"/> 
             <sysproperty key="user.country" value="US"/> 
-            <sysproperty key="POIFS.testdata.path" file="${main.src.test}/org/apache/poi/poifs/data"/>
-            <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
-            <sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
-            <sysproperty key="HSLF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hslf/data"/>
-            <sysproperty key="HDGF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdgf/data"/>
-            <sysproperty key="OOXML.testdata.path" file="${ooxml.src.test}/org/apache/poi/ooxml/data"/> 
-            <sysproperty key="openxml4j.compliance.input" file="${ooxml.src.test}/org/apache/poi/openxml4j/opc/compliance/data"/> 
-            <sysproperty key="openxml4j.testdata.input" file="${ooxml.src.test}/org/apache/poi/openxml4j/opc/data"/> 
+            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
             <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain"/>
             <formatter type="xml"/>
@@ -811,12 +772,7 @@ under the License.
             <classpath refid="test.ooxml.classpath" />
             <sysproperty key="user.language" value="en"/> 
             <sysproperty key="user.country" value="US"/> 
-            <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
-            <sysproperty key="HPSF.testdata.path" file="${main.src.test}/org/apache/poi/hpsf/data"/>
-            <sysproperty key="HSLF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hslf/data"/>
-            <sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
-            <sysproperty key="HSMF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hsmf/data"/>
-            <sysproperty key="HDGF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdgf/data"/>
+            <sysproperty key="POI.testdata.path" file="${poi.test.dir}"/> 
             <sysproperty key="java.awt.headless" value="true"/>
             <formatter type="plain" usefile="no"/>
             <formatter type="xml"/>
diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml
index 491b65e1da..adbbc79915 100644
--- a/src/documentation/content/xdocs/status.xml
+++ b/src/documentation/content/xdocs/status.xml
@@ -33,6 +33,7 @@
 
     <changes>
         <release version="3.5-beta7" date="2009-??-??">
+           <action dev="POI-DEVELOPERS" type="fix">moved all test data to a top-level directory</action>
            <action dev="POI-DEVELOPERS" type="add">47721 - Added implementation for INDIRECT()</action>
            <action dev="POI-DEVELOPERS" type="add">45583 - Avoid exception when reading ClipboardData packet in OLE property sets</action>
            <action dev="POI-DEVELOPERS" type="add">47652 - Added support for reading encrypted workbooks</action>
diff --git a/src/ooxml/testcases/org/apache/poi/TestEmbeded.java b/src/ooxml/testcases/org/apache/poi/TestEmbeded.java
index ddd394cf2d..dd63f2799f 100644
--- a/src/ooxml/testcases/org/apache/poi/TestEmbeded.java
+++ b/src/ooxml/testcases/org/apache/poi/TestEmbeded.java
@@ -36,34 +36,24 @@ import junit.framework.TestCase;
  */
 public class TestEmbeded extends TestCase
 {
-	public String dirname;
-
-	public void setUp() {
-		dirname = System.getProperty("OOXML.testdata.path");
-		assertNotNull(dirname);
-	}
-
 	public void testExcel() throws Exception {
-		File f = new File(dirname, "ExcelWithAttachments.xlsm");
-		assertTrue(f.exists());
-		
-		POIXMLDocument doc = new XSSFWorkbook(OPCPackage.open(f.toString()));
+		POIXMLDocument doc = new XSSFWorkbook(
+                POIDataSamples.getSpreadSheetInstance().openResourceAsStream("ExcelWithAttachments.xlsm")
+        );
 		test(doc, 4);
 	}
 
 	public void testWord() throws Exception {
-		File f = new File(dirname, "WordWithAttachments.docx");
-		assertTrue(f.exists());
-		
-		POIXMLDocument doc = new XWPFDocument(OPCPackage.open(f.toString()));
+		POIXMLDocument doc = new XWPFDocument(
+                POIDataSamples.getDocumentInstance().openResourceAsStream("WordWithAttachments.docx")
+        );
 		test(doc, 5);
 	}
 
 	public void testPowerPoint() throws Exception {
-		File f = new File(dirname, "PPTWithAttachments.pptm");
-		assertTrue(f.exists());
-		
-		POIXMLDocument doc = new XSLFSlideShow(OPCPackage.open(f.toString()));
+		POIXMLDocument doc = new XSLFSlideShow(OPCPackage.open(
+                POIDataSamples.getSlideShowInstance().openResourceAsStream("PPTWithAttachments.pptm"))
+        );
 		test(doc, 4);
 	}
 	
diff --git a/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java b/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
index 8843f60933..e495df7676 100755
--- a/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
+++ b/src/ooxml/testcases/org/apache/poi/TestPOIXMLDocument.java
@@ -30,11 +30,13 @@ import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.openxml4j.opc.PackageRelationship;
 import org.apache.poi.util.TempFile;
+import org.apache.poi.util.PackageHelper;
 
 /**
  * Test recursive read and write of OPC packages
  */
 public final class TestPOIXMLDocument extends TestCase {
+
     private static class OPCParser extends POIXMLDocument {
 
         public OPCParser(OPCPackage pkg) {
@@ -81,9 +83,8 @@ public final class TestPOIXMLDocument extends TestCase {
         }
     }
 
-    public void assertReadWrite(String path) throws Exception {
+    public void assertReadWrite(OPCPackage pkg1) throws Exception {
 
-        OPCPackage pkg1 = OPCPackage.open(path);
         OPCParser doc = new OPCParser(pkg1);
         doc.parse(new TestFactory());
 
@@ -124,17 +125,20 @@ public final class TestPOIXMLDocument extends TestCase {
     }
 
     public void testPPTX() throws Exception {
-        File file = new File(System.getProperty("OOXML.testdata.path"), "PPTWithAttachments.pptm");
-        assertReadWrite(file.getAbsolutePath());
+        assertReadWrite(
+                PackageHelper.open(POIDataSamples.getSlideShowInstance().openResourceAsStream("PPTWithAttachments.pptm"))
+        );
     }
 
     public void testXLSX() throws Exception {
-        File file = new File(System.getProperty("OOXML.testdata.path"), "ExcelWithAttachments.xlsm");
-        assertReadWrite(file.getAbsolutePath());
+        assertReadWrite(
+                PackageHelper.open(POIDataSamples.getSpreadSheetInstance().openResourceAsStream("ExcelWithAttachments.xlsm"))
+                );
     }
 
     public void testDOCX() throws Exception {
-        File file = new File(System.getProperty("OOXML.testdata.path"), "WordWithAttachments.docx");
-        assertReadWrite(file.getAbsolutePath());
+        assertReadWrite(
+                PackageHelper.open(POIDataSamples.getDocumentInstance().openResourceAsStream("WordWithAttachments.docx"))
+                );
     }
 }
diff --git a/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java b/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java
index 2c0c5b5513..303946a113 100644
--- a/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/TestXMLPropertiesTextExtractor.java
@@ -21,21 +21,16 @@ import java.io.File;
 import org.apache.poi.xssf.extractor.XSSFExcelExtractor;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.util.PackageHelper;
 
 import junit.framework.TestCase;
 
 public final class TestXMLPropertiesTextExtractor extends TestCase {
-	private String dirname;
-
-	protected void setUp() {
-		dirname = System.getProperty("OOXML.testdata.path");
-		assertTrue( (new File(dirname)).exists() );
-	}
+    private static final POIDataSamples _ssSamples = POIDataSamples.getSpreadSheetInstance();
 
 	public void testGetFromMainExtractor() throws Exception {
-		OPCPackage pkg = OPCPackage.open(
-				(new File(dirname, "ExcelWithAttachments.xlsm")).toString()
-		);
+		OPCPackage pkg = PackageHelper.open(_ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm"));
+
 		XSSFWorkbook wb = new XSSFWorkbook(pkg);
 
 		XSSFExcelExtractor ext = new XSSFExcelExtractor(wb);
@@ -54,8 +49,8 @@ public final class TestXMLPropertiesTextExtractor extends TestCase {
 	}
 
 	public void testCore() throws Exception {
-		OPCPackage pkg = OPCPackage.open(
-				(new File(dirname, "ExcelWithAttachments.xlsm")).toString()
+		OPCPackage pkg = PackageHelper.open(
+                _ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm")
 		);
 		XSSFWorkbook wb = new XSSFWorkbook(pkg);
 
@@ -72,7 +67,7 @@ public final class TestXMLPropertiesTextExtractor extends TestCase {
 
 	public void testExtended() throws Exception {
 		OPCPackage pkg = OPCPackage.open(
-				(new File(dirname, "ExcelWithAttachments.xlsm")).toString()
+                _ssSamples.openResourceAsStream("ExcelWithAttachments.xlsm")
 		);
 		XSSFWorkbook wb = new XSSFWorkbook(pkg);
 
diff --git a/src/ooxml/testcases/org/apache/poi/extractor/TestExtractorFactory.java b/src/ooxml/testcases/org/apache/poi/extractor/TestExtractorFactory.java
index 76daeed760..421b979e3a 100644
--- a/src/ooxml/testcases/org/apache/poi/extractor/TestExtractorFactory.java
+++ b/src/ooxml/testcases/org/apache/poi/extractor/TestExtractorFactory.java
@@ -22,10 +22,13 @@ import java.io.IOException;
 
 import org.apache.poi.POIOLE2TextExtractor;
 import org.apache.poi.POITextExtractor;
+import org.apache.poi.POIDataSamples;
 import org.apache.poi.hdgf.extractor.VisioTextExtractor;
 import org.apache.poi.hslf.extractor.PowerPointExtractor;
 import org.apache.poi.hssf.extractor.ExcelExtractor;
+import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hwpf.extractor.WordExtractor;
+import org.apache.poi.hwpf.HWPFTestDataSamples;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.xslf.extractor.XSLFPowerPointExtractor;
 import org.apache.poi.xssf.extractor.XSSFExcelExtractor;
@@ -40,21 +43,18 @@ import org.apache.poi.openxml4j.opc.OPCPackage;
  * Test that the extractor factory plays nicely
  */
 public class TestExtractorFactory extends TestCase {
-	private String excel_dir;
-	private String word_dir;
-	private String powerpoint_dir;
-	private String visio_dir;
-	private String poifs_dir;
-	
+
 	private File txt;
 	
 	private File xls;
 	private File xlsx;
-        private File xltx;
+    private File xltx;
+    private File xlsEmb;
 
 	private File doc;
 	private File docx;
-        private File dotx;
+    private File dotx;
+    private File docEmb;
 
 	private File ppt;
 	private File pptx;
@@ -64,31 +64,25 @@ public class TestExtractorFactory extends TestCase {
 	protected void setUp() throws Exception {
 		super.setUp();
 		
-		excel_dir = System.getProperty("HSSF.testdata.path");
-		word_dir = System.getProperty("HWPF.testdata.path");
-		powerpoint_dir = System.getProperty("HSLF.testdata.path");
-		visio_dir = System.getProperty("HDGF.testdata.path");
-		poifs_dir = System.getProperty("POIFS.testdata.path");
-		assertNotNull(excel_dir);
-		assertNotNull(word_dir);
-		assertNotNull(powerpoint_dir);
-		assertNotNull(visio_dir);
-		assertNotNull(poifs_dir);
-		
-		txt = new File(powerpoint_dir, "SampleShow.txt");
-		
-		xls = new File(excel_dir, "SampleSS.xls");
-		xlsx = new File(excel_dir, "SampleSS.xlsx");
-                xltx = new File(excel_dir, "test.xltx");
+        POIDataSamples ssTests = POIDataSamples.getSpreadSheetInstance();
+        xls = ssTests.getFile("SampleSS.xls");
+		xlsx = ssTests.getFile("SampleSS.xlsx");
+        xltx = ssTests.getFile("test.xltx");
+        xlsEmb = ssTests.getFile("excel_with_embeded.xls");
 
-		doc = new File(word_dir, "SampleDoc.doc");
-		docx = new File(word_dir, "SampleDoc.docx");
-        dotx = new File(word_dir, "test.dotx");
+        POIDataSamples wpTests = POIDataSamples.getDocumentInstance();
+		doc = wpTests.getFile("SampleDoc.doc");
+		docx = wpTests.getFile("SampleDoc.docx");
+        dotx = wpTests.getFile("test.dotx");
+        docEmb = wpTests.getFile("word_with_embeded.doc");
 
-		ppt = new File(powerpoint_dir, "SampleShow.ppt");
-		pptx = new File(powerpoint_dir, "SampleShow.pptx");
-		
-		vsd = new File(visio_dir, "Test_Visio-Some_Random_Text.vsd");
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		ppt = slTests.getFile("SampleShow.ppt");
+		pptx = slTests.getFile("SampleShow.pptx");
+        txt = slTests.getFile("SampleShow.txt");
+
+        POIDataSamples dgTests = POIDataSamples.getDiagramInstance();
+		vsd = dgTests.getFile("Test_Visio-Some_Random_Text.vsd");
 	}
 
 	public void testFile() throws Exception {
@@ -339,8 +333,7 @@ public class TestExtractorFactory extends TestCase {
 	public void testEmbeded() throws Exception {
 		POIOLE2TextExtractor ext;
 		POITextExtractor[] embeds;
-		File f;
-		
+
 		// No embedings
 		ext = (POIOLE2TextExtractor)
 				ExtractorFactory.createExtractor(xls);
@@ -348,9 +341,8 @@ public class TestExtractorFactory extends TestCase {
 		assertEquals(0, embeds.length);
 		
 		// Excel
-		f = new File(poifs_dir, "excel_with_embeded.xls");
 		ext = (POIOLE2TextExtractor)
-				ExtractorFactory.createExtractor(f);
+				ExtractorFactory.createExtractor(xlsEmb);
 		embeds = ExtractorFactory.getEmbededDocsTextExtractors(ext);
 
 		assertEquals(6, embeds.length);
@@ -367,9 +359,8 @@ public class TestExtractorFactory extends TestCase {
         assertEquals(2, numWord);
 
         // Word
-		f = new File(poifs_dir, "word_with_embeded.doc");
 		ext = (POIOLE2TextExtractor)
-				ExtractorFactory.createExtractor(f);
+				ExtractorFactory.createExtractor(docEmb);
 		embeds = ExtractorFactory.getEmbededDocsTextExtractors(ext);
 		
         numWord = 0; numXls = 0; numPpt = 0;
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java b/src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
index 62291d37bd..edf0179066 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/OpenXML4JTestDataSamples.java
@@ -17,6 +17,9 @@
 
 package org.apache.poi.openxml4j;
 
+import org.apache.poi.POIDataSamples;
+import org.apache.poi.util.TempFile;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -28,121 +31,31 @@ import java.io.InputStream;
  * @author jmicich
  */
 public final class OpenXML4JTestDataSamples {
-
-	private static final String IN_DIR_PROP_NAME = "openxml4j.testdata.input";
-	private static final String COMP_IN_DIR_PROP_NAME = "openxml4j.compliance.input";
-	
-	private static File _sampleInputDir;
-	private static File _sampleOutputDir;
-	private static File _complianceSampleInputDir;
+    private static final POIDataSamples _samples = POIDataSamples.getOpenXML4JInstance();
 
 	private OpenXML4JTestDataSamples() {
 		// no instances of this class
 	}
-	
+
 	public static InputStream openSampleStream(String sampleFileName) {
-		File f = getSampleFile(sampleFileName);
-		try {
-			return new FileInputStream(f);
-		} catch (FileNotFoundException e) {
-			throw new RuntimeException(e);
-		}
+		return _samples.openResourceAsStream(sampleFileName);
 	}
 	public static String getSampleFileName(String sampleFileName) {
-		// TODO - investigate allowing read/write access for package opened on stream
 		return getSampleFile(sampleFileName).getAbsolutePath();
 	}
 	
 	public static File getSampleFile(String sampleFileName) {
-		File dir = getSampleInputDir();
-		File f = new File(dir, sampleFileName);
-		if (!f.exists()) {
-			throw new RuntimeException("Specified sample file '" 
-					+ f.getAbsolutePath() + "' does not exist");
-		}
-		if (f.isDirectory()) {
-			throw new RuntimeException("Specified sample file '" 
-					+ f.getAbsolutePath() + "' is a directory");
-		}
-		return f;
+		return _samples.getFile(sampleFileName);
 	}
 	
 	public static File getOutputFile(String outputFileName) {
-		File dir = getSampleOutputDir();
-		return new File(dir, outputFileName);
+        String suffix = outputFileName.substring(outputFileName.lastIndexOf('.'));
+        return TempFile.createTempFile(outputFileName, suffix);
 	}
 
 
 	public static InputStream openComplianceSampleStream(String sampleFileName) {
-		File f = getComplianceSampleFile(sampleFileName);
-		try {
-			return new FileInputStream(f);
-		} catch (FileNotFoundException e) {
-			throw new RuntimeException(e);
-		}
-	}
-	private static File getComplianceSampleFile(String sampleFileName) {
-		File dir = getComplianceSampleInputDir();
-		File f = new File(dir, sampleFileName);
-		if (!f.exists()) {
-			throw new RuntimeException("Specified sample file '" 
-					+ f.getAbsolutePath() + "' does not exist");
-		}
-		if (f.isDirectory()) {
-			throw new RuntimeException("Specified sample file '" 
-					+ f.getAbsolutePath() + "' is a directory");
-		}
-		return f;
-	}
-	public static String getComplianceSampleFileName(String sampleFileName) {
-		return getComplianceSampleFile(sampleFileName).getAbsolutePath();
-	}
-	private static File getComplianceSampleInputDir() {
-		if (_complianceSampleInputDir == null) {
-			_complianceSampleInputDir = getAndCheckDirByProperty(COMP_IN_DIR_PROP_NAME);
-		}
-		return _complianceSampleInputDir;
-	}
-
-	
-	private static File getSampleInputDir() {
-		if (_sampleInputDir == null) {
-			_sampleInputDir = getAndCheckDirByProperty(IN_DIR_PROP_NAME);
-		}
-		return _sampleInputDir;
-	}
-
-	private static File getAndCheckDirByProperty(String propName) {
-		String dirName = System.getProperty(propName);
-		File dir = new File(dirName);
-		if (!dir.exists()) {
-			throw new RuntimeException("Specified '" + propName + "' directory: '"
-					+ dirName + "' does not exist");
-		}
-		if (!dir.isDirectory()) {
-			throw new RuntimeException("Specified '" + propName + "' directory: '"
-					+ dirName + "' is a not a proper directory");
-		}
-		return dir;
-	}
-
-	private static File getSampleOutputDir() {
-		if (_sampleOutputDir == null) {
-            File dir = new File(System.getProperty("java.io.tmpdir"), "poifiles");
-			if (dir.exists()) {
-    			if (!dir.isDirectory()) {
-    				throw new RuntimeException("Specified output directory: '"
-    						+ dir.getAbsolutePath() + "' is a not a proper directory");
-    			}
-			} else {
-				if (!dir.mkdirs()) {
-					throw new RuntimeException("Failed to create directory: '"
-							+ dir.getAbsolutePath() + "'");
-				}
-			}
-			_sampleOutputDir = dir;
-		}
-		return _sampleOutputDir;
+        return _samples.openResourceAsStream(sampleFileName);
 	}
 
 }
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
index 7d26fddd7a..b3a4a6320f 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
@@ -33,6 +33,7 @@ import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
 import org.apache.poi.openxml4j.opc.PackagingURIHelper;
 import org.apache.poi.openxml4j.opc.TargetMode;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test core properties Open Packaging Convention compliance.
@@ -144,11 +145,11 @@ public final class TestOPCComplianceCoreProperties extends TestCase {
 	 * Test M4.1 rule.
 	 */
 	public void testOnlyOneCorePropertiesPart_AddPart() {
-		String sampleFileName = OpenXML4JTestDataSamples.getComplianceSampleFileName("OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx");
+		String sampleFileName = "OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx";
 		OPCPackage pkg = null;
 		try {
-			pkg = OPCPackage.open(sampleFileName);
-		} catch (InvalidFormatException e) {
+			pkg = OPCPackage.open(POIDataSamples.getOpenXML4JInstance().getFile(sampleFileName).getPath());
+		} catch (Exception e) {
 			throw new RuntimeException(e);
 		}
 		
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
index b07c8c51bc..e3c54f367e 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
@@ -18,6 +18,7 @@
 package org.apache.poi.openxml4j.opc.compliance;
 
 import java.io.File;
+import java.io.IOException;
 
 import junit.framework.TestCase;
 
@@ -29,6 +30,7 @@ import org.apache.poi.openxml4j.opc.PackagePartName;
 import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
 import org.apache.poi.openxml4j.opc.PackagingURIHelper;
 import org.apache.poi.openxml4j.opc.TargetMode;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test Open Packaging Convention package model compliance.
@@ -70,11 +72,10 @@ public class TestOPCCompliancePackageModel extends TestCase {
 	 * part name derived from another part name by appending segments to it.
 	 * [M1.11]
 	 */
-	public void testPartNameDerivationReadingFailure() {
-		String filepath = System.getProperty("openxml4j.compliance.input")
-				+ File.separator + "OPCCompliance_DerivedPartNameFAIL.docx";
+	public void testPartNameDerivationReadingFailure() throws IOException {
+		String filename = "OPCCompliance_DerivedPartNameFAIL.docx";
 		try {
-			OPCPackage.open(filepath);
+			OPCPackage.open(POIDataSamples.getOpenXML4JInstance().openResourceAsStream(filename));
 		} catch (InvalidFormatException e) {
 			return;
 		}
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/data/sample.docx b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/data/sample.docx
deleted file mode 100755
index dc87bc817a..0000000000
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/internal/data/sample.docx
+++ /dev/null
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java b/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java
index e1e821323c..03d50ca608 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java
@@ -16,31 +16,23 @@
 ==================================================================== */
 package org.apache.poi.xslf;
 
-import java.io.File;
-
 import junit.framework.TestCase;
 
-import org.apache.poi.POIXMLDocument;
+import org.apache.poi.POIDataSamples;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideIdListEntry;
 import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterIdListEntry;
 
 public class TestXSLFSlideShow extends TestCase {
-	private String sampleFile;
+    private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+    private OPCPackage pack;
 
-	protected void setUp() throws Exception {
-		super.setUp();
-		
-		sampleFile = new File(
-				System.getProperty("HSLF.testdata.path") +
-				File.separator + "sample.pptx"
-		).toString();
+    protected void setUp() throws Exception {
+		pack = OPCPackage.open(slTests.openResourceAsStream("sample.pptx"));
 	}
 
 	public void testContainsMainContentType() throws Exception {
-		OPCPackage pack = POIXMLDocument.openPackage(sampleFile);
-		
 		boolean found = false;
 		for(PackagePart part : pack.getParts()) {
 			if(part.getContentType().equals(XSLFSlideShow.MAIN_CONTENT_TYPE)) {
@@ -52,15 +44,11 @@ public class TestXSLFSlideShow extends TestCase {
 	}
 
 	public void testOpen() throws Exception {
-		POIXMLDocument.openPackage(sampleFile);
-		
+
 		XSLFSlideShow xml;
 		
 		// With the finalised uri, should be fine
-		xml = new XSLFSlideShow(
-				POIXMLDocument.openPackage(sampleFile)
-		);
-		
+		xml = new XSLFSlideShow(pack);
 		// Check the core
 		assertNotNull(xml.getPresentation());
 		
@@ -74,7 +62,7 @@ public class TestXSLFSlideShow extends TestCase {
 	}
 	
 	public void testSlideBasics() throws Exception {
-		XSLFSlideShow xml = new XSLFSlideShow(sampleFile);
+		XSLFSlideShow xml = new XSLFSlideShow(pack);
 		
 		// Should have 1 master
 		assertEquals(1, xml.getSlideMasterReferences().sizeOfSldMasterIdArray());
@@ -108,7 +96,7 @@ public class TestXSLFSlideShow extends TestCase {
 	}
 	
 	public void testMetadataBasics() throws Exception {
-		XSLFSlideShow xml = new XSLFSlideShow(sampleFile);
+		XSLFSlideShow xml = new XSLFSlideShow(pack);
 		
 		assertNotNull(xml.getProperties().getCoreProperties());
 		assertNotNull(xml.getProperties().getExtendedProperties());
diff --git a/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java b/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
index ac31356374..334e556465 100644
--- a/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
@@ -16,9 +16,8 @@
 ==================================================================== */
 package org.apache.poi.xslf.extractor;
 
-import java.io.File;
-
-import org.apache.poi.POIXMLDocument;
+import org.apache.poi.POIDataSamples;
+import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.xslf.XSLFSlideShow;
 
 import junit.framework.TestCase;
@@ -31,18 +30,12 @@ public class TestXSLFPowerPointExtractor extends TestCase {
 	 * A simple file
 	 */
 	private XSLFSlideShow xmlA;
-	private File fileA;
+	private OPCPackage pkg;
 
 	protected void setUp() throws Exception {
-		super.setUp();
-		
-		fileA = new File(
-				System.getProperty("HSLF.testdata.path") +
-				File.separator + "sample.pptx"
-		);
-		assertTrue(fileA.exists());
-		
-		xmlA = new XSLFSlideShow(fileA.toString());
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		pkg = OPCPackage.open(slTests.openResourceAsStream("sample.pptx"));
+		xmlA = new XSLFSlideShow(pkg);
 	}
 
 	/**
@@ -50,8 +43,7 @@ public class TestXSLFPowerPointExtractor extends TestCase {
 	 */
 	public void testGetSimpleText() throws Exception {
 		new XSLFPowerPointExtractor(xmlA);
-		new XSLFPowerPointExtractor(
-				POIXMLDocument.openPackage(fileA.toString()));
+		new XSLFPowerPointExtractor(pkg);
 		
 		XSLFPowerPointExtractor extractor = 
 			new XSLFPowerPointExtractor(xmlA);
@@ -110,13 +102,8 @@ public class TestXSLFPowerPointExtractor extends TestCase {
 	}
 	
 	public void testGetComments() throws Exception {
-		File file = new File(
-				System.getProperty("HSLF.testdata.path") +
-				File.separator + "45545_Comment.pptx"
-		);
-		assertTrue(file.exists());
-		
-		xmlA = new XSLFSlideShow(file.toString());
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		xmlA = new XSLFSlideShow(OPCPackage.open(slTests.openResourceAsStream("45545_Comment.pptx")));
 		XSLFPowerPointExtractor extractor = 
 			new XSLFPowerPointExtractor(xmlA);
 		
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java b/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java
index 4d04a10151..58dde48bfa 100755
--- a/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/XSSFITestDataProvider.java
@@ -22,6 +22,7 @@ import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.hssf.HSSFTestDataSamples;
+import org.apache.poi.POIDataSamples;
 
 /**
  * @author Yegor Kozlov
@@ -45,7 +46,7 @@ public final class XSSFITestDataProvider implements ITestDataProvider {
     }
 
     public byte[] getTestDataFileContent(String fileName) {
-        return HSSFTestDataSamples.getTestDataFileContent(fileName);
+        return POIDataSamples.getSpreadSheetInstance().readFile(fileName);
     }
 
     public SpreadsheetVersion getSpreadsheetVersion(){
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java b/src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java
index 94df0da632..166c3b35e5 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/XSSFTestDataSamples.java
@@ -38,15 +38,8 @@ import org.apache.poi.util.TempFile;
  * @author Josh Micich
  */
 public class XSSFTestDataSamples {
-    
-    public static InputStream openSampleFileStream(String sampleFileName) {
-        return HSSFTestDataSamples.openSampleFileStream(sampleFileName);
-    }
-    public static byte[] getTestDataFileContent(String fileName) {
-        return HSSFTestDataSamples.getTestDataFileContent(fileName);
-    }
 
-	public static final XSSFWorkbook openSampleWorkbook(String sampleName) {
+	public static XSSFWorkbook openSampleWorkbook(String sampleName) {
 		InputStream is = HSSFTestDataSamples.openSampleFileStream(sampleName);
 		try {
 			return new XSSFWorkbook(is);
@@ -57,24 +50,17 @@ public class XSSFTestDataSamples {
     public static <R extends Workbook> R writeOutAndReadBack(R wb) {
     	Workbook result;
 		try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream(8192);
+            wb.write(baos);
+            InputStream is = new ByteArrayInputStream(baos.toByteArray());
 	    	if (wb instanceof HSSFWorkbook) {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream(8192);
-                wb.write(baos);
-                InputStream is = new ByteArrayInputStream(baos.toByteArray());
 	    		result = new HSSFWorkbook(is);
 	    	} else if (wb instanceof XSSFWorkbook) {
-                File tmp = TempFile.createTempFile("poi-ooxml-", ".xlsx");
-                FileOutputStream out = new FileOutputStream(tmp);
-                wb.write(out);
-                out.close();
-                OPCPackage pkg = OPCPackage.open(tmp.getAbsolutePath());
-    			result = new XSSFWorkbook(pkg);
+    			result = new XSSFWorkbook(is);
 	    	} else {
-	    		throw new RuntimeException("Unexpected workbook type (" 
+	    		throw new RuntimeException("Unexpected workbook type ("
 	    				+ wb.getClass().getName() + ")");
 	    	}
-		} catch (InvalidFormatException e) {
-			throw new RuntimeException(e);
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/data/sample.xlsx b/src/ooxml/testcases/org/apache/poi/xssf/data/sample.xlsx
deleted file mode 100644
index a275cf417e..0000000000
--- a/src/ooxml/testcases/org/apache/poi/xssf/data/sample.xlsx
+++ /dev/null
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java b/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
index 0ace7c3f63..0592fbcc76 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
@@ -26,14 +26,16 @@ import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.xssf.XSSFTestDataSamples;
 import org.apache.poi.xssf.usermodel.XSSFRichTextString;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests for {@link XSSFReader}
  */
 public final class TestXSSFReader extends TestCase {
+    private static POIDataSamples _ssTests = POIDataSamples.getSpreadSheetInstance();
 
-	public void testGetBits() throws Exception {
-		OPCPackage pkg = OPCPackage.open(XSSFTestDataSamples.openSampleFileStream("SampleSS.xlsx"));
+    public void testGetBits() throws Exception {
+		OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"));
 
 		XSSFReader r = new XSSFReader(pkg);
 
@@ -46,7 +48,7 @@ public final class TestXSSFReader extends TestCase {
 	}
 
 	public void testStyles() throws Exception {
-		OPCPackage pkg = OPCPackage.open(XSSFTestDataSamples.openSampleFileStream("SampleSS.xlsx"));
+		OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"));
 
 		XSSFReader r = new XSSFReader(pkg);
 
@@ -55,7 +57,7 @@ public final class TestXSSFReader extends TestCase {
 	}
 
 	public void testStrings() throws Exception {
-        OPCPackage pkg = OPCPackage.open(XSSFTestDataSamples.openSampleFileStream("SampleSS.xlsx"));
+        OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"));
 
 		XSSFReader r = new XSSFReader(pkg);
 
@@ -64,7 +66,7 @@ public final class TestXSSFReader extends TestCase {
 	}
 
 	public void testSheets() throws Exception {
-        OPCPackage pkg = OPCPackage.open(XSSFTestDataSamples.openSampleFileStream("SampleSS.xlsx"));
+        OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"));
 
 		XSSFReader r = new XSSFReader(pkg);
 		byte[] data = new byte[4096];
@@ -96,7 +98,7 @@ public final class TestXSSFReader extends TestCase {
 	 * (as they are defined in the workbook.xml)
 	 */
 	public void testOrderOfSheets() throws Exception {
-        OPCPackage pkg = OPCPackage.open(XSSFTestDataSamples.openSampleFileStream("reordered_sheets.xlsx"));
+        OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("reordered_sheets.xlsx"));
 
 		XSSFReader r = new XSSFReader(pkg);
 
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java b/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
index 0f739f750e..f635eea850 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/io/TestLoadSaveXSSF.java
@@ -28,23 +28,15 @@ import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.xssf.usermodel.XSSFPictureData;
+import org.apache.poi.xssf.XSSFITestDataProvider;
+import org.apache.poi.POIDataSamples;
 
 
 public class TestLoadSaveXSSF extends TestCase {
-
-    String filename;
-
-    protected void setUp() {
-
-        System.setProperty("org.apache.poi.util.POILogger", org.apache.poi.util.CommonsLogger.class.getName());
-        filename = System.getProperty("XSSF.testdata.path");
-        if (filename == null) {
-            filename = "src/ooxml/testcases/org/apache/poi/xssf/data";
-        }
-    }
+    private static final POIDataSamples _ssSampels = POIDataSamples.getSpreadSheetInstance();
 
     public void testLoadSample() throws Exception {
-        XSSFWorkbook workbook = new XSSFWorkbook(new File(filename, "sample.xlsx").getAbsolutePath());
+        XSSFWorkbook workbook = new XSSFWorkbook(_ssSampels.openResourceAsStream("sample.xlsx"));
         assertEquals(3, workbook.getNumberOfSheets());
         assertEquals("Sheet1", workbook.getSheetName(0));
         Sheet sheet = workbook.getSheetAt(0);
@@ -58,7 +50,7 @@ public class TestLoadSaveXSSF extends TestCase {
 
     // TODO filename string hard coded in XSSFWorkbook constructor in order to make ant test-ooxml target be successful.
     public void testLoadStyles() throws Exception {
-        XSSFWorkbook workbook = new XSSFWorkbook(new File(filename, "styles.xlsx").getAbsolutePath());
+        XSSFWorkbook workbook = new XSSFWorkbook(_ssSampels.openResourceAsStream("styles.xlsx"));
         Sheet sheet = workbook.getSheetAt(0);
         Row row = sheet.getRow(0);
         Cell cell = row.getCell((short) 0);
@@ -68,7 +60,7 @@ public class TestLoadSaveXSSF extends TestCase {
 
     // TODO filename string hard coded in XSSFWorkbook constructor in order to make ant test-ooxml target be successful.
     public void testLoadPictures() throws Exception {
-        XSSFWorkbook workbook = new XSSFWorkbook(new File(filename, "picture.xlsx").getAbsolutePath());
+        XSSFWorkbook workbook = new XSSFWorkbook(_ssSampels.openResourceAsStream("picture.xlsx"));
         List<XSSFPictureData> pictures = workbook.getAllPictures();
         assertEquals(1, pictures.size());
     }
diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java b/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java
index 3255d62f10..945ffebe6d 100755
--- a/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java
+++ b/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java
@@ -28,7 +28,7 @@ import java.io.*;
 public class XWPFTestDataSamples {

 

     public static XWPFDocument openSampleDocument(String sampleName) {

-        InputStream is = HWPFTestDataSamples.openSampleFileStream(sampleName);

+        InputStream is = POIDataSamples.getDocumentInstance().openResourceAsStream(sampleName);

         try {

             return new XWPFDocument(is);

         } catch (IOException e) {

@@ -46,9 +46,4 @@ public class XWPFTestDataSamples {
             throw new RuntimeException(e);

         }

     }

-

-    public static POIDataSamples getInstance(){

-        return HWPFTestDataSamples.getInstance();

-    }

-

 }

diff --git a/src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java b/src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java
index 8c9224fd9d..7e7d0b249a 100644
--- a/src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java
+++ b/src/scratchpad/testcases/org/apache/poi/TestPOIDocumentScratchpad.java
@@ -25,7 +25,7 @@ import junit.framework.TestCase;
 import java.io.*;
 
 import org.apache.poi.hslf.HSLFSlideShow;
-import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.hwpf.HWPFTestDataSamples;
 import org.apache.poi.poifs.filesystem.*;
 
 /**
@@ -41,29 +41,15 @@ public final class TestPOIDocumentScratchpad extends TestCase {
 	// The POI Documents to work on
 	private POIDocument doc;
 	private POIDocument doc2;
-	// POIFS primed on the test (powerpoint and word) data
-	private POIFSFileSystem pfs;
-	private POIFSFileSystem pfs2;
 
 	/**
 	 * Set things up, using a PowerPoint document and
 	 *  a Word Document for our testing
 	 */
 	public void setUp() throws Exception {
-		String dirnameHSLF = System.getProperty("HSLF.testdata.path");
-		String filenameHSLF = dirnameHSLF + "/basic_test_ppt_file.ppt";
-		String dirnameHSSF = System.getProperty("HSSF.testdata.path");
-		String filenameHSSF = dirnameHSLF + "/DateFormats.ppt";
-		String dirnameHWPF = System.getProperty("HWPF.testdata.path");
-		String filenameHWPF = dirnameHWPF + "/test2.doc";
-
-		FileInputStream fisHSLF = new FileInputStream(filenameHSLF);
-		pfs = new POIFSFileSystem(fisHSLF);
-		doc = new HSLFSlideShow(pfs);
-
-		FileInputStream fisHWPF = new FileInputStream(filenameHWPF);
-		pfs2 = new POIFSFileSystem(fisHWPF);
-		doc2 = new HWPFDocument(pfs2);
+		doc = new HSLFSlideShow(POIDataSamples.getSlideShowInstance().openResourceAsStream("basic_test_ppt_file.ppt"));
+
+		doc2 = HWPFTestDataSamples.openSampleFile("test2.doc");
 	}
 
 	public void testReadProperties() {
diff --git a/src/scratchpad/testcases/org/apache/poi/hdf/model/TestHDFDocument.java b/src/scratchpad/testcases/org/apache/poi/hdf/model/TestHDFDocument.java
index 4f4b4707b8..42f79caf40 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdf/model/TestHDFDocument.java
+++ b/src/scratchpad/testcases/org/apache/poi/hdf/model/TestHDFDocument.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import junit.framework.TestCase;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Class to test {@link HDFDocument} functionality
@@ -30,19 +31,12 @@ import junit.framework.TestCase;
  * @author Bob Otterberg
  */
 public final class TestHDFDocument extends TestCase {
+    private static final POIDataSamples _samples = POIDataSamples.getDocumentInstance();
+
     public void testStopJUnitComplainintAboutNoTests() {
         // TODO - fix these junits
     }
 
-    private static InputStream openSample(String sampleFileName) {
-        String fullPathName = System.getProperty("HDF.testdata.path") + "/" + sampleFileName;
-        try {
-            return new FileInputStream(System.getProperty("HDF.testdata.path"));
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException("Sample HDF file '" + fullPathName + "' was not found.");
-        }
-    }
-
     /**
      * OBJECTIVE:  Test that HDF can read an empty document (empty.doc).<P>
      * SUCCESS:    HDF reads the document.  Matches values in their particular positions.<P>
@@ -50,7 +44,7 @@ public final class TestHDFDocument extends TestCase {
      *             in the document in their known positions.<P>
      */
     public void fixme_testEmpty() throws IOException {
-        InputStream stream = openSample("empty.doc");
+        InputStream stream = _samples.openResourceAsStream("empty.doc");
         new HDFDocument(stream);
     }
 
@@ -61,7 +55,7 @@ public final class TestHDFDocument extends TestCase {
      *             in the document in their known positions.<P>
      */
     public void fixme_testSimple() throws IOException {
-        InputStream stream = openSample("simple.doc");
+        InputStream stream = _samples.openResourceAsStream("simple.doc");
         new HDFDocument(stream);
     }
 
@@ -73,7 +67,7 @@ public final class TestHDFDocument extends TestCase {
      *
      */
     public void fixme_testSimpleList() throws IOException {
-        InputStream stream = openSample("simple-list.doc");
+        InputStream stream = _samples.openResourceAsStream("simple-list.doc");
         new HDFDocument(stream);
     }
 
@@ -84,7 +78,7 @@ public final class TestHDFDocument extends TestCase {
      *             in the document in their known positions.<P>
      */
     public void fixme_testSimpleTable() throws IOException {
-        InputStream stream = openSample("simple-table.doc");
+        InputStream stream = _samples.openResourceAsStream("simple-table.doc");
         new HDFDocument(stream);
     }
 }
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java b/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
index e98c8110a0..d6616b9147 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
+++ b/src/scratchpad/testcases/org/apache/poi/hdgf/TestHDGFCore.java
@@ -22,18 +22,17 @@ import java.io.FileInputStream;
 import org.apache.poi.hdgf.streams.PointerContainingStream;
 import org.apache.poi.hdgf.streams.TrailerStream;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.POIDataSamples;
 
 import junit.framework.TestCase;
 
 public final class TestHDGFCore extends TestCase {
+    private static POIDataSamples _dgTests = POIDataSamples.getDiagramInstance();
+
 	private POIFSFileSystem fs;
-	private String dirname;
-	private String filename;
 
 	protected void setUp() throws Exception {
-		dirname = System.getProperty("HDGF.testdata.path");
-		filename = dirname + "/Test_Visio-Some_Random_Text.vsd";
-		fs = new POIFSFileSystem(new FileInputStream(filename));
+		fs = new POIFSFileSystem(_dgTests.openResourceAsStream("Test_Visio-Some_Random_Text.vsd"));
 	}
 
 	public void testCreate() throws Exception {
@@ -68,8 +67,7 @@ public final class TestHDGFCore extends TestCase {
 	 *  appears to have a negative chunk length
 	 */
 	public void DISABLEDtestNegativeChunkLength() throws Exception {
-		filename = dirname + "/NegativeChunkLength.vsd";
-		fs = new POIFSFileSystem(new FileInputStream(filename));
+		fs = new POIFSFileSystem(_dgTests.openResourceAsStream("NegativeChunkLength.vsd"));
 
 		HDGFDiagram hdgf = new HDGFDiagram(fs);
 		assertNotNull(hdgf);
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java b/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
index 16bd9a961e..30b8db4fbd 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
+++ b/src/scratchpad/testcases/org/apache/poi/hdgf/extractor/TestVisioExtractor.java
@@ -19,20 +19,20 @@ package org.apache.poi.hdgf.extractor;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.PrintStream;
 
 import junit.framework.TestCase;
 
 import org.apache.poi.hdgf.HDGFDiagram;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.POIDataSamples;
 
 public final class TestVisioExtractor extends TestCase {
-	private String dirname;
+    private static POIDataSamples _dgTests = POIDataSamples.getDiagramInstance();
+
 	private String defFilename;
 	protected void setUp() {
-		dirname = System.getProperty("HDGF.testdata.path");
-		defFilename = dirname + "/Test_Visio-Some_Random_Text.vsd";
+		defFilename = "Test_Visio-Some_Random_Text.vsd";
 	}
 
 	/**
@@ -41,14 +41,14 @@ public final class TestVisioExtractor extends TestCase {
 	public void testCreation() throws Exception {
 		VisioTextExtractor extractor;
 
-		extractor = new VisioTextExtractor(new FileInputStream(defFilename));
+		extractor = new VisioTextExtractor(_dgTests.openResourceAsStream(defFilename));
 		assertNotNull(extractor);
 		assertNotNull(extractor.getAllText());
 		assertEquals(3, extractor.getAllText().length);
 
 		extractor = new VisioTextExtractor(
 				new POIFSFileSystem(
-						new FileInputStream(defFilename)
+						_dgTests.openResourceAsStream(defFilename)
 				)
 		);
 		assertNotNull(extractor);
@@ -58,7 +58,7 @@ public final class TestVisioExtractor extends TestCase {
 		extractor = new VisioTextExtractor(
 			new HDGFDiagram(
 				new POIFSFileSystem(
-						new FileInputStream(defFilename)
+						_dgTests.openResourceAsStream(defFilename)
 				)
 			)
 		);
@@ -69,7 +69,7 @@ public final class TestVisioExtractor extends TestCase {
 
 	public void testExtraction() throws Exception {
 		VisioTextExtractor extractor =
-			new VisioTextExtractor(new FileInputStream(defFilename));
+			new VisioTextExtractor(_dgTests.openResourceAsStream(defFilename));
 
 		// Check the array fetch
 		String[] text = extractor.getAllText();
@@ -86,20 +86,11 @@ public final class TestVisioExtractor extends TestCase {
 	}
 
 	public void testProblemFiles() throws Exception {
-		File a = new File(dirname, "44594.vsd");
-		VisioTextExtractor.main(new String[] {a.toString()});
-
-		File b = new File(dirname, "44594-2.vsd");
-		VisioTextExtractor.main(new String[] {b.toString()});
-
-		File c = new File(dirname, "ShortChunk1.vsd");
-		VisioTextExtractor.main(new String[] {c.toString()});
-
-		File d = new File(dirname, "ShortChunk2.vsd");
-		VisioTextExtractor.main(new String[] {d.toString()});
-
-		File e = new File(dirname, "ShortChunk3.vsd");
-		VisioTextExtractor.main(new String[] {e.toString()});
+		String[] files = {"44594.vsd", "44594-2.vsd", "ShortChunk1.vsd", "ShortChunk2.vsd", "ShortChunk3.vsd"};
+        for(String file : files){
+            VisioTextExtractor ex = new VisioTextExtractor(_dgTests.openResourceAsStream(file));
+            ex.getText();
+        }
 	}
 
 	public void testMain() throws Exception {
@@ -108,7 +99,8 @@ public final class TestVisioExtractor extends TestCase {
 		PrintStream capture = new PrintStream(baos);
 		System.setOut(capture);
 
-		VisioTextExtractor.main(new String[] {defFilename});
+        String path = _dgTests.getFile(defFilename).getPath();
+        VisioTextExtractor.main(new String[] {path});
 
 		// Put things back
 		System.setOut(oldOut);
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java b/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java
index 66c3907082..5ba377afdf 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java
+++ b/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamBugs.java
@@ -18,6 +18,7 @@
 package org.apache.poi.hdgf.streams;
 
 import java.io.FileInputStream;
+import java.io.InputStream;
 
 import org.apache.poi.hdgf.HDGFDiagram;
 import org.apache.poi.hdgf.chunks.ChunkFactory;
@@ -25,6 +26,7 @@ import org.apache.poi.hdgf.pointers.Pointer;
 import org.apache.poi.hdgf.pointers.PointerFactory;
 import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests for bugs with streams
@@ -36,13 +38,11 @@ public final class TestStreamBugs extends StreamTest {
 	private POIFSFileSystem filesystem;
 
 	protected void setUp() throws Exception {
-		String dirname = System.getProperty("HDGF.testdata.path");
-		String filename = dirname + "/44594.vsd";
 		ptrFactory = new PointerFactory(11);
 		chunkFactory = new ChunkFactory(11);
 
-		FileInputStream fin = new FileInputStream(filename);
-		filesystem = new POIFSFileSystem(fin);
+        InputStream is = POIDataSamples.getDiagramInstance().openResourceAsStream("44594.vsd");
+        filesystem = new POIFSFileSystem(is);
 
 		DocumentEntry docProps =
 			(DocumentEntry)filesystem.getRoot().getEntry("VisioDocument");
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java b/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java
index a06c03aa24..6aa2b2e31c 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java
+++ b/src/scratchpad/testcases/org/apache/poi/hdgf/streams/TestStreamComplex.java
@@ -18,6 +18,7 @@
 package org.apache.poi.hdgf.streams;
 
 import java.io.FileInputStream;
+import java.io.InputStream;
 
 import org.apache.poi.hdgf.chunks.Chunk;
 import org.apache.poi.hdgf.chunks.ChunkFactory;
@@ -25,6 +26,7 @@ import org.apache.poi.hdgf.pointers.Pointer;
 import org.apache.poi.hdgf.pointers.PointerFactory;
 import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.POIDataSamples;
 
 public final class TestStreamComplex extends StreamTest {
 	private byte[] contents;
@@ -34,13 +36,11 @@ public final class TestStreamComplex extends StreamTest {
 	private PointerFactory ptrFactory;
 
 	protected void setUp() throws Exception {
-		String dirname = System.getProperty("HDGF.testdata.path");
-		String filename = dirname + "/Test_Visio-Some_Random_Text.vsd";
 		ptrFactory = new PointerFactory(11);
 		chunkFactory = new ChunkFactory(11);
 
-		FileInputStream fin = new FileInputStream(filename);
-		POIFSFileSystem filesystem = new POIFSFileSystem(fin);
+        InputStream is = POIDataSamples.getDiagramInstance().openResourceAsStream("Test_Visio-Some_Random_Text.vsd");
+		POIFSFileSystem filesystem = new POIFSFileSystem(is);
 
 		DocumentEntry docProps =
 			(DocumentEntry)filesystem.getRoot().getEntry("VisioDocument");
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java b/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java
index 96e1591e02..4ea2793774 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java
+++ b/src/scratchpad/testcases/org/apache/poi/hpbf/TestHPBFDocument.java
@@ -21,27 +21,22 @@ import java.io.File;
 import java.io.FileInputStream;
 
 import junit.framework.TestCase;
+import org.apache.poi.POIDataSamples;
 
 public final class TestHPBFDocument extends TestCase {
-	private String dir;
-
-	protected void setUp() {
-		dir = System.getProperty("HPBF.testdata.path");
-	}
+    private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
 
 	public void testOpen() throws Exception {
-		File f = new File(dir, "Sample.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Sample.pub")
 		);
 
 		assertNotNull(doc);
 	}
 
 	public void testBits() throws Exception {
-		File f = new File(dir, "Sample.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Sample.pub")
 		);
 
 		assertNotNull(doc.getMainContents());
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TextPublisherTextExtractor.java b/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TextPublisherTextExtractor.java
index 7aceb66d43..fd3c97fe72 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TextPublisherTextExtractor.java
+++ b/src/scratchpad/testcases/org/apache/poi/hpbf/extractor/TextPublisherTextExtractor.java
@@ -21,37 +21,31 @@ import java.io.File;
 import java.io.FileInputStream;
 
 import org.apache.poi.hpbf.HPBFDocument;
+import org.apache.poi.POIDataSamples;
 
 import junit.framework.TestCase;
 
 public final class TextPublisherTextExtractor extends TestCase {
-	private String dir;
-
-	protected void setUp() {
-		dir = System.getProperty("HPBF.testdata.path");
-	}
+    private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
 
 	public void testBasics() throws Exception {
-		File f = new File(dir, "Sample.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+				_samples.openResourceAsStream("Sample.pub")
 		);
 
 		PublisherTextExtractor ext =
 			new PublisherTextExtractor(doc);
 		ext.getText();
 
-		f = new File(dir, "Simple.pub");
 		ext = new PublisherTextExtractor(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Simple.pub")
 		);
 		ext.getText();
 	}
 
 	public void testContents() throws Exception {
-		File f = new File(dir, "Sample.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Sample.pub")
 		);
 
 		PublisherTextExtractor ext =
@@ -87,9 +81,8 @@ public final class TextPublisherTextExtractor extends TestCase {
 		);
 
 		// Now a simpler one
-		f = new File(dir, "Simple.pub");
 		ext = new PublisherTextExtractor(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Simple.pub")
 		);
 		text = ext.getText();
 		assertEquals(
@@ -113,21 +106,18 @@ public final class TextPublisherTextExtractor extends TestCase {
 		File f;
 		HPBFDocument doc;
 
-		f = new File(dir, "Sample.pub");
 		doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Sample.pub")
 		);
 		String s2007 = (new PublisherTextExtractor(doc)).getText();
 
-		f = new File(dir, "Sample2000.pub");
 		doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Sample2000.pub")
 		);
 		String s2000 = (new PublisherTextExtractor(doc)).getText();
 
-		f = new File(dir, "Sample98.pub");
 		doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Sample98.pub")
 		);
 		String s98 = (new PublisherTextExtractor(doc)).getText();
 
@@ -141,9 +131,8 @@ public final class TextPublisherTextExtractor extends TestCase {
 	 *  as we can hope it to.
 	 */
 	public void testWithHyperlinks() throws Exception {
-		File f = new File(dir, "LinkAt10.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("LinkAt10.pub")
 		);
 
 		PublisherTextExtractor ext =
@@ -159,8 +148,9 @@ public final class TextPublisherTextExtractor extends TestCase {
 
 
 		// Now a much more complex document
-		f = new File(dir, "Sample.pub");
-		ext = new PublisherTextExtractor(new FileInputStream(f));
+		ext = new PublisherTextExtractor(
+                _samples.openResourceAsStream("Sample.pub")
+        );
 		ext.setHyperlinksByDefault(true);
 		String text = ext.getText();
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java b/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java
index 702c5fd8f3..0df03e16eb 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java
+++ b/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestEscherParts.java
@@ -21,20 +21,16 @@ import java.io.File;
 import java.io.FileInputStream;
 
 import org.apache.poi.hpbf.HPBFDocument;
+import org.apache.poi.POIDataSamples;
 
 import junit.framework.TestCase;
 
 public final class TestEscherParts extends TestCase {
-	private String dir;
-
-	protected void setUp() {
-		dir = System.getProperty("HPBF.testdata.path");
-	}
+    private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
 
 	public void testBasics() throws Exception {
-		File f = new File(dir, "Sample.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+		    _samples.openResourceAsStream("Sample.pub")
 		);
 
 		EscherStm es = doc.getEscherStm();
@@ -50,9 +46,8 @@ public final class TestEscherParts extends TestCase {
 	}
 
 	public void testComplex() throws Exception {
-		File f = new File(dir, "SampleBrochure.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("SampleBrochure.pub")
 		);
 
 		EscherStm es = doc.getEscherStm();
@@ -68,9 +63,8 @@ public final class TestEscherParts extends TestCase {
 
 
 		// Now do another complex file
-		f = new File(dir, "SampleNewsletter.pub");
 		doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("SampleNewsletter.pub")
 		);
 
 		es = doc.getEscherStm();
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java b/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java
index 6a80c86286..b88e45b028 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java
+++ b/src/scratchpad/testcases/org/apache/poi/hpbf/model/TestQuillContents.java
@@ -17,29 +17,22 @@
 
 package org.apache.poi.hpbf.model;
 
-import java.io.File;
-import java.io.FileInputStream;
-
 import org.apache.poi.hpbf.HPBFDocument;
 import org.apache.poi.hpbf.model.qcbits.QCTextBit;
 import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type12;
 import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type0;
 import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type4;
 import org.apache.poi.hpbf.model.qcbits.QCPLCBit.Type8;
+import org.apache.poi.POIDataSamples;
 
 import junit.framework.TestCase;
 
 public final class TestQuillContents extends TestCase {
-	private String dir;
-
-	protected void setUp() {
-		dir = System.getProperty("HPBF.testdata.path");
-	}
+    private static final POIDataSamples _samples = POIDataSamples.getPublisherInstance();
 
 	public void testBasics() throws Exception {
-		File f = new File(dir, "Sample.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+		    _samples.openResourceAsStream("Sample.pub")
 		);
 
 		QuillContents qc = doc.getQuillContents();
@@ -69,9 +62,8 @@ public final class TestQuillContents extends TestCase {
 	}
 
 	public void testText() throws Exception {
-		File f = new File(dir, "Sample.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Sample.pub")
 		);
 
 		QuillContents qc = doc.getQuillContents();
@@ -84,9 +76,8 @@ public final class TestQuillContents extends TestCase {
 	}
 
 	public void testPLC() throws Exception {
-		File f = new File(dir, "Simple.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Simple.pub")
 		);
 
 		QuillContents qc = doc.getQuillContents();
@@ -145,9 +136,8 @@ public final class TestQuillContents extends TestCase {
 	}
 
 	public void testComplexPLC() throws Exception {
-		File f = new File(dir, "Sample.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Sample.pub")
 		);
 
 		QuillContents qc = doc.getQuillContents();
@@ -247,9 +237,8 @@ public final class TestQuillContents extends TestCase {
 	}
 
 	public void testNoHyperlinks() throws Exception {
-		File f = new File(dir, "SampleNewsletter.pub");
 		HPBFDocument doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("SampleNewsletter.pub")
 		);
 
 		QuillContents qc = doc.getQuillContents();
@@ -264,15 +253,13 @@ public final class TestQuillContents extends TestCase {
 	}
 
 	public void testSimpleHyperlink() throws Exception {
-		File f;
 		HPBFDocument doc;
 		QuillContents qc;
 		Type12 hlBit;
 
 		// Link at 10
-		f = new File(dir, "LinkAt10.pub");
 		doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("LinkAt10.pub")
 		);
 		qc = doc.getQuillContents();
 
@@ -285,9 +272,8 @@ public final class TestQuillContents extends TestCase {
 		assertEquals("http://poi.apache.org/", hlBit.getHyperlink(0));
 
 		// Longer link at 10
-		f = new File(dir, "LinkAt10Longer.pub");
 		doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("LinkAt10Longer.pub")
 		);
 		qc = doc.getQuillContents();
 
@@ -300,9 +286,8 @@ public final class TestQuillContents extends TestCase {
 		assertEquals("http://poi.apache.org/hpbf/", hlBit.getHyperlink(0));
 
 		// Link at 20
-		f = new File(dir, "LinkAt20.pub");
 		doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("LinkAt20.pub")
 		);
 		qc = doc.getQuillContents();
 
@@ -316,15 +301,13 @@ public final class TestQuillContents extends TestCase {
 	}
 
 	public void testManyHyperlinks() throws Exception {
-		File f;
 		HPBFDocument doc;
 		QuillContents qc;
 		Type12 hlBit;
 
 		// Link at 10
-		f = new File(dir, "LinkAt10.pub");
 		doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("LinkAt10.pub")
 		);
 		qc = doc.getQuillContents();
 
@@ -339,16 +322,14 @@ public final class TestQuillContents extends TestCase {
 	}
 
 	public void testHyperlinkDifferentVersions() throws Exception {
-		File f;
 		HPBFDocument doc;
 		QuillContents qc;
 		Type12 hlBitA;
 		Type12 hlBitB;
 
 		// Latest version
-		f = new File(dir, "Sample.pub");
 		doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Sample.pub")
 		);
 		qc = doc.getQuillContents();
 
@@ -375,9 +356,8 @@ public final class TestQuillContents extends TestCase {
 		assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(2));
 
 		// 2000 version
-		f = new File(dir, "Sample2000.pub");
 		doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Sample2000.pub")
 		);
 		qc = doc.getQuillContents();
 
@@ -404,9 +384,8 @@ public final class TestQuillContents extends TestCase {
 		assertEquals("mailto:dev@poi.apache.org?subject=HPBF", hlBitB.getHyperlink(2));
 
 		// 98 version
-		f = new File(dir, "Sample98.pub");
 		doc = new HPBFDocument(
-				new FileInputStream(f)
+                _samples.openResourceAsStream("Sample98.pub")
 		);
 		qc = doc.getQuillContents();
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java b/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java
index 892cb81387..da07810b86 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/TestEncryptedFile.java
@@ -21,6 +21,7 @@ package org.apache.poi.hslf;
 import junit.framework.TestCase;
 
 import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that HSLFSlideShow does the right thing with an encrypted file
@@ -28,48 +29,31 @@ import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
  * @author Nick Burch (nick at torchbox dot com)
  */
 public final class TestEncryptedFile extends TestCase {
-	// A non encrypted file
-	private String ss_ne;
-	// An encrypted file, with encrypted properties
-	private String ss_e;
-	// An encrypted file, without encrypted properties
-	private String ss_np_e;
-	// An encrypted file, with a 56 bit key
-	private String ss_56_e;
-
-
-	public TestEncryptedFile() {
-		String dirname = System.getProperty("HSLF.testdata.path");
-
-		ss_ne = dirname + "/basic_test_ppt_file.ppt";
-		ss_e = dirname + "/Password_Protected-hello.ppt";
-		ss_np_e = dirname + "/Password_Protected-np-hello.ppt";
-		ss_56_e = dirname + "/Password_Protected-56-hello.ppt";
-	}
+    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
 
 	public void testLoadNonEncrypted() throws Exception {
-		HSLFSlideShow hss = new HSLFSlideShow(ss_ne);
+		HSLFSlideShow hss = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 
 		assertNotNull(hss);
 	}
 
 	public void testLoadEncrypted() throws Exception {
 		try {
-			new HSLFSlideShow(ss_e);
+            new HSLFSlideShow(slTests.openResourceAsStream("Password_Protected-hello.ppt"));
 			fail();
 		} catch(EncryptedPowerPointFileException e) {
 			// Good
 		}
 
 		try {
-			new HSLFSlideShow(ss_np_e);
+            new HSLFSlideShow(slTests.openResourceAsStream("Password_Protected-np-hello.ppt"));
 			fail();
 		} catch(EncryptedPowerPointFileException e) {
 			// Good
 		}
 
 		try {
-			new HSLFSlideShow(ss_56_e);
+            new HSLFSlideShow(slTests.openResourceAsStream("Password_Protected-56-hello.ppt"));
 			fail();
 		} catch(EncryptedPowerPointFileException e) {
 			// Good
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java b/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java
index b1468f2c55..ff918ad03d 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/TestReWrite.java
@@ -19,10 +19,14 @@ package org.apache.poi.hslf;
 
 
 import junit.framework.TestCase;
-import java.io.*;
 
 import org.apache.poi.hslf.usermodel.SlideShow;
 import org.apache.poi.poifs.filesystem.*;
+import org.apache.poi.POIDataSamples;
+
+import java.io.ByteArrayOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.FileNotFoundException;
 
 /**
  * Tests that HSLFSlideShow writes the powerpoint bit of data back out
@@ -41,21 +45,16 @@ public final class TestReWrite extends TestCase {
 	private POIFSFileSystem pfsC;
 
     public void setUp() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
 
-		String filenameA = dirname + "/basic_test_ppt_file.ppt";
-		FileInputStream fisA = new FileInputStream(filenameA);
-		pfsA = new POIFSFileSystem(fisA);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+        
+		pfsA = new POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		hssA = new HSLFSlideShow(pfsA);
 
-		String filenameB = dirname + "/ParagraphStylesShorterThanCharStyles.ppt";
-		FileInputStream fisB = new FileInputStream(filenameB);
-		pfsB = new POIFSFileSystem(fisB);
+        pfsB = new POIFSFileSystem(slTests.openResourceAsStream("ParagraphStylesShorterThanCharStyles.ppt"));
 		hssB = new HSLFSlideShow(pfsB);
 
-		String filenameC = dirname + "/WithMacros.ppt";
-		FileInputStream fisC = new FileInputStream(filenameC);
-		pfsC = new POIFSFileSystem(fisC);
+        pfsC = new POIFSFileSystem(slTests.openResourceAsStream("WithMacros.ppt"));
 		hssC = new HSLFSlideShow(pfsC);
     }
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java b/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
index 7467021544..4590e551ce 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
@@ -23,6 +23,7 @@ import java.io.*;
 import java.util.*;
 import org.apache.poi.hslf.record.*;
 import org.apache.poi.poifs.filesystem.*;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that HSLFSlideShow writes the powerpoint bit of data back out
@@ -37,10 +38,8 @@ public final class TestReWriteSanity extends TestCase {
 	private POIFSFileSystem pfs;
 
     public TestReWriteSanity() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		FileInputStream fis = new FileInputStream(filename);
-		pfs = new POIFSFileSystem(fis);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		pfs = new POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss = new HSLFSlideShow(pfs);
     }
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java b/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java
index 16e0c2785c..5d509b6203 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/TestRecordCounts.java
@@ -20,6 +20,7 @@ package org.apache.poi.hslf;
 
 import junit.framework.TestCase;
 import org.apache.poi.hslf.record.*;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that HSLFSlideShow returns the right numbers of key records when
@@ -32,9 +33,8 @@ public final class TestRecordCounts extends TestCase {
 	private HSLFSlideShow ss;
 
 	public TestRecordCounts() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		ss = new HSLFSlideShow(filename);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		ss = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 	}
 
 	public void testSheetsCount() {
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
index fdcc45e0b9..8b236b31ee 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestCruddyExtractor.java
@@ -21,6 +21,8 @@ package org.apache.poi.hslf.extractor;
 import junit.framework.TestCase;
 import java.util.Vector;
 
+import org.apache.poi.POIDataSamples;
+
 /**
  * Tests that the QuickButCruddyTextExtractor works correctly
  *
@@ -56,9 +58,8 @@ public final class TestCruddyExtractor extends TestCase {
 	};
 
     public TestCruddyExtractor() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		te = new QuickButCruddyTextExtractor(filename);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		te = new QuickButCruddyTextExtractor(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
     }
 
     public void testReadAsVector() {
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
index 769638bf02..66316be7df 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
@@ -28,6 +28,7 @@ import org.apache.poi.poifs.filesystem.DirectoryNode;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.POIDataSamples;
 
 import junit.framework.TestCase;
 
@@ -41,19 +42,15 @@ public final class TestExtractor extends TestCase {
 	private PowerPointExtractor ppe;
 	/** Extractor primed on the 1 page but text-box'd test data */
 	private PowerPointExtractor ppe2;
-	/** Where to go looking for our test files */
-	private String dirname;
 	/** Where our embeded files live */
-	private String pdirname;
+	//private String pdirname;
+    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+    //private String pdirname;
 
     protected void setUp() throws Exception {
-		dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		ppe = new PowerPointExtractor(filename);
-		String filename2 = dirname + "/with_textbox.ppt";
-		ppe2 = new PowerPointExtractor(filename2);
-		
-		pdirname = System.getProperty("POIFS.testdata.path");
+
+		ppe = new PowerPointExtractor(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
+		ppe2 = new PowerPointExtractor(slTests.openResourceAsStream("with_textbox.ppt"));
     }
 
     public void testReadSheetText() {
@@ -114,8 +111,7 @@ public final class TestExtractor extends TestCase {
 	 * @throws Exception
 	 */
 	public void testMissingCoreRecords() throws Exception {
-		String filename = dirname + "/missing_core_records.ppt";
-		ppe = new PowerPointExtractor(filename);
+		ppe = new PowerPointExtractor(slTests.openResourceAsStream("missing_core_records.ppt"));
 		
 		String text = ppe.getText(true, false);
 		String nText = ppe.getNotes();
@@ -141,72 +137,67 @@ public final class TestExtractor extends TestCase {
     }
     
     public void testExtractFromEmbeded() throws Exception {
-    	String filename3 = pdirname + "/excel_with_embeded.xls";
-    	POIFSFileSystem fs = new POIFSFileSystem(
-    			new FileInputStream(filename3)
-    	);
-    	HSLFSlideShow ss;
-    	
-    	DirectoryNode dirA = (DirectoryNode)
-    		fs.getRoot().getEntry("MBD0000A3B6");
-		DirectoryNode dirB = (DirectoryNode)
-			fs.getRoot().getEntry("MBD0000A3B3");
-		
-		assertNotNull(dirA.getEntry("PowerPoint Document"));
-		assertNotNull(dirB.getEntry("PowerPoint Document"));
-    	
-		// Check the first file
-    	ss = new HSLFSlideShow(dirA, fs);
-		ppe = new PowerPointExtractor(ss);
-		assertEquals("Sample PowerPoint file\nThis is the 1st file\nNot much too it\n",
-				ppe.getText(true, false)
-		);
+         POIFSFileSystem fs = new POIFSFileSystem(
+             POIDataSamples.getSpreadSheetInstance().openResourceAsStream("excel_with_embeded.xls")
+         );
+         HSLFSlideShow ss;
 
-		// And the second
-    	ss = new HSLFSlideShow(dirB, fs);
-		ppe = new PowerPointExtractor(ss);
-		assertEquals("Sample PowerPoint file\nThis is the 2nd file\nNot much too it either\n",
-				ppe.getText(true, false)
-		);
-    }
+         DirectoryNode dirA = (DirectoryNode)
+             fs.getRoot().getEntry("MBD0000A3B6");
+         DirectoryNode dirB = (DirectoryNode)
+             fs.getRoot().getEntry("MBD0000A3B3");
 
-    /**
-     * A powerpoint file with embeded powerpoint files
-     */
-    public void testExtractFromOwnEmbeded() throws Exception {
-    	String path = pdirname + "/ppt_with_embeded.ppt";
-		ppe = new PowerPointExtractor(path);
-        List<OLEShape> shapes = ppe.getOLEShapes();
-        assertEquals("Expected 6 ole shapes in " + path, 6, shapes.size());
-        int num_ppt = 0, num_doc = 0, num_xls = 0;
-        for(OLEShape ole : shapes) {
-            String name = ole.getInstanceName();
-            InputStream data = ole.getObjectData().getData();
-            if ("Worksheet".equals(name)) {
-                HSSFWorkbook wb = new HSSFWorkbook(data);
-                num_xls++;
-            } else if ("Document".equals(name)) {
-                HWPFDocument doc = new HWPFDocument(data);
-                num_doc++;
-            } else if ("Presentation".equals(name)) {
-                num_ppt++;
-                SlideShow ppt = new SlideShow(data);
-            }
-        }
-        assertEquals("Expected 2 embedded Word Documents", 2, num_doc);
-        assertEquals("Expected 2 embedded Excel Spreadsheets", 2, num_xls);
-        assertEquals("Expected 2 embedded PowerPoint Presentations", 2, num_ppt);
-    }
+         assertNotNull(dirA.getEntry("PowerPoint Document"));
+         assertNotNull(dirB.getEntry("PowerPoint Document"));
+
+         // Check the first file
+         ss = new HSLFSlideShow(dirA, fs);
+         ppe = new PowerPointExtractor(ss);
+         assertEquals("Sample PowerPoint file\nThis is the 1st file\nNot much too it\n",
+                 ppe.getText(true, false)
+         );
+
+         // And the second
+         ss = new HSLFSlideShow(dirB, fs);
+         ppe = new PowerPointExtractor(ss);
+         assertEquals("Sample PowerPoint file\nThis is the 2nd file\nNot much too it either\n",
+                 ppe.getText(true, false)
+         );
+     }
+
+     /**
+      * A powerpoint file with embeded powerpoint files
+      */
+     public void testExtractFromOwnEmbeded() throws Exception {
+         String path = "ppt_with_embeded.ppt";
+         ppe = new PowerPointExtractor(POIDataSamples.getSlideShowInstance().openResourceAsStream(path));
+         List<OLEShape> shapes = ppe.getOLEShapes();
+         assertEquals("Expected 6 ole shapes in " + path, 6, shapes.size());
+         int num_ppt = 0, num_doc = 0, num_xls = 0;
+         for(OLEShape ole : shapes) {
+             String name = ole.getInstanceName();
+             InputStream data = ole.getObjectData().getData();
+             if ("Worksheet".equals(name)) {
+                 HSSFWorkbook wb = new HSSFWorkbook(data);
+                 num_xls++;
+             } else if ("Document".equals(name)) {
+                 HWPFDocument doc = new HWPFDocument(data);
+                 num_doc++;
+             } else if ("Presentation".equals(name)) {
+                 num_ppt++;
+                 SlideShow ppt = new SlideShow(data);
+             }
+         }
+         assertEquals("Expected 2 embedded Word Documents", 2, num_doc);
+         assertEquals("Expected 2 embedded Excel Spreadsheets", 2, num_xls);
+         assertEquals("Expected 2 embedded PowerPoint Presentations", 2, num_ppt);
+     }
     
     /**
      * From bug #45543
      */
     public void testWithComments() throws Exception {
-		String filename;
-		
-		// New file
-		filename = dirname + "/WithComments.ppt";
-		ppe = new PowerPointExtractor(filename);
+		ppe = new PowerPointExtractor(slTests.openResourceAsStream("WithComments.ppt"));
 
 		String text = ppe.getText();
 		assertFalse("Comments not in by default", contains(text, "This is a test comment"));
@@ -218,8 +209,7 @@ public final class TestExtractor extends TestCase {
 
 		
 		// And another file
-		filename = dirname + "/45543.ppt";
-		ppe = new PowerPointExtractor(filename);
+		ppe = new PowerPointExtractor(slTests.openResourceAsStream("45543.ppt"));
 
         text = ppe.getText();
 		assertFalse("Comments not in by default", contains(text, "testdoc"));
@@ -234,11 +224,10 @@ public final class TestExtractor extends TestCase {
      * From bug #45537
      */
     public void testHeaderFooter() throws Exception {
-		String filename, text;
-		
+		String  text;
+
 		// With a header on the notes
-		filename = dirname + "/45537_Header.ppt";
-		HSLFSlideShow hslf = new HSLFSlideShow(new FileInputStream(filename));
+		HSLFSlideShow hslf = new HSLFSlideShow(slTests.openResourceAsStream("45537_Header.ppt"));
 		SlideShow ss = new SlideShow(hslf);
 		assertNotNull(ss.getNotesHeadersFooters());
 		assertEquals("testdoc test phrase", ss.getNotesHeadersFooters().getHeaderText());
@@ -256,13 +245,12 @@ public final class TestExtractor extends TestCase {
 
         
 		// And with a footer, also on notes
-		filename = dirname + "/45537_Footer.ppt";
-		hslf = new HSLFSlideShow(new FileInputStream(filename));
+		hslf = new HSLFSlideShow(slTests.openResourceAsStream("45537_Footer.ppt"));
 		ss = new SlideShow(hslf);
 		assertNotNull(ss.getNotesHeadersFooters());
 		assertEquals("testdoc test phrase", ss.getNotesHeadersFooters().getFooterText());
 		
-		ppe = new PowerPointExtractor(filename);
+		ppe = new PowerPointExtractor(slTests.openResourceAsStream("45537_Footer.ppt"));
 
 		text = ppe.getText();
 		assertFalse("Unable to find expected word in text\n" + text, contains(text, "testdoc"));
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java
index e1ac1914f6..69e7a6b37f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestBackground.java
@@ -24,6 +24,7 @@ import java.awt.*;
 
 import org.apache.poi.hslf.usermodel.SlideShow;
 import org.apache.poi.hslf.HSLFSlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test <code>Fill</code> object.
@@ -31,6 +32,7 @@ import org.apache.poi.hslf.HSLFSlideShow;
  * @author Yegor Kozlov
  */
 public final class TestBackground extends TestCase {
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     /**
      * Default background for slide, shape and slide master.
@@ -52,7 +54,7 @@ public final class TestBackground extends TestCase {
      * Read fill information from an reference ppt file
      */
     public void testReadBackground() throws Exception {
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(System.getProperty("HSLF.testdata.path") + "/backgrounds.ppt"));
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("backgrounds.ppt"));
         Fill fill;
         Shape shape;
 
@@ -93,7 +95,7 @@ public final class TestBackground extends TestCase {
         slide = ppt.createSlide();
         slide.setFollowMasterBackground(false);
         fill = slide.getBackground().getFill();
-        idx = ppt.addPicture(new File(System.getProperty("HSLF.testdata.path") + "/tomcat.png"), Picture.PNG);
+        idx = ppt.addPicture(_slTests.readFile("tomcat.png"), Picture.PNG);
         fill.setFillType(Fill.FILL_PICTURE);
         fill.setPictureData(idx);
 
@@ -107,7 +109,7 @@ public final class TestBackground extends TestCase {
         slide = ppt.createSlide();
         slide.setFollowMasterBackground(false);
         fill = slide.getBackground().getFill();
-        idx = ppt.addPicture(new File(System.getProperty("HSLF.testdata.path") + "/tomcat.png"), Picture.PNG);
+        idx = ppt.addPicture(_slTests.readFile("tomcat.png"), Picture.PNG);
         fill.setFillType(Fill.FILL_PATTERN);
         fill.setPictureData(idx);
         fill.setBackgroundColor(Color.green);
@@ -123,7 +125,7 @@ public final class TestBackground extends TestCase {
         slide = ppt.createSlide();
         slide.setFollowMasterBackground(false);
         fill = slide.getBackground().getFill();
-        idx = ppt.addPicture(new File(System.getProperty("HSLF.testdata.path") + "/tomcat.png"), Picture.PNG);
+        idx = ppt.addPicture(_slTests.readFile("tomcat.png"), Picture.PNG);
         fill.setFillType(Fill.FILL_TEXTURE);
         fill.setPictureData(idx);
 
@@ -131,7 +133,7 @@ public final class TestBackground extends TestCase {
         shape.setAnchor(new java.awt.Rectangle(100, 100, 200, 200));
         fill = shape.getFill();
         fill.setFillType(Fill.FILL_PICTURE);
-        idx = ppt.addPicture(new File(System.getProperty("HSLF.testdata.path") + "/clock.jpg"), Picture.JPEG);
+        idx = ppt.addPicture(_slTests.readFile("clock.jpg"), Picture.JPEG);
         fill.setPictureData(idx);
         slide.addShape(shape);
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
index cf94e04539..1e86b8c3af 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHeadersFooters.java
@@ -19,6 +19,7 @@ package org.apache.poi.hslf.model;
 
 import java.io.*;
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 import junit.framework.TestCase;
 
@@ -28,14 +29,11 @@ import junit.framework.TestCase;
 public final class TestHeadersFooters extends TestCase
 {
 
-    public static final String cwd = System.getProperty("HSLF.testdata.path");
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     public void testRead() throws Exception
     {
-        File file = new File(cwd, "headers_footers.ppt");
-        FileInputStream is = new FileInputStream(file);
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("headers_footers.ppt"));
 
         HeadersFooters slideHdd = ppt.getSlideHeadersFooters();
         assertTrue(slideHdd.isFooterVisible());
@@ -79,10 +77,7 @@ public final class TestHeadersFooters extends TestCase
      */
     public void testReadNoHeadersFooters() throws Exception
     {
-        File file = new File(cwd, "basic_test_ppt_file.ppt");
-        FileInputStream is = new FileInputStream(file);
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 
         HeadersFooters slideHdd = ppt.getSlideHeadersFooters();
         assertFalse(slideHdd.isFooterVisible());
@@ -119,10 +114,7 @@ public final class TestHeadersFooters extends TestCase
      */
     public void testRead2007() throws Exception
     {
-        File file = new File(cwd, "headers_footers_2007.ppt");
-        FileInputStream is = new FileInputStream(file);
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("headers_footers_2007.ppt"));
 
         HeadersFooters slideHdd = ppt.getSlideHeadersFooters();
         assertTrue(slideHdd.isFooterVisible());
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
index 48de8804e9..6f9f9eb8b4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestHyperlink.java
@@ -19,10 +19,8 @@ package org.apache.poi.hslf.model;
 
 import junit.framework.TestCase;
 
-import java.io.FileInputStream;
-import java.io.File;
-
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test Hyperlink.
@@ -30,12 +28,10 @@ import org.apache.poi.hslf.usermodel.SlideShow;
  * @author Yegor Kozlov
  */
 public final class TestHyperlink extends TestCase {
-    protected String cwd = System.getProperty("HSLF.testdata.path");
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     public void testTextRunHyperlinks() throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "WithLinks.ppt"));
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("WithLinks.ppt"));
 
         TextRun[] run;
         Slide slide;
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
index 8d2f704561..9460642bb4 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
@@ -20,11 +20,11 @@ package org.apache.poi.hslf.model;
 import java.awt.geom.Rectangle2D;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 
 import junit.framework.TestCase;
 
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test <code>MovieShape</code> object.
@@ -33,16 +33,16 @@ import org.apache.poi.hslf.usermodel.SlideShow;
  */
 public final class TestMovieShape extends TestCase {
 
-    protected String cwd = System.getProperty("HSLF.testdata.path");
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     public void testCreate() throws Exception {
         SlideShow ppt = new SlideShow();
 
         Slide slide = ppt.createSlide();
 
-        String path = cwd + "/test-movie.mpg";
+        String path = "/test-movie.mpg";
         int movieIdx = ppt.addMovie(path, MovieShape.MOVIE_MPEG);
-        int thumbnailIdx = ppt.addPicture(new File(cwd, "tomcat.png"), Picture.PNG);
+        int thumbnailIdx = ppt.addPicture(_slTests.readFile("tomcat.png"), Picture.PNG);
 
         MovieShape shape = new MovieShape(movieIdx, thumbnailIdx);
         shape.setAnchor(new Rectangle2D.Float(300,225,120,90));
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
index e8fae8a37e..28445210fb 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
@@ -17,9 +17,6 @@
 
 package org.apache.poi.hslf.model;
 
-import java.io.File;
-import java.io.FileInputStream;
-
 import junit.framework.TestCase;
 
 import org.apache.poi.hslf.HSLFSlideShow;
@@ -29,17 +26,17 @@ import org.apache.poi.hslf.usermodel.SlideShow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hwpf.HWPFDocument;
+import org.apache.poi.POIDataSamples;
 
 public final class TestOleEmbedding extends TestCase {
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
     /**
      * Tests support for OLE objects.
      *
      * @throws Exception if an error occurs.
      */
     public void testOleEmbedding2003() throws Exception {
-        String dirname = System.getProperty("HSLF.testdata.path");
-        File file = new File(dirname, "ole2-embedding-2003.ppt");
-        HSLFSlideShow slideShow = new HSLFSlideShow(new FileInputStream(file));
+        HSLFSlideShow slideShow = new HSLFSlideShow(_slTests.openResourceAsStream("ole2-embedding-2003.ppt"));
         // Placeholder EMFs for clients that don't support the OLE components.
         PictureData[] pictures = slideShow.getPictures();
         assertEquals("Should be two pictures", 2, pictures.length);
@@ -54,11 +51,7 @@ public final class TestOleEmbedding extends TestCase {
     }
 
     public void testOLEShape() throws Exception {
-        String dirname = System.getProperty("HSLF.testdata.path");
-        File file = new File(dirname, "ole2-embedding-2003.ppt");
-        FileInputStream is = new FileInputStream(file);
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("ole2-embedding-2003.ppt"));
 
         Slide slide = ppt.getSlides()[0];
         Shape[] sh = slide.getShapes();
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java
index 521230077e..b89383c302 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java
@@ -20,6 +20,7 @@ package org.apache.poi.hslf.model;
 import junit.framework.TestCase;
 import org.apache.poi.hslf.usermodel.SlideShow;
 import org.apache.poi.hslf.HSLFSlideShow;
+import org.apache.poi.POIDataSamples;
 
 import java.awt.*;
 import java.awt.Rectangle;
@@ -32,12 +33,11 @@ import java.io.ByteArrayInputStream;
  * @author Yegor Kozlov
  */
 public final class TestPPGraphics2D extends TestCase {
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
     private SlideShow ppt;
 
     protected void setUp() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/empty.ppt";
-		ppt = new SlideShow(new HSLFSlideShow(filename));
+		ppt = new SlideShow(_slTests.openResourceAsStream("empty.ppt"));
     }
 
     public void testGraphics() throws Exception {
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java
index 3be128921b..871893210a 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java
@@ -20,13 +20,13 @@ package org.apache.poi.hslf.model;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
-import java.io.File;
 
 import junit.framework.TestCase;
 
 import org.apache.poi.ddf.EscherBSERecord;
 import org.apache.poi.hslf.usermodel.PictureData;
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test Picture shape.
@@ -34,6 +34,7 @@ import org.apache.poi.hslf.usermodel.SlideShow;
  * @author Yegor Kozlov
  */
 public final class TestPicture extends TestCase {
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     /**
      * Test that the reference count of a blip is incremented every time the picture is inserted.
@@ -41,14 +42,13 @@ public final class TestPicture extends TestCase {
      *
      */
     public void testMultiplePictures() throws Exception {
-        String cwd = System.getProperty("HSLF.testdata.path");
         SlideShow ppt = new SlideShow();
 
         Slide s = ppt.createSlide();
         Slide s2 = ppt.createSlide();
         Slide s3 = ppt.createSlide();
 
-        int idx = ppt.addPicture(new File(cwd, "clock.jpg"), Picture.JPEG);
+        int idx = ppt.addPicture(_slTests.readFile("clock.jpg"), Picture.JPEG);
         Picture pict = new Picture(idx);
         Picture pict2 = new Picture(idx);
         Picture pict3 = new Picture(idx);
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java
index 572dbd035c..23b798fd6f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java
@@ -36,10 +36,6 @@ public final class TestSetBoldItalic extends TestCase {
      * and set some of the style attributes
      */
     public void testTextBoxWrite() throws Exception {
-        //String dirname = System.getProperty("HSLF.testdata.path");
-        //String filename = dirname + "/with_textbox.ppt";
-        //new SlideShow(new HSLFSlideShow(filename));
-
         SlideShow ppt = new SlideShow();
         Slide sl = ppt.createSlide();
         RichTextRun rt;
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
index 292b7fd63d..0d016e39d3 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
@@ -22,12 +22,12 @@ import org.apache.poi.hslf.usermodel.SlideShow;
 import org.apache.poi.hslf.usermodel.RichTextRun;
 import org.apache.poi.hslf.HSLFSlideShow;
 import org.apache.poi.ddf.*;
+import org.apache.poi.POIDataSamples;
 
 import java.awt.*;
 import java.awt.Rectangle;
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
-import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 
@@ -37,16 +37,15 @@ import java.util.ArrayList;
  * @author Yegor Kozlov
  */
 public final class TestShapes extends TestCase {
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
+
     private SlideShow ppt;
     private SlideShow pptB;
 
     protected void setUp() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/empty.ppt";
-		ppt = new SlideShow(new HSLFSlideShow(filename));
+		ppt = new SlideShow(_slTests.openResourceAsStream("empty.ppt"));
 
-		String filenameB = dirname + "/empty_textbox.ppt";
-		pptB = new SlideShow(new HSLFSlideShow(filenameB));
+		pptB = new SlideShow(_slTests.openResourceAsStream("empty_textbox.ppt"));
     }
 
     public void testGraphics() throws Exception {
@@ -94,9 +93,7 @@ public final class TestShapes extends TestCase {
      * @throws Exception
      */
     public void testTextBoxRead() throws Exception {
-        String dirname = System.getProperty("HSLF.testdata.path");
-        String filename = dirname + "/with_textbox.ppt";
-        ppt = new SlideShow(new HSLFSlideShow(filename));
+        ppt = new SlideShow(_slTests.openResourceAsStream("with_textbox.ppt"));
         Slide sl = ppt.getSlides()[0];
         Shape[] sh = sl.getShapes();
         for (int i = 0; i < sh.length; i++) {
@@ -198,17 +195,16 @@ public final class TestShapes extends TestCase {
      * it must be the same as returned by Slide.getTextRuns().
      */
     public void testTextBoxSet() throws Exception {
-        textBoxSet("/with_textbox.ppt");
-        textBoxSet("/basic_test_ppt_file.ppt");
-        textBoxSet("/next_test_ppt_file.ppt");
-        textBoxSet("/Single_Coloured_Page.ppt");
-        textBoxSet("/Single_Coloured_Page_With_Fonts_and_Alignments.ppt");
-        textBoxSet("/incorrect_slide_order.ppt");
+        textBoxSet("with_textbox.ppt");
+        textBoxSet("basic_test_ppt_file.ppt");
+        textBoxSet("next_test_ppt_file.ppt");
+        textBoxSet("Single_Coloured_Page.ppt");
+        textBoxSet("Single_Coloured_Page_With_Fonts_and_Alignments.ppt");
+        textBoxSet("incorrect_slide_order.ppt");
     }
 
     private void textBoxSet(String filename) throws Exception {
-        String dirname = System.getProperty("HSLF.testdata.path");
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(dirname + filename));
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream(filename));
         Slide[] sl = ppt.getSlides();
         for (int k = 0; k < sl.length; k++) {
             ArrayList lst1 = new ArrayList();
@@ -234,7 +230,6 @@ public final class TestShapes extends TestCase {
      * Test adding shapes to <code>ShapeGroup</code>
      */
     public void testShapeGroup() throws Exception {
-        String cwd = System.getProperty("HSLF.testdata.path");
         SlideShow ppt = new SlideShow();
 
         Slide slide = ppt.createSlide();
@@ -245,8 +240,7 @@ public final class TestShapes extends TestCase {
         group.setAnchor(new Rectangle(0, 0, (int)pgsize.getWidth(), (int)pgsize.getHeight()));
         slide.addShape(group);
 
-        File img = new File(cwd, "clock.jpg");
-        int idx = ppt.addPicture(img, Picture.JPEG);
+        int idx = ppt.addPicture(_slTests.readFile("clock.jpg"), Picture.JPEG);
         Picture pict = new Picture(idx, group);
         pict.setAnchor(new Rectangle(0, 0, 200, 200));
         group.addShape(pict);
@@ -287,8 +281,8 @@ public final class TestShapes extends TestCase {
      * Test functionality of Sheet.removeShape(Shape shape)
      */
     public void testRemoveShapes() throws IOException {
-        String file = System.getProperty("HSLF.testdata.path")+ "/with_textbox.ppt";
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(file));
+        String file = "with_textbox.ppt";
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream(file));
         Slide sl = ppt.getSlides()[0];
         Shape[] sh = sl.getShapes();
         assertEquals("expected four shaped in " + file, 4, sh.length);
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java
index 667478b043..4bed9ee186 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java
@@ -20,14 +20,11 @@ package org.apache.poi.hslf.model;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
-import java.io.FileInputStream;
-import java.io.File;
-
-import org.apache.poi.hslf.HSLFSlideShow;
 import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
 import org.apache.poi.hslf.record.ColorSchemeAtom;
 import org.apache.poi.hslf.record.PPDrawing;
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test common functionality of the <code>Sheet</code> object.
@@ -36,23 +33,16 @@ import org.apache.poi.hslf.usermodel.SlideShow;
  * @author Yegor Kozlov
  */
 public final class TestSheet extends TestCase {
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     /**
      * For each ppt in the test directory check that all sheets are properly initialized
      */
     public void testSheet() throws Exception {
-        File home = new File(System.getProperty("HSLF.testdata.path"));
-        File[] files = home.listFiles();
-        for (int i = 0; i < files.length; i++) {
-            if(!files[i].getName().endsWith(".ppt")) continue;
-            if(files[i].getName().endsWith("PPT95.ppt")) continue;
-
+        String[] tests = {"SampleShow.ppt", "backgrounds.ppt", "text_shapes.ppt", "pictures.ppt"};
+        for (String file : tests) {
             try {
-                FileInputStream is = new FileInputStream(files[i]);
-                HSLFSlideShow hslf = new HSLFSlideShow(is);
-                is.close();
-
-                SlideShow ppt = new SlideShow(hslf);
+                SlideShow ppt = new SlideShow(_slTests.openResourceAsStream(file));
                 doSlideShow(ppt);
             } catch (EncryptedPowerPointFileException e){
                 ; //skip encrypted ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
index e39ca5a4d1..71c95f87b7 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
@@ -23,6 +23,7 @@ import junit.framework.TestCase;
 import org.apache.poi.hslf.HSLFSlideShow;
 import org.apache.poi.hslf.record.SlideAtom;
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that changing a slide's idea of what notes sheet is its works right
@@ -34,9 +35,8 @@ public final class TestSlideChangeNotes extends TestCase {
 	private SlideShow ss;
 
 	public TestSlideChangeNotes() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		HSLFSlideShow hss = new HSLFSlideShow(filename);
+        POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
+		HSLFSlideShow hss = new HSLFSlideShow(_slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss = new SlideShow(hss);
 	}
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java
index 20bdaa8a57..45c3c0c2bc 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java
@@ -28,6 +28,7 @@ import org.apache.poi.hslf.record.Environment;
 import org.apache.poi.hslf.record.TextHeaderAtom;
 import org.apache.poi.hslf.usermodel.RichTextRun;
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests for SlideMaster
@@ -35,18 +36,14 @@ import org.apache.poi.hslf.usermodel.SlideShow;
  * @author Yegor Kozlov
  */
 public final class TestSlideMaster extends TestCase{
-    String home;
-
-    public void setUp() {
-        home = System.getProperty("HSLF.testdata.path");
-    }
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     /**
      * The reference ppt has two masters.
      * Check we can read their attributes.
      */
     public void testSlideMaster() throws Exception {
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(home + "/slide_master.ppt"));
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
 
         Environment env = ppt.getDocumentRecord().getEnvironment();
 
@@ -86,7 +83,7 @@ public final class TestSlideMaster extends TestCase{
      * Test we can read default text attributes for a title master sheet
      */
     public void testTitleMasterTextAttributes() throws Exception {
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(home + "/slide_master.ppt"));
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
         TitleMaster[] master = ppt.getTitleMasters();
         assertEquals(1, master.length);
 
@@ -107,7 +104,7 @@ public final class TestSlideMaster extends TestCase{
      * Slide 3 has title layout and follows the TitleMaster. Verify that.
      */
     public void testTitleMaster() throws Exception {
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(home + "/slide_master.ppt"));
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
         Slide slide = ppt.getSlides()[2];
         MasterSheet masterSheet = slide.getMasterSheet();
         assertTrue(masterSheet instanceof TitleMaster);
@@ -136,7 +133,7 @@ public final class TestSlideMaster extends TestCase{
      * If a style attribute is not set ensure it is read from the master
      */
     public void testMasterAttributes() throws Exception {
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(home + "/slide_master.ppt"));
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
         Slide[] slide = ppt.getSlides();
         assertEquals(3, slide.length);
         TextRun[] trun;
@@ -185,7 +182,7 @@ public final class TestSlideMaster extends TestCase{
      * Check we can dynamically assign a slide master to a slide.
      */
     public void testChangeSlideMaster() throws Exception {
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(home + "/slide_master.ppt"));
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
         SlideMaster[] master = ppt.getSlidesMasters();
         Slide[] slide = ppt.getSlides();
         int sheetNo;
@@ -219,7 +216,7 @@ public final class TestSlideMaster extends TestCase{
      * (typical for the "bullted body" placeholder)
      */
     public void testIndentation() throws Exception {
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(home + "/slide_master.ppt"));
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
         Slide slide = ppt.getSlides()[0];
         TextRun[] trun;
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
index f60cfed57d..11889f4409 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
@@ -20,6 +20,7 @@ package org.apache.poi.hslf.model;
 import junit.framework.TestCase;
 import org.apache.poi.hslf.HSLFSlideShow;
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
@@ -137,8 +138,8 @@ public final class TestSlides extends TestCase {
      * Add slides to ppt which already has two slides
      */
     public void testAddSlides2to3() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(dirname + "/basic_test_ppt_file.ppt"));
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+        SlideShow ppt = new SlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 
         assertTrue(ppt.getSlides().length == 2);
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java
index 770a44803e..be399fefa6 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java
@@ -22,13 +22,13 @@ import java.io.IOException;
 
 import junit.framework.TestCase;
 
-import org.apache.poi.hslf.HSLFSlideShow;
 import org.apache.poi.hslf.model.textproperties.TextPropCollection;
 import org.apache.poi.hslf.record.TextBytesAtom;
 import org.apache.poi.hslf.record.TextCharsAtom;
 import org.apache.poi.hslf.record.TextHeaderAtom;
 import org.apache.poi.hslf.usermodel.RichTextRun;
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests for TextRuns
@@ -36,32 +36,19 @@ import org.apache.poi.hslf.usermodel.SlideShow;
  * @author Nick Burch (nick at torchbox dot com)
  */
 public final class TestTextRun extends TestCase {
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
+
 	// SlideShow primed on the test data
 	private SlideShow ss;
 	private SlideShow ssRich;
 
-	// TODO - use this or similar through rest of hslf tests
-	private static SlideShow openSampleSlideShow(String name) {
-		String dirname = System.getProperty("HSLF.testdata.path");
-
-		// Basic (non rich) test file
-		String filename = dirname + "/" + name;
-		HSLFSlideShow x;
-		try {
-			x = new HSLFSlideShow(filename);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-		return new SlideShow(x);
-	}
-
-	protected void setUp() {
+	protected void setUp() throws IOException {
 
 		// Basic (non rich) test file
-		ss = openSampleSlideShow("basic_test_ppt_file.ppt");
+		ss = new SlideShow(_slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 
 		// Rich test file
-		ssRich = openSampleSlideShow("Single_Coloured_Page.ppt");
+		ssRich = new SlideShow(_slTests.openResourceAsStream("Single_Coloured_Page.ppt"));
 	}
 
 	/**
@@ -429,10 +416,10 @@ public final class TestTextRun extends TestCase {
 	 * of the wrong list of potential paragraph properties defined in StyleTextPropAtom.
 	 *
 	 */
-	public void testBug41015() {
+	public void testBug41015() throws IOException {
 		RichTextRun[] rt;
 
-		SlideShow ppt = openSampleSlideShow("bug-41015.ppt");
+		SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("bug-41015.ppt"));
 		Slide sl = ppt.getSlides()[0];
 		TextRun[] txt = sl.getTextRuns();
 		assertEquals(2, txt.length);
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java
index 2a2a10bb45..db55a2c052 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java
@@ -25,6 +25,7 @@ import org.apache.poi.hslf.HSLFSlideShow;
 import org.apache.poi.hslf.usermodel.RichTextRun;
 import org.apache.poi.hslf.usermodel.SlideShow;
 import org.apache.poi.poifs.filesystem.*;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that if we load something up, get a TextRun, set the text
@@ -45,10 +46,9 @@ public final class TestTextRunReWrite extends TestCase {
 	 * Load up a test PPT file with rich data
 	 */
     public void setUp() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/Single_Coloured_Page_With_Fonts_and_Alignments.ppt";
-		FileInputStream fis = new FileInputStream(filename);
-		pfs = new POIFSFileSystem(fis);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		String filename = "Single_Coloured_Page_With_Fonts_and_Alignments.ppt";
+		pfs = new POIFSFileSystem(slTests.openResourceAsStream(filename));
 		hss = new HSLFSlideShow(pfs);
 		ss = new SlideShow(hss);
     }
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java
index 07ed6d2da6..7285f5120a 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
 
 import org.apache.poi.hslf.usermodel.SlideShow;
 import org.apache.poi.hslf.record.TextHeaderAtom;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Verify behavior of <code>TextShape</code> and its sub-classes
@@ -32,7 +33,7 @@ import org.apache.poi.hslf.record.TextHeaderAtom;
  * @author Yegor Kozlov
  */
 public final class TestTextShape extends TestCase {
-    protected String cwd = System.getProperty("HSLF.testdata.path");
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     public void testCreateAutoShape(){
         TextShape shape = new AutoShape(ShapeTypes.Trapezoid);
@@ -70,9 +71,7 @@ public final class TestTextShape extends TestCase {
      *  - text in auto-shapes
      */
     public void testRead() throws IOException {
-        FileInputStream is = new FileInputStream(new File(cwd, "text_shapes.ppt"));
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("text_shapes.ppt"));
 
         ArrayList lst1 = new ArrayList();
         Slide slide = ppt.getSlides()[0];
@@ -157,9 +156,7 @@ public final class TestTextShape extends TestCase {
     }
 
     public void testMargins() throws IOException {
-        FileInputStream is = new FileInputStream(new File(cwd, "text-margins.ppt"));
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("text-margins.ppt"));
 
         Slide slide = ppt.getSlides()[0];
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java
index 8df159a32d..ed1f19a030 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java
@@ -20,12 +20,12 @@ package org.apache.poi.hslf.record;
 
 import junit.framework.TestCase;
 import java.io.ByteArrayOutputStream;
-import java.io.FileInputStream;
 import java.io.InputStream;
 
 import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
 import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that CurrentUserAtom works properly.
@@ -33,6 +33,7 @@ import org.apache.poi.poifs.filesystem.POIFSFileSystem;
  * @author Nick Burch (nick at torchbox dot com)
  */
 public final class TestCurrentUserAtom extends TestCase {
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 	/** Not encrypted */
 	private String normalFile;
 	/** Encrypted */
@@ -41,14 +42,13 @@ public final class TestCurrentUserAtom extends TestCase {
 	protected void setUp() throws Exception {
 		super.setUp();
 
-		String dirname = System.getProperty("HSLF.testdata.path");
-		normalFile = dirname + "/basic_test_ppt_file.ppt";
-		encFile = dirname + "/Password_Protected-hello.ppt";
+		normalFile = "basic_test_ppt_file.ppt";
+		encFile = "Password_Protected-hello.ppt";
 	}
 
 	public void testReadNormal() throws Exception {
 		POIFSFileSystem fs = new POIFSFileSystem(
-				new FileInputStream(normalFile)
+				_slTests.openResourceAsStream(normalFile)
 		);
 
 		CurrentUserAtom cu = new CurrentUserAtom(fs);
@@ -68,7 +68,7 @@ public final class TestCurrentUserAtom extends TestCase {
 
 	public void testReadEnc() throws Exception {
 		POIFSFileSystem fs = new POIFSFileSystem(
-				new FileInputStream(encFile)
+				_slTests.openResourceAsStream(encFile)
 		);
 
 		try {
@@ -82,7 +82,7 @@ public final class TestCurrentUserAtom extends TestCase {
 	public void testWriteNormal() throws Exception {
 		// Get raw contents from a known file
 		POIFSFileSystem fs = new POIFSFileSystem(
-				new FileInputStream(normalFile)
+				_slTests.openResourceAsStream(normalFile)
 		);
 		DocumentEntry docProps = (DocumentEntry)fs.getRoot().getEntry("Current User");
 		byte[] contents = new byte[docProps.getSize()];
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
index e61273bb50..114a41da8d 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
@@ -18,10 +18,10 @@
 package org.apache.poi.hslf.record;
 
 import junit.framework.TestCase;
-import java.io.*;
 
 import org.apache.poi.hslf.HSLFSlideShow;
 import org.apache.poi.poifs.filesystem.*;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that Document works properly (Also tests Environment while we're at it)
@@ -35,10 +35,8 @@ public final class TestDocument extends TestCase {
 	private POIFSFileSystem pfs;
 
 	public TestDocument() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		FileInputStream fis = new FileInputStream(filename);
-		pfs = new POIFSFileSystem(fis);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		pfs = new POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss = new HSLFSlideShow(pfs);
 	}
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java
index 18ae888ecd..fff9d7286e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java
@@ -19,7 +19,6 @@ package org.apache.poi.hslf.record;
 
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,6 +27,7 @@ import junit.framework.TestCase;
 
 import org.apache.poi.hslf.HSLFSlideShow;
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that ExHyperlink works properly.
@@ -98,8 +98,8 @@ public final class TestExHyperlink extends TestCase {
 	}
 
 	public void testRealFile() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		HSLFSlideShow hss = new HSLFSlideShow(dirname + File.separator + "WithLinks.ppt");
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		HSLFSlideShow hss = new HSLFSlideShow(slTests.openResourceAsStream("WithLinks.ppt"));
 		SlideShow ss = new SlideShow(hss);
 
 		// Get the document
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java
index b2bf2d7065..d3739ec3b8 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java
@@ -18,12 +18,11 @@
 package org.apache.poi.hslf.record;
 
 
-import java.io.File;
-
 import junit.framework.TestCase;
 
 import org.apache.poi.hslf.HSLFSlideShow;
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that ExObjList works properly.
@@ -32,8 +31,8 @@ import org.apache.poi.hslf.usermodel.SlideShow;
  */
 public class TestExObjList extends TestCase {
 	public void testRealFile() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		HSLFSlideShow hss = new HSLFSlideShow(dirname + File.separator + "WithLinks.ppt");
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		HSLFSlideShow hss = new HSLFSlideShow(slTests.openResourceAsStream("WithLinks.ppt"));
 		SlideShow ss = new SlideShow(hss);
 
 		// Get the document
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
index 74684e7e73..8481cbc70f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
@@ -21,6 +21,7 @@ package org.apache.poi.hslf.record;
 import junit.framework.TestCase;
 
 import org.apache.poi.hslf.HSLFSlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that the helper methods on RecordContainer work properly
@@ -147,9 +148,8 @@ public final class TestRecordContainer extends TestCase {
 		super.setUp();
 
 		// Find a real RecordContainer record
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		HSLFSlideShow hss = new HSLFSlideShow(filename);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		HSLFSlideShow hss = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 
 		Record[] r = hss.getRecords();
 		for(int i=0; i<r.length; i++) {
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
index 0884a41a08..9e1668566b 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java
@@ -17,14 +17,13 @@
 
 package org.apache.poi.hslf.record;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.util.Arrays;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
 import org.apache.poi.hslf.usermodel.SlideShow;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests Sound-related records: SoundCollection(2020), Sound(2022) and
@@ -34,10 +33,9 @@ import org.apache.poi.hslf.usermodel.SlideShow;
  */
 public final class TestSound extends TestCase {
 	public void testRealFile() throws Exception {
-		String cwd = System.getProperty("HSLF.testdata.path");
-		FileInputStream is = new FileInputStream(new File(cwd, "sound.ppt"));
-		SlideShow ppt = new SlideShow(is);
-		is.close();
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+
+		SlideShow ppt = new SlideShow(slTests.openResourceAsStream("sound.ppt"));
 
 		// Get the document
 		Document doc = ppt.getDocumentRecord();
@@ -71,13 +69,7 @@ public final class TestSound extends TestCase {
 		assertEquals(".WAV", sound.getSoundType());
 		assertNotNull(sound.getSoundData());
 
-		File f = new File(cwd, "ringin.wav");
-		int length = (int) f.length();
-		byte[] ref_data = new byte[length];
-		is = new FileInputStream(f);
-		is.read(ref_data);
-		is.close();
-
+		byte[] ref_data = slTests.readFile("ringin.wav");
 		assertTrue(Arrays.equals(ref_data, sound.getSoundData()));
 	}
 }
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
index dd1ccd0b4e..46cfb8c4fb 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java
@@ -30,6 +30,7 @@ import org.apache.poi.hslf.record.RecordTypes;
 import org.apache.poi.hslf.record.UserEditAtom;
 import org.apache.poi.hslf.record.Document;
 import org.apache.poi.hslf.model.*;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that SlideShow adds additional sheets properly
@@ -56,14 +57,12 @@ public final class TestAddingSlides extends TestCase {
 		hss_empty = HSLFSlideShow.create();
 		ss_empty = new SlideShow(hss_empty);
 
-		String dirname = System.getProperty("HSLF.testdata.path");
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
 
-		String filename = dirname + "/Single_Coloured_Page.ppt";
-		hss_one = new HSLFSlideShow(filename);
+		hss_one = new HSLFSlideShow(slTests.openResourceAsStream("Single_Coloured_Page.ppt"));
 		ss_one = new SlideShow(hss_one);
 
-		filename = dirname + "/basic_test_ppt_file.ppt";
-		hss_two = new HSLFSlideShow(filename);
+		hss_two = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss_two = new SlideShow(hss_two);
 	}
 
@@ -274,8 +273,8 @@ public final class TestAddingSlides extends TestCase {
 
 
     public void test47261() throws Exception {
-        File src = new File(System.getProperty("HSLF.testdata.path"), "47261.ppt");
-        SlideShow ppt = new SlideShow(new FileInputStream(src));
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+        SlideShow ppt = new SlideShow(slTests.openResourceAsStream("47261.ppt"));
         Slide[] slides = ppt.getSlides();
         Document doc = ppt.getDocumentRecord();
         assertNotNull(doc.getSlideSlideListWithText());
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
index 3ab57adcd3..24af16c35d 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
@@ -17,8 +17,6 @@
 
 package org.apache.poi.hslf.usermodel;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -44,6 +42,7 @@ import org.apache.poi.hslf.model.TextBox;
 import org.apache.poi.hslf.model.TextRun;
 import org.apache.poi.hslf.model.TextShape;
 import org.apache.poi.hslf.model.TitleMaster;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Testcases for bugs entered in bugzilla
@@ -52,15 +51,13 @@ import org.apache.poi.hslf.model.TitleMaster;
  * @author Yegor Kozlov
  */
 public final class TestBugs extends TestCase {
-    protected String cwd = System.getProperty("HSLF.testdata.path");
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
     /**
      * Bug 41384: Array index wrong in record creation
      */
     public void test41384() throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "41384.ppt"));
-        HSLFSlideShow hslf = new HSLFSlideShow(is);
-        is.close();
+        HSLFSlideShow hslf = new HSLFSlideShow(_slTests.openResourceAsStream("41384.ppt"));
 
         SlideShow ppt = new SlideShow(hslf);
         assertTrue("No Exceptions while reading file", true);
@@ -78,9 +75,7 @@ public final class TestBugs extends TestCase {
      * when the RichTextRun comes from a Notes model object
      */
     public void test42474_1() throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "42474-1.ppt"));
-        HSLFSlideShow hslf = new HSLFSlideShow(is);
-        is.close();
+        HSLFSlideShow hslf = new HSLFSlideShow(_slTests.openResourceAsStream("42474-1.ppt"));
 
         SlideShow ppt = new SlideShow(hslf);
         assertTrue("No Exceptions while reading file", true);
@@ -108,9 +103,7 @@ public final class TestBugs extends TestCase {
      * Second fix from Bug 42474: Incorrect matching of notes to slides
      */
     public void test42474_2() throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "42474-2.ppt"));
-        HSLFSlideShow hslf = new HSLFSlideShow(is);
-        is.close();
+        HSLFSlideShow hslf = new HSLFSlideShow(_slTests.openResourceAsStream("42474-2.ppt"));
 
         SlideShow ppt = new SlideShow(hslf);
 
@@ -140,9 +133,7 @@ public final class TestBugs extends TestCase {
      * Bug 42485: All TextBoxes inside ShapeGroups have null TextRuns
      */
     public void test42485 () throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "42485.ppt"));
-        HSLFSlideShow hslf = new HSLFSlideShow(is);
-        is.close();
+        HSLFSlideShow hslf = new HSLFSlideShow(_slTests.openResourceAsStream("42485.ppt"));
 
         SlideShow ppt = new SlideShow(hslf);
         Shape[] shape = ppt.getSlides()[0].getShapes();
@@ -164,9 +155,7 @@ public final class TestBugs extends TestCase {
      * Bug 42484: NullPointerException from ShapeGroup.getAnchor()
      */
     public void test42484 () throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "42485.ppt")); //test file is the same as for bug 42485
-        HSLFSlideShow hslf = new HSLFSlideShow(is);
-        is.close();
+        HSLFSlideShow hslf = new HSLFSlideShow(_slTests.openResourceAsStream("42485.ppt"));
 
         SlideShow ppt = new SlideShow(hslf);
         Shape[] shape = ppt.getSlides()[0].getShapes();
@@ -187,9 +176,7 @@ public final class TestBugs extends TestCase {
      * Bug 41381: Exception from Slide.getMasterSheet() on a seemingly valid PPT file
      */
     public void test41381() throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "alterman_security.ppt"));
-        HSLFSlideShow hslf = new HSLFSlideShow(is);
-        is.close();
+        HSLFSlideShow hslf = new HSLFSlideShow(_slTests.openResourceAsStream("alterman_security.ppt"));
 
         SlideShow ppt = new SlideShow(hslf);
         assertTrue("No Exceptions while reading file", true);
@@ -208,9 +195,7 @@ public final class TestBugs extends TestCase {
      * Bug 42486:  Failure parsing a seemingly valid PPT
      */
     public void test42486 () throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "42486.ppt"));
-        HSLFSlideShow hslf = new HSLFSlideShow(is);
-        is.close();
+        HSLFSlideShow hslf = new HSLFSlideShow(_slTests.openResourceAsStream("42486.ppt"));
 
         SlideShow ppt = new SlideShow(hslf);
         Slide[] slide = ppt.getSlides();
@@ -225,9 +210,7 @@ public final class TestBugs extends TestCase {
      * Bug 42524:  NPE in Shape.getShapeType()
      */
     public void test42524 () throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "42486.ppt")); //test file is the same as for Bug 42486
-        HSLFSlideShow hslf = new HSLFSlideShow(is);
-        is.close();
+        HSLFSlideShow hslf = new HSLFSlideShow(_slTests.openResourceAsStream("42486.ppt"));
 
         SlideShow ppt = new SlideShow(hslf);
         //walk down the tree and see if there were no errors while reading
@@ -254,9 +237,7 @@ public final class TestBugs extends TestCase {
      * Bug 42520:  NPE in Picture.getPictureData()
      */
     public void test42520 () throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "42520.ppt")); //test file is the same as for Bug 42486
-        HSLFSlideShow hslf = new HSLFSlideShow(is);
-        is.close();
+        HSLFSlideShow hslf = new HSLFSlideShow(_slTests.openResourceAsStream("42520.ppt"));
 
         SlideShow ppt = new SlideShow(hslf);
 
@@ -292,9 +273,7 @@ public final class TestBugs extends TestCase {
      * ( also fixed followup: getTextRuns() returns no text )
      */
     public void test38256 () throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "38256.ppt"));
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("38256.ppt"));
 
         assertTrue("No Exceptions while reading file", true);
 
@@ -321,9 +300,7 @@ public final class TestBugs extends TestCase {
      * ( also fixed followup: getTextRuns() returns no text )
      */
     public void test43781 () throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "43781.ppt"));
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("43781.ppt"));
 
         assertTrue("No Exceptions while reading file", true);
 
@@ -354,9 +331,7 @@ public final class TestBugs extends TestCase {
      * Bug 44296: HSLF Not Extracting Slide Background Image
      */
     public void test44296  () throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "44296.ppt"));
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("44296.ppt"));
 
         Slide slide = ppt.getSlides()[0];
 
@@ -373,25 +348,21 @@ public final class TestBugs extends TestCase {
      * Bug 44770: java.lang.RuntimeException: Couldn't instantiate the class for type with id 1036 on class class org.apache.poi.hslf.record.PPDrawing
      */
     public void test44770() throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "44770.ppt"));
         try {
-            new SlideShow(is);
+             new SlideShow(_slTests.openResourceAsStream("44770.ppt"));
         } catch (RuntimeException e) {
             if (e.getMessage().equals("Couldn't instantiate the class for type with id 1036 on class class org.apache.poi.hslf.record.PPDrawing")) {
                 throw new AssertionFailedError("Identified bug 44770");
             }
             throw e;
         }
-        is.close();
     }
 
     /**
      * Bug 41071: Will not extract text from Powerpoint TextBoxes
      */
     public void test41071() throws Exception {
-        FileInputStream is = new FileInputStream(new File(cwd, "41071.ppt"));
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("41071.ppt"));
 
         Slide slide = ppt.getSlides()[0];
         Shape[] sh = slide.getShapes();
@@ -411,13 +382,11 @@ public final class TestBugs extends TestCase {
      */
     public void test41711() throws Exception {
     	// New file is fine
-        FileInputStream is = new FileInputStream(new File(cwd, "SampleShow.ppt"));
-        SlideShow ppt = new SlideShow(is);
+        new SlideShow(_slTests.openResourceAsStream("SampleShow.ppt"));
 
         // PowerPoint 95 gives an old format exception
-        is = new FileInputStream(new File(cwd, "PPT95.ppt"));
         try {
-        	new SlideShow(is);
+        	new SlideShow(_slTests.openResourceAsStream("PPT95.ppt"));
         	fail("OldPowerPointFormatException should've been thrown");
         } catch(OldPowerPointFormatException e) {
         	// Good
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
index 4863c41a54..eb84e7711a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
@@ -21,6 +21,7 @@ package org.apache.poi.hslf.usermodel;
 import junit.framework.TestCase;
 import org.apache.poi.hslf.*;
 import org.apache.poi.hslf.model.*;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that SlideShow returns the right number of Sheets and MetaSheets
@@ -32,9 +33,8 @@ public final class TestCounts extends TestCase {
 	private SlideShow ss;
 
 	public TestCounts() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		HSLFSlideShow hss = new HSLFSlideShow(filename);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		HSLFSlideShow hss = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss = new SlideShow(hss);
 	}
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
index fac33c5e07..ce68b7a2d8 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
@@ -21,6 +21,7 @@ package org.apache.poi.hslf.usermodel;
 import junit.framework.TestCase;
 import org.apache.poi.hslf.*;
 import org.apache.poi.hslf.record.*;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that SlideShow finds the right records as its most recent ones
@@ -34,9 +35,8 @@ public final class TestMostRecentRecords extends TestCase {
 	private SlideShow ss;
 
 	public TestMostRecentRecords() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		hss = new HSLFSlideShow(filename);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		hss = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss = new SlideShow(hss);
 	}
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
index e024c910d2..3def468f9e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
@@ -21,6 +21,7 @@ package org.apache.poi.hslf.usermodel;
 import junit.framework.TestCase;
 import org.apache.poi.hslf.*;
 import org.apache.poi.hslf.model.*;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that SlideShow returns MetaSheets which have the right text in them
@@ -32,9 +33,8 @@ public final class TestNotesText extends TestCase {
 	private SlideShow ss;
 
 	public TestNotesText() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		HSLFSlideShow hss = new HSLFSlideShow(filename);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		HSLFSlideShow hss = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss = new SlideShow(hss);
 	}
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java
index bcd7616d56..df7265be8e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPictures.java
@@ -20,6 +20,7 @@ package org.apache.poi.hslf.usermodel;
 import org.apache.poi.hslf.*;
 import org.apache.poi.hslf.blip.*;
 import org.apache.poi.hslf.model.*;
+import org.apache.poi.POIDataSamples;
 import junit.framework.TestCase;
 
 import java.io.*;
@@ -31,12 +32,9 @@ import java.util.Arrays;
  * @author Yegor Kozlov
  */
 public final class TestPictures extends TestCase{
+    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
 
-    protected File cwd;
-
-    public void setUp() {
-        cwd = new File(System.getProperty("HSLF.testdata.path"));
-    }
+    //protected File cwd;
 
     /**
      * Test read/write Macintosh PICT
@@ -45,8 +43,8 @@ public final class TestPictures extends TestCase{
         SlideShow ppt = new SlideShow();
 
         Slide slide = ppt.createSlide();
-        File img = new File(cwd, "cow.pict");
-        int idx = ppt.addPicture(img, Picture.PICT);
+        byte[] src_bytes = slTests.readFile("cow.pict");
+        int idx = ppt.addPicture(src_bytes, Picture.PICT);
         Picture pict = new Picture(idx);
         assertEquals(idx, pict.getPictureIndex());
         slide.addShape(pict);
@@ -73,7 +71,6 @@ public final class TestPictures extends TestCase{
         assertEquals(Picture.PICT, pictures[0].getType());
         assertTrue(pictures[0] instanceof PICT);
         //compare the content of the initial file with what is stored in the PictureData
-        byte[] src_bytes = read(img);
         byte[] ppt_bytes = pictures[0].getData();
         assertEquals(src_bytes.length, ppt_bytes.length);
         //in PICT the first 512 bytes are MAC specific and may not be preserved, ignore them
@@ -91,8 +88,8 @@ public final class TestPictures extends TestCase{
         SlideShow ppt = new SlideShow();
 
         Slide slide = ppt.createSlide();
-        File img = new File(cwd, "santa.wmf");
-        int idx = ppt.addPicture(img, Picture.WMF);
+        byte[] src_bytes = slTests.readFile("santa.wmf");
+        int idx = ppt.addPicture(src_bytes, Picture.WMF);
         Picture pict = new Picture(idx);
         assertEquals(idx, pict.getPictureIndex());
         slide.addShape(pict);
@@ -119,7 +116,6 @@ public final class TestPictures extends TestCase{
         assertEquals(Picture.WMF, pictures[0].getType());
         assertTrue(pictures[0] instanceof WMF);
         //compare the content of the initial file with what is stored in the PictureData
-        byte[] src_bytes = read(img);
         byte[] ppt_bytes = pictures[0].getData();
         assertEquals(src_bytes.length, ppt_bytes.length);
         //in WMF the first 22 bytes - is a metafile header
@@ -137,8 +133,9 @@ public final class TestPictures extends TestCase{
         SlideShow ppt = new SlideShow();
 
         Slide slide = ppt.createSlide();
-        File img = new File(cwd, "wrench.emf");
-        int idx = ppt.addPicture(img, Picture.EMF);
+        byte[] src_bytes = slTests.readFile("wrench.emf");
+        int idx = ppt.addPicture(src_bytes, Picture.EMF);
+
         Picture pict = new Picture(idx);
         assertEquals(idx, pict.getPictureIndex());
         slide.addShape(pict);
@@ -165,7 +162,6 @@ public final class TestPictures extends TestCase{
         assertEquals(Picture.EMF, pictures[0].getType());
         assertTrue(pictures[0] instanceof EMF);
         //compare the content of the initial file with what is stored in the PictureData
-        byte[] src_bytes = read(img);
         byte[] ppt_bytes = pictures[0].getData();
         assertTrue(Arrays.equals(src_bytes, ppt_bytes));
     }
@@ -177,8 +173,8 @@ public final class TestPictures extends TestCase{
         SlideShow ppt = new SlideShow();
 
         Slide slide = ppt.createSlide();
-        File img = new File(cwd, "tomcat.png");
-        int idx = ppt.addPicture(img, Picture.PNG);
+        byte[] src_bytes = slTests.readFile("tomcat.png");
+        int idx = ppt.addPicture(src_bytes, Picture.PNG);
         Picture pict = new Picture(idx);
         assertEquals(idx, pict.getPictureIndex());
         slide.addShape(pict);
@@ -205,7 +201,6 @@ public final class TestPictures extends TestCase{
         assertEquals(Picture.PNG, pictures[0].getType());
         assertTrue(pictures[0] instanceof PNG);
         //compare the content of the initial file with what is stored in the PictureData
-        byte[] src_bytes = read(img);
         byte[] ppt_bytes = pictures[0].getData();
         assertTrue(Arrays.equals(src_bytes, ppt_bytes));
     }
@@ -217,8 +212,9 @@ public final class TestPictures extends TestCase{
         SlideShow ppt = new SlideShow();
 
         Slide slide = ppt.createSlide();
-        File img = new File(cwd, "clock.jpg");
-        int idx = ppt.addPicture(img, Picture.JPEG);
+        byte[] src_bytes = slTests.readFile("clock.jpg");
+        int idx = ppt.addPicture(src_bytes, Picture.JPEG);
+
         Picture pict = new Picture(idx);
         assertEquals(idx, pict.getPictureIndex());
         slide.addShape(pict);
@@ -245,7 +241,6 @@ public final class TestPictures extends TestCase{
         assertEquals(Picture.JPEG, pictures[0].getType());
         assertTrue(pictures[0] instanceof JPEG);
         //compare the content of the initial file with what is stored in the PictureData
-        byte[] src_bytes = read(img);
         byte[] ppt_bytes = pictures[0].getData();
         assertTrue(Arrays.equals(src_bytes, ppt_bytes));
     }
@@ -257,13 +252,8 @@ public final class TestPictures extends TestCase{
         SlideShow ppt = new SlideShow();
 
         Slide slide = ppt.createSlide();
-        File img = new File(cwd, "sci_cec.dib");
-
-        // Check we can read the test DIB image
-        assertTrue(img.exists());
-
-        // Add the image
-        int idx = ppt.addPicture(img, Picture.DIB);
+        byte[] src_bytes = slTests.readFile("sci_cec.dib");
+        int idx = ppt.addPicture(src_bytes, Picture.DIB);
         Picture pict = new Picture(idx);
         assertEquals(idx, pict.getPictureIndex());
         slide.addShape(pict);
@@ -290,23 +280,11 @@ public final class TestPictures extends TestCase{
         assertEquals(Picture.DIB, pictures[0].getType());
         assertTrue(pictures[0] instanceof DIB);
         //compare the content of the initial file with what is stored in the PictureData
-        byte[] src_bytes = read(img);
         byte[] ppt_bytes = pictures[0].getData();
         assertTrue(Arrays.equals(src_bytes, ppt_bytes));
     }
 
     /**
-     * Read file into a byte array
-     */
-    protected byte[] read(File f) throws IOException {
-        byte[] bytes = new byte[(int)f.length()];
-        FileInputStream is = new FileInputStream(f);
-        is.read(bytes);
-        is.close();
-        return bytes;
-    }
-
-    /**
      * Read pictures in different formats from a reference slide show
      */
     public void testReadPictures() throws Exception {
@@ -315,7 +293,7 @@ public final class TestPictures extends TestCase{
         Picture pict;
         PictureData pdata;
 
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(new File(cwd, "pictures.ppt").getPath()));
+        SlideShow ppt = new SlideShow(slTests.openResourceAsStream("pictures.ppt"));
         Slide[] slides = ppt.getSlides();
         PictureData[] pictures = ppt.getPictureData();
         assertEquals(5, pictures.length);
@@ -325,7 +303,7 @@ public final class TestPictures extends TestCase{
         assertTrue(pdata instanceof JPEG);
         assertEquals(Picture.JPEG, pdata.getType());
         src_bytes = pdata.getData();
-        ppt_bytes = read(new File(cwd, "clock.jpg"));
+        ppt_bytes = slTests.readFile("clock.jpg");
         assertTrue(Arrays.equals(src_bytes, ppt_bytes));
 
         pict = (Picture)slides[1].getShapes()[0]; //the second slide contains PNG
@@ -333,7 +311,7 @@ public final class TestPictures extends TestCase{
         assertTrue(pdata instanceof PNG);
         assertEquals(Picture.PNG, pdata.getType());
         src_bytes = pdata.getData();
-        ppt_bytes = read(new File(cwd, "tomcat.png"));
+        ppt_bytes = slTests.readFile("tomcat.png");
         assertTrue(Arrays.equals(src_bytes, ppt_bytes));
 
         pict = (Picture)slides[2].getShapes()[0]; //the third slide contains WMF
@@ -341,7 +319,7 @@ public final class TestPictures extends TestCase{
         assertTrue(pdata instanceof WMF);
         assertEquals(Picture.WMF, pdata.getType());
         src_bytes = pdata.getData();
-        ppt_bytes = read(new File(cwd, "santa.wmf"));
+        ppt_bytes = slTests.readFile("santa.wmf");
         assertEquals(src_bytes.length, ppt_bytes.length);
         //ignore the first 22 bytes - it is a WMF metafile header
         b1 = new byte[src_bytes.length-22];
@@ -355,7 +333,7 @@ public final class TestPictures extends TestCase{
         assertTrue(pdata instanceof PICT);
         assertEquals(Picture.PICT, pdata.getType());
         src_bytes = pdata.getData();
-        ppt_bytes = read(new File(cwd, "cow.pict"));
+        ppt_bytes = slTests.readFile("cow.pict");
         assertEquals(src_bytes.length, ppt_bytes.length);
         //ignore the first 512 bytes - it is a MAC specific crap
         b1 = new byte[src_bytes.length-512];
@@ -369,7 +347,7 @@ public final class TestPictures extends TestCase{
         assertTrue(pdata instanceof EMF);
         assertEquals(Picture.EMF, pdata.getType());
         src_bytes = pdata.getData();
-        ppt_bytes = read(new File(cwd, "wrench.emf"));
+        ppt_bytes = slTests.readFile("wrench.emf");
         assertTrue(Arrays.equals(src_bytes, ppt_bytes));
 
     }
@@ -379,7 +357,7 @@ public final class TestPictures extends TestCase{
 	 *  crazy pictures of type 0, we do our best.
 	 */
 	public void testZeroPictureType() throws Exception {
-		HSLFSlideShow hslf = new HSLFSlideShow(new File(cwd, "PictureTypeZero.ppt").getPath());
+		HSLFSlideShow hslf = new HSLFSlideShow(slTests.openResourceAsStream("PictureTypeZero.ppt"));
 
 		// Should still have 2 real pictures
 		assertEquals(2, hslf.getPictures().length);
@@ -409,7 +387,7 @@ public final class TestPictures extends TestCase{
 	}
 
 	public void testZeroPictureLength() throws Exception {
-		HSLFSlideShow hslf = new HSLFSlideShow(new File(cwd, "PictureLengthZero.ppt").getPath());
+		HSLFSlideShow hslf = new HSLFSlideShow(slTests.openResourceAsStream("PictureLengthZero.ppt"));
 
 		// Should still have 2 real pictures
 		assertEquals(2, hslf.getPictures().length);
@@ -453,7 +431,7 @@ public final class TestPictures extends TestCase{
     }
 
     public void testGetPictureName() throws Exception {
-        SlideShow ppt = new SlideShow(new HSLFSlideShow(new File(cwd, "ppt_with_png.ppt").getPath()));
+        SlideShow ppt = new SlideShow(slTests.openResourceAsStream("ppt_with_png.ppt"));
         Slide slide = ppt.getSlides()[0];
 
         Picture p = (Picture)slide.getShapes()[0]; //the first slide contains JPEG
@@ -464,7 +442,7 @@ public final class TestPictures extends TestCase{
         SlideShow ppt = new SlideShow();
 
         Slide slide = ppt.createSlide();
-        File img = new File(cwd, "tomcat.png");
+        byte[] img = slTests.readFile("tomcat.png");
         int idx = ppt.addPicture(img, Picture.PNG);
         Picture pict = new Picture(idx);
         pict.setPictureName("tomcat.png");
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
index d8437d80d2..ef8280d786 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestReOrderingSlides.java
@@ -24,6 +24,7 @@ import java.io.ByteArrayOutputStream;
 import junit.framework.TestCase;
 import org.apache.poi.hslf.*;
 import org.apache.poi.hslf.model.*;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that SlideShow can re-order slides properly
@@ -47,18 +48,15 @@ public final class TestReOrderingSlides extends TestCase {
 	 * Create/open the slideshows
 	 */
 	public void setUp() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
 
-		String filename = dirname + "/Single_Coloured_Page.ppt";
-		hss_one = new HSLFSlideShow(filename);
+		hss_one = new HSLFSlideShow(slTests.openResourceAsStream("Single_Coloured_Page.ppt"));
 		ss_one = new SlideShow(hss_one);
 
-		filename = dirname + "/basic_test_ppt_file.ppt";
-		hss_two = new HSLFSlideShow(filename);
+		hss_two = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss_two = new SlideShow(hss_two);
 
-		filename = dirname + "/incorrect_slide_order.ppt";
-		hss_three = new HSLFSlideShow(filename);
+		hss_three = new HSLFSlideShow(slTests.openResourceAsStream("incorrect_slide_order.ppt"));
 		ss_three = new SlideShow(hss_three);
 	}
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
index 72e6bd488e..5475dae9c1 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
@@ -23,6 +23,7 @@ import org.apache.poi.hslf.*;
 import org.apache.poi.hslf.record.ParentAwareRecord;
 import org.apache.poi.hslf.record.Record;
 import org.apache.poi.hslf.record.RecordContainer;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that the record setup done by SlideShow
@@ -37,9 +38,8 @@ public final class TestRecordSetup extends TestCase {
 	private HSLFSlideShow hss;
 
 	public TestRecordSetup() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		hss = new HSLFSlideShow(filename);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		hss = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss = new SlideShow(hss);
 	}
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
index 47d2461f55..c94f91f2ad 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
@@ -19,7 +19,6 @@ package org.apache.poi.hslf.usermodel;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.FileInputStream;
 
 import junit.framework.TestCase;
@@ -30,6 +29,7 @@ import org.apache.poi.hslf.model.TextBox;
 import org.apache.poi.hslf.model.TextRun;
 import org.apache.poi.hslf.record.Record;
 import org.apache.poi.hslf.record.SlideListWithText;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test that the friendly getters and setters on RichTextRun
@@ -38,6 +38,8 @@ import org.apache.poi.hslf.record.SlideListWithText;
  * @author Nick Burch (nick at torchbox dot com)
  */
 public final class TestRichTextRun extends TestCase {
+    private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
+
 	// SlideShow primed on the test data
 	private SlideShow ss;
 	private SlideShow ssRichA;
@@ -50,27 +52,23 @@ public final class TestRichTextRun extends TestCase {
 	private static String filenameC;
 
 	protected void setUp() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
 
 		// Basic (non rich) test file
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		hss = new HSLFSlideShow(filename);
+        hss = new HSLFSlideShow(_slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss = new SlideShow(hss);
 
 		// Rich test file A
-		filename = dirname + "/Single_Coloured_Page.ppt";
-		hssRichA = new HSLFSlideShow(filename);
+		hssRichA = new HSLFSlideShow(_slTests.openResourceAsStream("Single_Coloured_Page.ppt"));
 		ssRichA = new SlideShow(hssRichA);
 
 		// Rich test file B
-		filename = dirname + "/Single_Coloured_Page_With_Fonts_and_Alignments.ppt";
-		hssRichB = new HSLFSlideShow(filename);
+		hssRichB = new HSLFSlideShow(_slTests.openResourceAsStream("Single_Coloured_Page_With_Fonts_and_Alignments.ppt"));
 		ssRichB = new SlideShow(hssRichB);
 
 		// Rich test file C - has paragraph styles that run out before
 		//   the character ones do
-		filenameC = dirname + "/ParagraphStylesShorterThanCharStyles.ppt";
-		hssRichC = new HSLFSlideShow(filenameC);
+		filenameC = "ParagraphStylesShorterThanCharStyles.ppt";
+        hssRichC = new HSLFSlideShow(_slTests.openResourceAsStream(filenameC));
 		ssRichC = new SlideShow(hssRichC);
 	}
 
@@ -375,7 +373,7 @@ public final class TestRichTextRun extends TestCase {
 	 */
 	private void assertMatchesSLTWC(SlideShow s) throws Exception {
 		// Grab a new copy of slideshow C
-		SlideShow refC = new SlideShow(new HSLFSlideShow(filenameC));
+		SlideShow refC = new SlideShow(_slTests.openResourceAsStream(filenameC));
 
 		// Write out the 2nd SLWT in the active document
 		SlideListWithText refSLWT = refC.getDocumentRecord().getSlideListWithTexts()[1];
@@ -449,7 +447,7 @@ if(false) {
 	}
 
 	public void testIndentationLevel() throws Exception {
-		SlideShow ppt = new SlideShow(new HSLFSlideShow(new File(System.getProperty("HSLF.testdata.path"), "ParagraphStylesShorterThanCharStyles.ppt").getPath()));
+		SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("ParagraphStylesShorterThanCharStyles.ppt"));
 		Slide[] sl = ppt.getSlides();
 		for (int i = 0; i < sl.length; i++) {
 			TextRun[] txt = sl[i].getTextRuns();
@@ -465,9 +463,7 @@ if(false) {
 	}
 
 	public void testReadParagraphStyles() throws Exception {
-		FileInputStream is = new FileInputStream(new File(System.getProperty("HSLF.testdata.path"), "bullets.ppt"));
-		SlideShow ppt = new SlideShow(is);
-		is.close();
+		SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("bullets.ppt"));
 		assertTrue("No Exceptions while reading file", true);
 
 		RichTextRun rt;
@@ -560,9 +556,7 @@ if(false) {
 	}
 
 	public void testAddText() throws Exception {
-		FileInputStream is = new FileInputStream(new File(System.getProperty("HSLF.testdata.path"), "bullets.ppt"));
-		SlideShow ppt = new SlideShow(is);
-		is.close();
+		SlideShow ppt = new SlideShow(_slTests.openResourceAsStream("bullets.ppt"));
 		assertTrue("No Exceptions while reading file", true);
 
 		RichTextRun rt;
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
index bb78de0bcc..cb27d3ee92 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
@@ -21,6 +21,7 @@ package org.apache.poi.hslf.usermodel;
 import junit.framework.TestCase;
 import org.apache.poi.hslf.*;
 import org.apache.poi.hslf.model.*;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that SlideShow returns Sheets which have the right text in them
@@ -32,9 +33,8 @@ public final class TestSheetText extends TestCase {
 	private SlideShow ss;
 
 	public TestSheetText() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/basic_test_ppt_file.ppt";
-		HSLFSlideShow hss = new HSLFSlideShow(filename);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		HSLFSlideShow hss = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss = new SlideShow(hss);
 	}
 
@@ -63,9 +63,8 @@ public final class TestSheetText extends TestCase {
 	 * (Make sure we don't screw up / throw an exception etc)
 	 */
 	public void testWithShortTextPropData() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-		String filename = dirname + "/iisd_report.ppt";
-		HSLFSlideShow hss = new HSLFSlideShow(filename);
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+		HSLFSlideShow hss = new HSLFSlideShow(slTests.openResourceAsStream("iisd_report.ppt"));
 		SlideShow sss = new SlideShow(hss);
 
 		// Should come out with 10 slides, no notes
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
index 2cc111afbd..373ec339b4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
@@ -20,6 +20,7 @@ package org.apache.poi.hslf.usermodel;
 import junit.framework.TestCase;
 import org.apache.poi.hslf.*;
 import org.apache.poi.hslf.model.*;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests that SlideShow returns Sheets in the right order
@@ -27,20 +28,18 @@ import org.apache.poi.hslf.model.*;
  * @author Nick Burch (nick at torchbox dot com)
  */
 public final class TestSlideOrdering extends TestCase {
+    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+
 	// Simple slideshow, record order matches slide order
 	private SlideShow ssA;
 	// Complex slideshow, record order doesn't match slide order
 	private SlideShow ssB;
 
 	public TestSlideOrdering() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-
-		String filenameA = dirname + "/basic_test_ppt_file.ppt";
-		HSLFSlideShow hssA = new HSLFSlideShow(filenameA);
+		HSLFSlideShow hssA = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ssA = new SlideShow(hssA);
 
-		String filenameB = dirname + "/incorrect_slide_order.ppt";
-		HSLFSlideShow hssB = new HSLFSlideShow(filenameB);
+		HSLFSlideShow hssB = new HSLFSlideShow(slTests.openResourceAsStream("incorrect_slide_order.ppt"));
 		ssB = new SlideShow(hssB);
 	}
 
@@ -85,7 +84,9 @@ public final class TestSlideOrdering extends TestCase {
 	 *            array of reference slide titles
 	 */
 	protected void assertSlideOrdering(String filename, String[] titles) throws Exception {
-		SlideShow ppt = new SlideShow(new HSLFSlideShow(filename));
+        POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
+
+        SlideShow ppt = new SlideShow(slTests.openResourceAsStream(filename));
 		Slide[] slide = ppt.getSlides();
 
 		assertEquals(titles.length, slide.length);
@@ -96,25 +97,23 @@ public final class TestSlideOrdering extends TestCase {
 	}
 
 	public void testTitles() throws Exception {
-		String dirname = System.getProperty("HSLF.testdata.path");
-
-		assertSlideOrdering(dirname + "/basic_test_ppt_file.ppt", new String[] {
+		assertSlideOrdering("basic_test_ppt_file.ppt", new String[] {
 				"This is a test title", "This is the title on page 2" });
 
-		assertSlideOrdering(dirname + "/incorrect_slide_order.ppt", new String[] { "Slide 1",
+		assertSlideOrdering("incorrect_slide_order.ppt", new String[] { "Slide 1",
 				"Slide 2", "Slide 3" });
 
-		assertSlideOrdering(dirname + "/next_test_ppt_file.ppt", new String[] {
+		assertSlideOrdering("next_test_ppt_file.ppt", new String[] {
 				"This is a test title", "This is the title on page 2" });
 
-		assertSlideOrdering(dirname + "/Single_Coloured_Page.ppt",
+		assertSlideOrdering("Single_Coloured_Page.ppt",
 				new String[] { "This is a title, it" + (char) 0x2019 + "s in black" });
 
-		assertSlideOrdering(dirname + "/Single_Coloured_Page_With_Fonts_and_Alignments.ppt",
+		assertSlideOrdering("Single_Coloured_Page_With_Fonts_and_Alignments.ppt",
 				new String[] { "This is a title, it" + (char) 0x2019 + "s in black" });
 
 		assertSlideOrdering(
-				dirname + "/ParagraphStylesShorterThanCharStyles.ppt",
+				"ParagraphStylesShorterThanCharStyles.ppt",
 				new String[] {
 						"ROMANCE: AN ANALYSIS",
 						"AGENDA",
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java
index 8b7c4c21f4..ea580e3832 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSoundData.java
@@ -17,11 +17,10 @@
 
 package org.apache.poi.hslf.usermodel;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.util.Arrays;
 
 import junit.framework.TestCase;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test reading sound data from a ppt
@@ -29,28 +28,16 @@ import junit.framework.TestCase;
  * @author Yegor Kozlov
  */
 public final class TestSoundData extends TestCase{
-
-    protected File cwd;
-
-    public void setUp() {
-        cwd = new File(System.getProperty("HSLF.testdata.path"));
-    }
+    private static POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
 
     /**
      * Read a reference sound file from disk and compare it from the data extracted from the slide show
      */
     public void testSounds() throws Exception {
         //read the reference sound file
-        File f = new File(cwd, "ringin.wav");
-        int length = (int)f.length();
-        byte[] ref_data = new byte[length];
-        FileInputStream is = new FileInputStream(f);
-        is.read(ref_data);
-        is.close();
-
-        is = new FileInputStream(new File(cwd, "sound.ppt"));
-        SlideShow ppt = new SlideShow(is);
-        is.close();
+        byte[] ref_data = slTests.readFile("ringin.wav");
+
+        SlideShow ppt = new SlideShow(slTests.openResourceAsStream("sound.ppt"));
 
         SoundData[] sound = ppt.getSoundData();
         assertEquals("Expected 1 sound", 1, sound.length);
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestBlankFileRead.java b/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestBlankFileRead.java
index f5cbb40011..fb21c5e86e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestBlankFileRead.java
+++ b/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestBlankFileRead.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 
 import org.apache.poi.hsmf.MAPIMessage;
 import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
+import org.apache.poi.POIDataSamples;
 
 import junit.framework.TestCase;
 
@@ -38,8 +39,8 @@ public final class TestBlankFileRead extends TestCase {
 	 * Initialize this test, load up the blank.msg mapi message.
 	 */
 	public TestBlankFileRead() throws IOException {
-		String dirname = System.getProperty("HSMF.testdata.path");
-		this.mapiMessage = new MAPIMessage(dirname + "/blank.msg");
+        POIDataSamples samples = POIDataSamples.getHSMFInstance();
+		this.mapiMessage = new MAPIMessage(samples.openResourceAsStream("blank.msg"));
 	}
 
 	/**
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java b/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java
index df105dc0c8..24f8eae477 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java
+++ b/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestFileWithAttachmentsRead.java
@@ -27,6 +27,7 @@ import junit.framework.TestCase;
 
 import org.apache.poi.hsmf.MAPIMessage;
 import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests to verify that we can read attachments from msg file
@@ -42,8 +43,8 @@ public class TestFileWithAttachmentsRead extends TestCase {
 	 * @throws Exception
 	 */
 	public TestFileWithAttachmentsRead() throws IOException {
-		String dirname = System.getProperty("HSMF.testdata.path");
-		this.mapiMessage = new MAPIMessage(dirname + "/attachment_test_msg.msg");
+        POIDataSamples samples = POIDataSamples.getHSMFInstance();
+		this.mapiMessage = new MAPIMessage(samples.openResourceAsStream("attachment_test_msg.msg"));
 	}
 
 	/**
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestOutlook30FileRead.java b/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestOutlook30FileRead.java
index da16067188..12cc44c42b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestOutlook30FileRead.java
+++ b/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestOutlook30FileRead.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 
 import org.apache.poi.hsmf.MAPIMessage;
 import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
+import org.apache.poi.POIDataSamples;
 
 import junit.framework.TestCase;
 
@@ -35,8 +36,8 @@ private MAPIMessage mapiMessage;
 	 * @throws Exception
 	 */
 	public TestOutlook30FileRead() throws IOException {
-		String dirname = System.getProperty("HSMF.testdata.path");
-		this.mapiMessage = new MAPIMessage(dirname + "/outlook_30_msg.msg");
+        POIDataSamples samples = POIDataSamples.getHSMFInstance();
+		this.mapiMessage = new MAPIMessage(samples.openResourceAsStream("outlook_30_msg.msg"));
 	}
 
 	/**
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestSimpleFileRead.java b/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestSimpleFileRead.java
index 2d822bb10c..672d94e8ff 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestSimpleFileRead.java
+++ b/src/scratchpad/testcases/org/apache/poi/hsmf/model/TestSimpleFileRead.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 
 import org.apache.poi.hsmf.MAPIMessage;
 import org.apache.poi.hsmf.exceptions.ChunkNotFoundException;
+import org.apache.poi.POIDataSamples;
 
 import junit.framework.TestCase;
 
@@ -38,8 +39,8 @@ private MAPIMessage mapiMessage;
 	 * @throws Exception
 	 */
 	public TestSimpleFileRead() throws IOException {
-		String dirname = System.getProperty("HSMF.testdata.path");
-		this.mapiMessage = new MAPIMessage(dirname + "/simple_test_msg.msg");
+        POIDataSamples samples = POIDataSamples.getHSMFInstance();
+		this.mapiMessage = new MAPIMessage(samples.openResourceAsStream("simple_test_msg.msg"));
 	}
 
 	/**
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java b/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java
index 61f72d5af7..1f7d4c6ff9 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFDocFixture.java
@@ -20,6 +20,7 @@ package org.apache.poi.hwpf;
 import org.apache.poi.hwpf.model.FileInformationBlock;
 import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.POIDataSamples;
 
 
 public final class HWPFDocFixture
@@ -38,7 +39,7 @@ public final class HWPFDocFixture
     try
     {
       POIFSFileSystem filesystem = new POIFSFileSystem(
-              HWPFTestDataSamples.openSampleFileStream("test.doc"));
+              POIDataSamples.getDocumentInstance().openResourceAsStream("test.doc"));
 
       DocumentEntry documentProps =
         (DocumentEntry) filesystem.getRoot().getEntry("WordDocument");
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java b/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
index 0b6f529e98..706fe55fa1 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/HWPFTestDataSamples.java
@@ -20,29 +20,12 @@ import org.apache.poi.POIDataSamples;
 

 import java.io.*;

 

-public class HWPFTestDataSamples extends POIDataSamples {

-

-    private static final HWPFTestDataSamples _inst = new HWPFTestDataSamples("HWPF.testdata.path", "SampleDoc.doc");

-

-

-    private HWPFTestDataSamples(String dir, String classPathTestFile){

-        super(dir, classPathTestFile);

-    }

-

-    public static POIDataSamples getInstance(){

-        return _inst;

-    }

-

-    public static InputStream openSampleFileStream(String sampleFileName) {

-        return _inst.openResourceAsStream(sampleFileName);

-    }

-    public static byte[] getTestDataFileContent(String fileName) {

-        return _inst.readFile(fileName);

-    }

+public class HWPFTestDataSamples {

 

     public static HWPFDocument openSampleFile(String sampleFileName) {

         try {

-            return new HWPFDocument(_inst.openResourceAsStream(sampleFileName));

+            InputStream is = POIDataSamples.getDocumentInstance().openResourceAsStream(sampleFileName);

+            return new HWPFDocument(is);

         } catch (IOException e) {

             throw new RuntimeException(e);

         }

diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java b/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java
index ccc14ba76a..27189db748 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/TestHWPFPictures.java
@@ -23,6 +23,7 @@ import junit.framework.TestCase;
 
 import org.apache.poi.hwpf.model.PicturesTable;
 import org.apache.poi.hwpf.usermodel.Picture;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test picture support in HWPF
@@ -154,6 +155,6 @@ public final class TestHWPFPictures extends TestCase {
 	}
 
 	private static byte[] readFile(String file) {
-		return HWPFTestDataSamples.getTestDataFileContent(file);
+		return POIDataSamples.getDocumentInstance().readFile(file);
 	}
 }
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java b/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
index 4f9c08634f..47e0b431f6 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
@@ -23,6 +23,7 @@ import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.HWPFTestDataSamples;
 import org.apache.poi.poifs.filesystem.DirectoryNode;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.POIDataSamples;
 
 import java.io.FileInputStream;
 
@@ -65,17 +66,16 @@ public final class TestWordExtractor extends TestCase {
 	private String filename6;
 
 	protected void setUp() throws Exception {
-		String pdirname = System.getProperty("POIFS.testdata.path");
 
 		String filename = "test2.doc";
 		String filename2 = "test.doc";
-		filename3 = pdirname + "/excel_with_embeded.xls";
+		filename3 = "excel_with_embeded.xls";
 		filename4 = "ThreeColHeadFoot.doc";
 		filename5 = "HeaderFooterUnicode.doc";
 		filename6 = "footnote.doc";
-
-		extractor = new WordExtractor(HWPFTestDataSamples.openSampleFileStream(filename));
-		extractor2 = new WordExtractor(HWPFTestDataSamples.openSampleFileStream(filename2));
+        POIDataSamples docTests = POIDataSamples.getDocumentInstance();
+		extractor = new WordExtractor(docTests.openResourceAsStream(filename));
+		extractor2 = new WordExtractor(docTests.openResourceAsStream(filename2));
 
 		// Build splat'd out text version
 		for(int i=0; i<p_text1.length; i++) {
@@ -123,7 +123,7 @@ public final class TestWordExtractor extends TestCase {
 	 * @throws Exception
 	 */
 	public void testExtractFromEmbeded() throws Exception {
-		POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filename3));
+		POIFSFileSystem fs = new POIFSFileSystem(POIDataSamples.getSpreadSheetInstance().openResourceAsStream(filename3));
 		HWPFDocument doc;
 		WordExtractor extractor3;
 
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java b/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
index 860552cef2..d328dfe403 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java
@@ -20,6 +20,7 @@ package org.apache.poi.hwpf.extractor;
 import junit.framework.TestCase;
 
 import org.apache.poi.hwpf.HWPFTestDataSamples;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests for bugs with the WordExtractor
@@ -30,7 +31,7 @@ public final class TestWordExtractorBugs extends TestCase {
 
 	public void testProblemMetadata() throws Exception {
 		WordExtractor extractor =
-			new WordExtractor(HWPFTestDataSamples.openSampleFileStream("ProblemExtracting.doc"));
+			new WordExtractor(POIDataSamples.getDocumentInstance().openResourceAsStream("ProblemExtracting.doc"));
 
 		// Check it gives text without error
 		extractor.getText();
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
index 4a0341619f..fefdcf8c45 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
+++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestPictures.java
@@ -24,6 +24,7 @@ import junit.framework.TestCase;
 import org.apache.poi.hwpf.HWPFDocument;
 import org.apache.poi.hwpf.HWPFTestDataSamples;
 import org.apache.poi.util.LittleEndian;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test the picture handling
@@ -98,7 +99,7 @@ public final class TestPictures extends TestCase {
 		assertTrue(pic.getSize() > 128);
 
 		// Check right contents
-		byte[] emf = HWPFTestDataSamples.getTestDataFileContent("vector_image.emf");
+		byte[] emf = POIDataSamples.getDocumentInstance().readFile("vector_image.emf");
 		byte[] pemf = pic.getContent();
 		assertEquals(emf.length, pemf.length);
 		for(int i=0; i<emf.length; i++) {
diff --git a/src/testcases/org/apache/poi/POIDataSamples.java b/src/testcases/org/apache/poi/POIDataSamples.java
index b5f64dd998..d4ec6d6b7d 100755
--- a/src/testcases/org/apache/poi/POIDataSamples.java
+++ b/src/testcases/org/apache/poi/POIDataSamples.java
@@ -20,26 +20,89 @@ import java.io.*;
 

 /**

  * Centralises logic for finding/opening sample files

- *

  */

-public abstract class POIDataSamples {

+public final class POIDataSamples {

+

+    /**

+     * Name of the system property that defined path to the test data.

+     */

+    public static final String TEST_PROPERTY = "POI.testdata.path";

+

+    private static POIDataSamples _instSlideshow;

+    private static POIDataSamples _instSpreadsheet;

+    private static POIDataSamples _instDocument;

+    private static POIDataSamples _instDiagram;

+    private static POIDataSamples _instOpenxml4j;

+    private static POIDataSamples _instPOIFS;

+    private static POIDataSamples _instDDF;

+    private static POIDataSamples _instHPSF;

+    private static POIDataSamples _instHPBF;

+    private static POIDataSamples _instHSMF;

 

     private File _resolvedDataDir;

     /** <code>true</code> if standard system propery is not set,

      * but the data is available on the test runtime classpath */

     private boolean _sampleDataIsAvaliableOnClassPath;

-    private String _testDataDir;

+    private String _moduleDir;

 

     /**

      *

-     * @param dir   the name of the system property that defines  path to the test files

-     * @param classPathTestFile the name of the test file to check if resources are available from the classpath

+     * @param moduleDir   the name of the directory containing the test files

      */

-    public POIDataSamples(String dir, String classPathTestFile){

-        _testDataDir = dir;

-        initialise(classPathTestFile);

+    private POIDataSamples(String moduleDir){

+        _moduleDir = moduleDir;

+        initialise();

+    }

+

+    public static POIDataSamples getSpreadSheetInstance(){

+        if(_instSpreadsheet == null) _instSpreadsheet = new POIDataSamples("spreadsheet");

+        return _instSpreadsheet;

+    }

+

+    public static POIDataSamples getDocumentInstance(){

+        if(_instDocument == null) _instDocument = new POIDataSamples("document");

+        return _instDocument;

+    }

+

+    public static POIDataSamples getSlideShowInstance(){

+        if(_instSlideshow == null) _instSlideshow = new POIDataSamples("slideshow");

+        return _instSlideshow;

+    }

+

+    public static POIDataSamples getDiagramInstance(){

+        if(_instOpenxml4j == null) _instOpenxml4j = new POIDataSamples("diagram");

+        return _instOpenxml4j;

+    }

+

+    public static POIDataSamples getOpenXML4JInstance(){

+        if(_instDiagram == null) _instDiagram = new POIDataSamples("openxml4j");

+        return _instDiagram;

+    }

+

+    public static POIDataSamples getPOIFSInstance(){

+        if(_instPOIFS == null) _instPOIFS = new POIDataSamples("poifs");

+        return _instPOIFS;

+    }

+

+    public static POIDataSamples getDDFInstance(){

+        if(_instDDF == null) _instDDF = new POIDataSamples("ddf");

+        return _instDDF;

+    }

+

+    public static POIDataSamples getHPSFInstance(){

+        if(_instHPSF == null) _instHPSF = new POIDataSamples("hpsf");

+        return _instHPSF;

+    }

+

+    public static POIDataSamples getPublisherInstance(){

+        if(_instHPBF == null) _instHPBF = new POIDataSamples("publisher");

+        return _instHPBF;

     }

 

+    public static POIDataSamples getHSMFInstance(){

+        if(_instHSMF == null) _instHSMF = new POIDataSamples("hsmf");

+        return _instHSMF;

+    }

     /**

      * Opens a sample file from the test data directory

      *

@@ -60,40 +123,46 @@ public abstract class POIDataSamples {
         }

         if (_resolvedDataDir == null) {

             throw new RuntimeException("Must set system property '"

-                    + _testDataDir

+                    + TEST_PROPERTY

                     + "' properly before running tests");

         }

 

+        File f = getFile(sampleFileName);

+        try {

+            return new FileInputStream(f);

+        } catch (FileNotFoundException e) {

+            throw new RuntimeException(e);

+        }

+    }

+

+    /**

+     *

+     * @param sampleFileName    the name of the test file

+     * @return

+     * @throws RuntimeException if the file was not found

+     */

+    public File getFile(String sampleFileName) {

         File f = new File(_resolvedDataDir, sampleFileName);

         if (!f.exists()) {

             throw new RuntimeException("Sample file '" + sampleFileName

                     + "' not found in data dir '" + _resolvedDataDir.getAbsolutePath() + "'");

         }

         try {

-            if(!sampleFileName.equals(f.getCanonicalFile().getName())){

+            if(sampleFileName.length() > 0 && !sampleFileName.equals(f.getCanonicalFile().getName())){

                 throw new RuntimeException("File name is case-sensitive: requested '" + sampleFileName

                         + "' but actual file is '" + f.getCanonicalFile().getName() + "'");

             }

         } catch (IOException e){

             throw new RuntimeException(e);

         }

-

-        try {

-            return new FileInputStream(f);

-        } catch (FileNotFoundException e) {

-            throw new RuntimeException(e);

-        }

+        return f;

     }

 

-    /**

-     *

-     * @param classPathTest test file to check if the resources are avaiable from the classpath

-     */

-    private void initialise(String classPathTest) {

-        String dataDirName = System.getProperty(_testDataDir);

+    private void initialise() {

+        String dataDirName = System.getProperty(TEST_PROPERTY);

         if (dataDirName == null) {

             // check to see if we can just get the resources from the classpath

-            InputStream is = openClasspathResource(classPathTest);

+            InputStream is = openClasspathResource("");

             if (is != null) {

                 try {

                     is.close(); // be nice

@@ -104,14 +173,12 @@ public abstract class POIDataSamples {
                 return;

             }

 

-            throw new RuntimeException("Must set system property '"

-                    + _testDataDir + "' before running tests");

+            throw new RuntimeException("Must set system property '" +

+                    TEST_PROPERTY + "' before running tests");

         }

-        File dataDir = new File(dataDirName);

+        File dataDir = new File(dataDirName, _moduleDir);

         if (!dataDir.exists()) {

-            throw new RuntimeException("Data dir '" + dataDirName

-                    + "' specified by system property '" + _testDataDir

-                    + "' does not exist");

+            throw new RuntimeException("Data dir '" + _moduleDir + " does not exist");

         }

         // convert to canonical file, to make any subsequent error messages

         // clearer.

@@ -129,7 +196,7 @@ public abstract class POIDataSamples {
      * @return <code>null</code> if the sample file is not deployed on the classpath.

      */

     private InputStream openClasspathResource(String sampleFileName) {

-        return getClass().getResourceAsStream("data/" + sampleFileName);

+        return getClass().getResourceAsStream("/" + _moduleDir + "/" + sampleFileName);

     }

 

     private static final class NonSeekableInputStream extends InputStream {

diff --git a/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
index 9e2921fe88..6dffb8df22 100755
--- a/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
+++ b/src/testcases/org/apache/poi/ddf/TestEscherBlipRecord.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.util.Arrays;
 
 import junit.framework.TestCase;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Test read/serialize of escher blip records
@@ -30,12 +31,12 @@ import junit.framework.TestCase;
  * @author Yegor Kozlov
  */
 public final class TestEscherBlipRecord extends TestCase {
-    protected String cwd = System.getProperty("DDF.testdata.path");
+    private static final POIDataSamples _samples = POIDataSamples.getDDFInstance();
 
     //test reading/serializing of a PNG blip
     public void testReadPNG() {
         //provided in bug-44886
-        byte[] data = read(new File(cwd, "Container.dat"));
+        byte[] data = _samples.readFile("Container.dat");
 
         EscherContainerRecord record = new EscherContainerRecord();
         record.fillFields(data, 0, new DefaultEscherRecordFactory());
@@ -80,7 +81,7 @@ public final class TestEscherBlipRecord extends TestCase {
     //test reading/serializing of a PICT metafile
     public void testReadPICT() {
         //provided in bug-44886
-        byte[] data = read(new File(cwd, "Container.dat"));
+        byte[] data = _samples.readFile("Container.dat");
 
         EscherContainerRecord record = new EscherContainerRecord();
         record.fillFields(data, 0, new DefaultEscherRecordFactory());
@@ -131,7 +132,7 @@ public final class TestEscherBlipRecord extends TestCase {
 
     //integral test: check that the read-write-read round trip is consistent
     public void testContainer() {
-        byte[] data = read(new File(cwd, "Container.dat"));
+        byte[] data = _samples.readFile("Container.dat");
 
         EscherContainerRecord record = new EscherContainerRecord();
         record.fillFields(data, 0, new DefaultEscherRecordFactory());
@@ -156,7 +157,7 @@ public final class TestEscherBlipRecord extends TestCase {
      * The test data was created from pl031405.xls attached to Bugzilla #47143
      */
     public void test47143() {
-        byte[] data = read(new File(cwd, "47143.dat"));
+        byte[] data = _samples.readFile("47143.dat");
         EscherBSERecord bse = new EscherBSERecord();
         bse.fillFields(data, 0, new DefaultEscherRecordFactory());
         bse.toString(); //assert that toString() works
diff --git a/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java b/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java
index 4d83cad446..3db6a3784d 100644
--- a/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java
+++ b/src/testcases/org/apache/poi/ddf/TestEscherContainerRecord.java
@@ -25,16 +25,13 @@ import junit.framework.TestCase;
 import org.apache.poi.util.HexRead;
 import org.apache.poi.util.HexDump;
 import org.apache.poi.util.IOUtils;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests for {@link EscherContainerRecord}
  */
 public final class TestEscherContainerRecord extends TestCase {
-	private String ESCHER_DATA_PATH;
-
-	protected void setUp() {
-		ESCHER_DATA_PATH = System.getProperty("DDF.testdata.path");
-	}
+    private static final POIDataSamples _samples = POIDataSamples.getDDFInstance();
 
 	public void testFillFields() {
 		EscherRecordFactory f = new DefaultEscherRecordFactory();
@@ -151,11 +148,7 @@ public final class TestEscherContainerRecord extends TestCase {
 	 *  but hopefully we now read the correct size.
 	 */
 	public void testBug44857() throws Exception {
-		File f = new File(ESCHER_DATA_PATH, "Container.dat");
-		assertTrue(f.exists());
-
-		FileInputStream finp = new FileInputStream(f);
-		byte[] data = IOUtils.toByteArray(finp);
+		byte[] data = _samples.readFile("Container.dat");
 
 		// This used to fail with an OutOfMemory
 		EscherContainerRecord record = new EscherContainerRecord();
diff --git a/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java b/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java
index ba7c650b37..0e1c212326 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/AllDataFilesTester.java
@@ -17,6 +17,8 @@
 
 package org.apache.poi.hpsf.basic;
 
+import org.apache.poi.POIDataSamples;
+
 import java.io.File;
 import java.io.FileFilter;
 import java.util.logging.Logger;
@@ -30,6 +32,7 @@ import java.util.logging.Logger;
  *         href="mailto:klute@rainer-klute.de">&lt;klute@rainer-klute.de&gt;</a>
  */
 public class AllDataFilesTester {
+    private static final POIDataSamples _samples = POIDataSamples.getHPSFInstance();
 
     /**
      * <p>Interface specifying how to run a test on a single file.</p>
@@ -56,8 +59,8 @@ public class AllDataFilesTester {
      */
     public void runTests(final TestTask task) throws Throwable
     {
-        final String dataDirName = System.getProperty("HPSF.testdata.path");
-        final File dataDir = new File(dataDirName);
+        POIDataSamples _samples = POIDataSamples.getHPSFInstance();
+        final File dataDir = _samples.getFile("");
         final File[] docs = dataDir.listFiles(new FileFilter()
         {
             public boolean accept(final File file)
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java b/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java
index 0eeef4bbdf..b773bd6fd7 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/TestBasic.java
@@ -37,6 +37,7 @@ import org.apache.poi.hpsf.PropertySetFactory;
 import org.apache.poi.hpsf.Section;
 import org.apache.poi.hpsf.SummaryInformation;
 import org.apache.poi.hpsf.wellknown.SectionIDMap;
+import org.apache.poi.POIDataSamples;
 
 /**
  * <p>Tests the basic HPSF functionality.</p>
@@ -80,11 +81,10 @@ public final class TestBasic extends TestCase {
      * @exception FileNotFoundException if the file to be read does not exist.
      * @exception IOException if any other I/O exception occurs.
      */
-    public void setUp() throws FileNotFoundException, IOException
+    public void setUp() throws IOException
     {
-        final File dataDir =
-            new File(System.getProperty("HPSF.testdata.path"));
-        final File data = new File(dataDir, POI_FS);
+        POIDataSamples samples = POIDataSamples.getHPSFInstance();
+        final File data = samples.getFile(POI_FS);
         poiFiles = Util.readPOIFiles(data);
     }
 
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java b/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java
index 806b49745a..47c4adc340 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/TestEmptyProperties.java
@@ -35,6 +35,7 @@ import org.apache.poi.hpsf.PropertySet;
 import org.apache.poi.hpsf.PropertySetFactory;
 import org.apache.poi.hpsf.SummaryInformation;
 import org.apache.poi.hpsf.Variant;
+import org.apache.poi.POIDataSamples;
 
 /**
  * <p>Test case for OLE2 files with empty properties. An empty property's type
@@ -69,9 +70,8 @@ public final class TestEmptyProperties extends TestCase {
      */
     public void setUp() throws FileNotFoundException, IOException
     {
-        final File dataDir =
-            new File(System.getProperty("HPSF.testdata.path"));
-        final File data = new File(dataDir, POI_FS);
+        POIDataSamples samples = POIDataSamples.getHPSFInstance();
+        final File data = samples.getFile(POI_FS);
 
         poiFiles = Util.readPOIFiles(data);
     }
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java b/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
index 9916dbc995..8f7bbd5b05 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java
@@ -25,6 +25,7 @@ import java.io.InputStream;
 import junit.framework.TestCase;
 
 import org.apache.poi.hpsf.PropertySetFactory;
+import org.apache.poi.POIDataSamples;
 
 /**
  * <p>Tests some HPSF functionality by reading all property sets from all files
@@ -41,8 +42,8 @@ public class TestReadAllFiles extends TestCase {
      */
     public void testReadAllFiles()
     {
-        final File dataDir =
-            new File(System.getProperty("HPSF.testdata.path"));
+        POIDataSamples _samples = POIDataSamples.getHPSFInstance();
+        final File dataDir = _samples.getFile("");
         final File[] fileList = dataDir.listFiles(new FileFilter()
             {
                 public boolean accept(final File f)
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java b/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java
index f9cf2b0dcd..581ff14381 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/TestUnicode.java
@@ -32,6 +32,7 @@ import org.apache.poi.hpsf.PropertySet;
 import org.apache.poi.hpsf.PropertySetFactory;
 import org.apache.poi.hpsf.Section;
 import org.apache.poi.hpsf.SummaryInformation;
+import org.apache.poi.POIDataSamples;
 
 /**
  * <p>Tests whether Unicode string can be read from a
@@ -57,9 +58,8 @@ public class TestUnicode extends TestCase {
      * @exception IOException if any other I/O exception occurs
      */
     protected void setUp() {
-        final File dataDir =
-            new File(System.getProperty("HPSF.testdata.path"));
-        data = new File(dataDir, POI_FS);
+        POIDataSamples samples = POIDataSamples.getHPSFInstance();
+        data = samples.getFile(POI_FS);
     }
 
 
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java b/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
index dbb528f6e2..f824ffb7bc 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
@@ -63,6 +63,7 @@ import org.apache.poi.poifs.eventfilesystem.POIFSReaderListener;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.TempFile;
+import org.apache.poi.POIDataSamples;
 
 /**
  * <p>Tests HPSF's writing functionality.</p>
@@ -71,6 +72,7 @@ import org.apache.poi.util.TempFile;
  */
 public class TestWrite extends TestCase
 {
+    private static final POIDataSamples _samples = POIDataSamples.getHPSFInstance();
 
     static final String POI_FS = "TestHPSFWritingFunctionality.doc";
 
@@ -110,10 +112,7 @@ public class TestWrite extends TestCase
      */
     public void testNoFormatID() throws IOException
     {
-        final String dataDirName = System.getProperty("HPSF.testdata.path");
-        final File dataDir = new File(dataDirName);
-        final File filename = new File(dataDir, POI_FS);
-        filename.deleteOnExit();
+        final File filename = TempFile.createTempFile(POI_FS, ".doc");
 
         /* Create a mutable property set with a section that does not have the
          * formatID set: */
@@ -159,8 +158,7 @@ public class TestWrite extends TestCase
     public void testWriteEmptyPropertySet()
         throws IOException, UnsupportedVariantTypeException
     {
-        final File dataDir =
-            new File(System.getProperty("HPSF.testdata.path"));
+        final File dataDir = _samples.getFile("");
         final File filename = new File(dataDir, POI_FS);
         filename.deleteOnExit();
 
@@ -202,8 +200,7 @@ public class TestWrite extends TestCase
     {
         final String AUTHOR = "Rainer Klute";
         final String TITLE = "Test Document"; 
-        final File dataDir =
-            new File(System.getProperty("HPSF.testdata.path"));
+        final File dataDir = _samples.getFile("");
         final File filename = new File(dataDir, POI_FS);
         filename.deleteOnExit();
         final OutputStream out = new FileOutputStream(filename);
@@ -274,8 +271,7 @@ public class TestWrite extends TestCase
         final String SECTION1 = "Section 1";
         final String SECTION2 = "Section 2";
 
-        final File dataDir =
-            new File(System.getProperty("HPSF.testdata.path"));
+        final File dataDir = _samples.getFile("");
         final File filename = new File(dataDir, POI_FS);
         filename.deleteOnExit();
         final OutputStream out = new FileOutputStream(filename);
@@ -673,8 +669,7 @@ public class TestWrite extends TestCase
      */
     public void testRecreate()
     {
-        final File dataDir =
-            new File(System.getProperty("HPSF.testdata.path"));
+        final File dataDir = _samples.getFile("");
         final File[] fileList = dataDir.listFiles(new FileFilter()
             {
                 public boolean accept(final File f)
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java b/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
index d570b029b3..ca3b0864ba 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java
@@ -53,6 +53,7 @@ import org.apache.poi.poifs.filesystem.DirectoryEntry;
 import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.DocumentInputStream;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.POIDataSamples;
 
 /**
  * <p>Tests HPSF's high-level writing functionality for the well-known property
@@ -78,8 +79,8 @@ public class TestWriteWellKnown extends TestCase {
 
     /**
      * <p>This test method checks whether DocumentSummary information streams
-     * can be read. This is done by opening all "Test*" files in the directrory
-     * pointed to by the "HPSF.testdata.path" system property, trying to extract
+     * can be read. This is done by opening all "Test*" files in the 'poifs' directrory
+     * pointed to by the "POI.testdata.path" system property, trying to extract
      * the document summary information stream in the root directory and calling
      * its get... methods.</p>
      * @throws IOException 
@@ -93,8 +94,8 @@ public class TestWriteWellKnown extends TestCase {
             NoPropertySetStreamException, MarkUnsupportedException,
             UnexpectedPropertySetTypeException
     {
-        final String dataDirName = System.getProperty("HPSF.testdata.path");
-        final File dataDir = new File(dataDirName);
+        POIDataSamples _samples = POIDataSamples.getHPSFInstance();
+        final File dataDir = _samples.getFile("");
         final File[] docs = dataDir.listFiles(new FileFilter()
         {
             public boolean accept(final File file)
@@ -205,8 +206,8 @@ public class TestWriteWellKnown extends TestCase {
             NoPropertySetStreamException, MarkUnsupportedException,
             UnexpectedPropertySetTypeException, WritingNotSupportedException
     {
-        final String dataDirName = System.getProperty("HPSF.testdata.path");
-        final File dataDir = new File(dataDirName);
+        POIDataSamples _samples = POIDataSamples.getHPSFInstance();
+        final File dataDir = _samples.getFile("");
         final File doc1 = new File(dataDir, POI_FS);
     
         /* Read a test document <em>doc1</em> into a POI filesystem. */
@@ -625,8 +626,8 @@ public class TestWriteWellKnown extends TestCase {
             }
         };
 
-        final String dataDirName = System.getProperty("HPSF.testdata.path");
-        final File dataDir = new File(dataDirName);
+        POIDataSamples _samples = POIDataSamples.getHPSFInstance();
+        final File dataDir = _samples.getFile("");
         final File[] docs = dataDir.listFiles(new FileFilter()
         {
             public boolean accept(final File file)
diff --git a/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java b/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
index 3120f3cc0d..6d1478fba0 100644
--- a/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
+++ b/src/testcases/org/apache/poi/hpsf/extractor/TestHPSFPropertiesExtractor.java
@@ -27,18 +27,15 @@ import org.apache.poi.hssf.extractor.ExcelExtractor;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.POIDataSamples;
 
 public final class TestHPSFPropertiesExtractor extends TestCase {
-	private String dir;
-
-	protected void setUp() {
-		dir = System.getProperty("HPSF.testdata.path");
-		assertNotNull("HPSF.testdata.path not set", dir);
-	}
+    private static final POIDataSamples _samples = POIDataSamples.getHPSFInstance();
 
 	public void testNormalProperties() throws Exception {
-		POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
-				new File(dir, "TestMickey.doc")));
+		POIFSFileSystem fs = new POIFSFileSystem(
+                _samples.openResourceAsStream("TestMickey.doc")
+        );
 		HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs);
 		ext.getText();
 
@@ -60,8 +57,9 @@ public final class TestHPSFPropertiesExtractor extends TestCase {
 	}
 
 	public void testNormalUnicodeProperties() throws Exception {
-		POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(new File(dir,
-				"TestUnicode.xls")));
+		POIFSFileSystem fs = new POIFSFileSystem(
+                _samples.openResourceAsStream("TestUnicode.xls")
+        );
 		HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs);
 		ext.getText();
 
@@ -83,8 +81,9 @@ public final class TestHPSFPropertiesExtractor extends TestCase {
 	}
 
 	public void testCustomProperties() throws Exception {
-		POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(
-				new File(dir, "TestMickey.doc")));
+		POIFSFileSystem fs = new POIFSFileSystem(
+                _samples.openResourceAsStream("TestMickey.doc")
+        );
 		HPSFPropertiesExtractor ext = new HPSFPropertiesExtractor(fs);
 
 		// Custom properties are part of the document info stream
@@ -101,7 +100,9 @@ public final class TestHPSFPropertiesExtractor extends TestCase {
 		POIFSFileSystem fs;
 		HSSFWorkbook wb;
 		try {
-			fs = new POIFSFileSystem(new FileInputStream(new File(dir, "TestUnicode.xls")));
+			fs = new POIFSFileSystem(
+                    _samples.openResourceAsStream("TestUnicode.xls")
+            );
 			wb = new HSSFWorkbook(fs);
 		} catch (IOException e) {
 			throw new RuntimeException(e);
diff --git a/src/testcases/org/apache/poi/hslf/data/basic_test_ppt_file.ppt b/src/testcases/org/apache/poi/hslf/data/basic_test_ppt_file.ppt
deleted file mode 100644
index af16393f44..0000000000
--- a/src/testcases/org/apache/poi/hslf/data/basic_test_ppt_file.ppt
+++ /dev/null
diff --git a/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java b/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java
index 6f6a782410..6be47dea05 100755
--- a/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java
+++ b/src/testcases/org/apache/poi/hssf/HSSFITestDataProvider.java
@@ -21,6 +21,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.ITestDataProvider;
 import org.apache.poi.ss.SpreadsheetVersion;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.POIDataSamples;
 
 /**
  * @author Yegor Kozlov
@@ -44,7 +45,7 @@ public final class HSSFITestDataProvider implements ITestDataProvider {
     }
 
     public byte[] getTestDataFileContent(String fileName) {
-        return HSSFTestDataSamples.getTestDataFileContent(fileName);
+        return POIDataSamples.getSpreadSheetInstance().readFile(fileName);
     }
 
     public SpreadsheetVersion getSpreadsheetVersion(){
diff --git a/src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java b/src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java
index cbe4e61cd9..2e4553ff71 100644
--- a/src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java
+++ b/src/testcases/org/apache/poi/hssf/HSSFTestDataSamples.java
@@ -30,17 +30,9 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
  *
  * @author Josh Micich
  */
-public final class HSSFTestDataSamples extends POIDataSamples {
+public final class HSSFTestDataSamples {
 
-	private static final HSSFTestDataSamples _inst = new HSSFTestDataSamples("HSSF.testdata.path", "SampleSS.xls");
-
-	private HSSFTestDataSamples(String dir, String classPathTestFile){
-		super(dir, classPathTestFile);
-	}
-
-	public static POIDataSamples getInstance(){
-		return _inst;
-	}
+	private static final POIDataSamples _inst = POIDataSamples.getSpreadSheetInstance();
 
 	public static InputStream openSampleFileStream(String sampleFileName) {
 		return _inst.openResourceAsStream(sampleFileName);
diff --git a/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java b/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
index 5d2518acec..0e9634e626 100644
--- a/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
+++ b/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
@@ -28,6 +28,8 @@ import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.DirectoryNode;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.POIDataSamples;
+
 /**
  *
  */
@@ -214,11 +216,8 @@ public final class TestExcelExtractor extends TestCase {
 	 * Embded in a non-excel file
 	 */
 	public void testWithEmbeded() throws Exception {
-		// TODO - encapsulate sys prop 'POIFS.testdata.path' similar to HSSFTestDataSamples
-		String pdirname = System.getProperty("POIFS.testdata.path");
-		String filename = pdirname + "/word_with_embeded.doc";
 		POIFSFileSystem fs = new POIFSFileSystem(
-				new FileInputStream(filename)
+			POIDataSamples.getDocumentInstance().openResourceAsStream("word_with_embeded.doc")
 		);
 
 		DirectoryNode objPool = (DirectoryNode) fs.getRoot().getEntry("ObjectPool");
@@ -244,12 +243,10 @@ public final class TestExcelExtractor extends TestCase {
 	 * Excel embeded in excel
 	 */
 	public void testWithEmbededInOwn() throws Exception {
-		// TODO - encapsulate sys prop 'POIFS.testdata.path' similar to HSSFTestDataSamples
-		String pdirname = System.getProperty("POIFS.testdata.path");
-		String filename = pdirname + "/excel_with_embeded.xls";
+        POIDataSamples ssSamples = POIDataSamples.getSpreadSheetInstance();
 		POIFSFileSystem fs = new POIFSFileSystem(
-				new FileInputStream(filename)
-		);
+                ssSamples.openResourceAsStream("excel_with_embeded.xls")
+        );
 
 		DirectoryNode dirA = (DirectoryNode) fs.getRoot().getEntry("MBD0000A3B5");
 		DirectoryNode dirB = (DirectoryNode) fs.getRoot().getEntry("MBD0000A3B4");
diff --git a/src/testcases/org/apache/poi/hwpf/data/test2.doc b/src/testcases/org/apache/poi/hwpf/data/test2.doc
deleted file mode 100755
index 06921df395..0000000000
--- a/src/testcases/org/apache/poi/hwpf/data/test2.doc
+++ /dev/null
diff --git a/src/testcases/org/apache/poi/poifs/data/source-files/sample1.doc b/src/testcases/org/apache/poi/poifs/data/source-files/sample1.doc
deleted file mode 100644
index 0e935aa528..0000000000
--- a/src/testcases/org/apache/poi/poifs/data/source-files/sample1.doc
+++ /dev/null
diff --git a/src/testcases/org/apache/poi/poifs/data/source-files/sample1.ppt b/src/testcases/org/apache/poi/poifs/data/source-files/sample1.ppt
deleted file mode 100644
index 7d72e02362..0000000000
--- a/src/testcases/org/apache/poi/poifs/data/source-files/sample1.ppt
+++ /dev/null
diff --git a/src/testcases/org/apache/poi/poifs/data/source-files/sample1.xls b/src/testcases/org/apache/poi/poifs/data/source-files/sample1.xls
deleted file mode 100644
index c00643cc5a..0000000000
--- a/src/testcases/org/apache/poi/poifs/data/source-files/sample1.xls
+++ /dev/null
diff --git a/src/testcases/org/apache/poi/poifs/data/source-files/sample2.doc b/src/testcases/org/apache/poi/poifs/data/source-files/sample2.doc
deleted file mode 100644
index df5022a041..0000000000
--- a/src/testcases/org/apache/poi/poifs/data/source-files/sample2.doc
+++ /dev/null
diff --git a/src/testcases/org/apache/poi/poifs/data/source-files/sample2.ppt b/src/testcases/org/apache/poi/poifs/data/source-files/sample2.ppt
deleted file mode 100644
index 40227fdca5..0000000000
--- a/src/testcases/org/apache/poi/poifs/data/source-files/sample2.ppt
+++ /dev/null
diff --git a/src/testcases/org/apache/poi/poifs/data/source-files/sample2.xls b/src/testcases/org/apache/poi/poifs/data/source-files/sample2.xls
deleted file mode 100644
index 66a1b1124d..0000000000
--- a/src/testcases/org/apache/poi/poifs/data/source-files/sample2.xls
+++ /dev/null
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java b/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
index 4a948ba8c6..095dd58317 100755
--- a/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
+++ b/src/testcases/org/apache/poi/poifs/filesystem/TestPOIFSFileSystem.java
@@ -26,6 +26,7 @@ import java.io.InputStream;
 import junit.framework.TestCase;
 
 import org.apache.poi.hssf.HSSFTestDataSamples;
+import org.apache.poi.POIDataSamples;
 
 /**
  * Tests for POIFSFileSystem
@@ -134,15 +135,13 @@ public final class TestPOIFSFileSystem extends TestCase {
 		String[] files = new String[] {
 			"ShortLastBlock.qwp", "ShortLastBlock.wps"	
 		};
-		String pdirname = System.getProperty("POIFS.testdata.path");
 
-		for(int i=0; i<files.length; i++) {
-			File f = new File(pdirname, files[i]);
-			assertTrue(f.exists());
-			
+        POIDataSamples _samples = POIDataSamples.getPOIFSInstance();
+        for(int i=0; i<files.length; i++) {
+
 			// Open the file up
 			POIFSFileSystem fs = new POIFSFileSystem(
-					new FileInputStream(f)
+			    _samples.openResourceAsStream(files[i])
 			);
 			
 			// Write it into a temp output array
diff --git a/src/testcases/org/apache/poi/ddf/data/47143.dat b/test-data/ddf/47143.dat
index 0745ce1b99..0745ce1b99 100755
--- a/src/testcases/org/apache/poi/ddf/data/47143.dat
+++ b/test-data/ddf/47143.dat
diff --git a/src/testcases/org/apache/poi/ddf/data/Container.dat b/test-data/ddf/Container.dat
index c1b5447771..c1b5447771 100644
--- a/src/testcases/org/apache/poi/ddf/data/Container.dat
+++ b/test-data/ddf/Container.dat
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/data/44594-2.vsd b/test-data/diagram/44594-2.vsd
index a597a0d938..a597a0d938 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/data/44594-2.vsd
+++ b/test-data/diagram/44594-2.vsd
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/data/44594.vsd b/test-data/diagram/44594.vsd
index abed78b4d6..abed78b4d6 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/data/44594.vsd
+++ b/test-data/diagram/44594.vsd
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/data/NegativeChunkLength.vsd b/test-data/diagram/NegativeChunkLength.vsd
index 58378bdcc9..58378bdcc9 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/data/NegativeChunkLength.vsd
+++ b/test-data/diagram/NegativeChunkLength.vsd
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/data/ShortChunk1.vsd b/test-data/diagram/ShortChunk1.vsd
index 2c1632ebae..2c1632ebae 100755
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/data/ShortChunk1.vsd
+++ b/test-data/diagram/ShortChunk1.vsd
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/data/ShortChunk2.vsd b/test-data/diagram/ShortChunk2.vsd
index 7d9a3cefc6..7d9a3cefc6 100755
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/data/ShortChunk2.vsd
+++ b/test-data/diagram/ShortChunk2.vsd
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/data/ShortChunk3.vsd b/test-data/diagram/ShortChunk3.vsd
index c8bd7a190d..c8bd7a190d 100755
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/data/ShortChunk3.vsd
+++ b/test-data/diagram/ShortChunk3.vsd
diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/data/Test_Visio-Some_Random_Text.vsd b/test-data/diagram/Test_Visio-Some_Random_Text.vsd
index d699e11122..d699e11122 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdgf/data/Test_Visio-Some_Random_Text.vsd
+++ b/test-data/diagram/Test_Visio-Some_Random_Text.vsd
diff --git a/src/testcases/org/apache/poi/poifs/data/visio_with_embeded.xls b/test-data/diagram/visio_with_embeded.vsd
index 91c306fe18..91c306fe18 100644
--- a/src/testcases/org/apache/poi/poifs/data/visio_with_embeded.xls
+++ b/test-data/diagram/visio_with_embeded.vsd
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/AIOOB-Tap.doc b/test-data/document/AIOOB-Tap.doc
index bfd5906caa..bfd5906caa 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/AIOOB-Tap.doc
+++ b/test-data/document/AIOOB-Tap.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug28627.doc b/test-data/document/Bug28627.doc
index 91b031d1d7..91b031d1d7 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug28627.doc
+++ b/test-data/document/Bug28627.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug44292.doc b/test-data/document/Bug44292.doc
index fd7ca6cc3e..fd7ca6cc3e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug44292.doc
+++ b/test-data/document/Bug44292.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug44603.doc b/test-data/document/Bug44603.doc
index 00312ae1e1..00312ae1e1 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug44603.doc
+++ b/test-data/document/Bug44603.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug46610_1.doc b/test-data/document/Bug46610_1.doc
index 4291d9c1d6..4291d9c1d6 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug46610_1.doc
+++ b/test-data/document/Bug46610_1.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug46610_2.doc b/test-data/document/Bug46610_2.doc
index be90831405..be90831405 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug46610_2.doc
+++ b/test-data/document/Bug46610_2.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug46610_3.doc b/test-data/document/Bug46610_3.doc
index 72d60df921..72d60df921 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/Bug46610_3.doc
+++ b/test-data/document/Bug46610_3.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/DiffFirstPageHeadFoot.doc b/test-data/document/DiffFirstPageHeadFoot.doc
index 397aa2f991..397aa2f991 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/DiffFirstPageHeadFoot.doc
+++ b/test-data/document/DiffFirstPageHeadFoot.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/DiffFirstPageHeadFoot.docx b/test-data/document/DiffFirstPageHeadFoot.docx
index d631c77e55..d631c77e55 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/DiffFirstPageHeadFoot.docx
+++ b/test-data/document/DiffFirstPageHeadFoot.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/FancyFoot.doc b/test-data/document/FancyFoot.doc
index 5d3e662457..5d3e662457 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/FancyFoot.doc
+++ b/test-data/document/FancyFoot.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/FancyFoot.docx b/test-data/document/FancyFoot.docx
index 3e571b39df..3e571b39df 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/FancyFoot.docx
+++ b/test-data/document/FancyFoot.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/HeaderFooterUnicode.doc b/test-data/document/HeaderFooterUnicode.doc
index 1b517f6a2e..1b517f6a2e 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/HeaderFooterUnicode.doc
+++ b/test-data/document/HeaderFooterUnicode.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/HeaderFooterUnicode.docx b/test-data/document/HeaderFooterUnicode.docx
index 643967c5e5..643967c5e5 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/HeaderFooterUnicode.docx
+++ b/test-data/document/HeaderFooterUnicode.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/HeaderWithMacros.doc b/test-data/document/HeaderWithMacros.doc
index 934970f58b..934970f58b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/HeaderWithMacros.doc
+++ b/test-data/document/HeaderWithMacros.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/IllustrativeCases.docx b/test-data/document/IllustrativeCases.docx
index 29dacb652e..29dacb652e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/IllustrativeCases.docx
+++ b/test-data/document/IllustrativeCases.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ListEntryNoListTable.doc b/test-data/document/ListEntryNoListTable.doc
index 939f5a4a9e..939f5a4a9e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ListEntryNoListTable.doc
+++ b/test-data/document/ListEntryNoListTable.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/NoHeadFoot.doc b/test-data/document/NoHeadFoot.doc
index 8c95f4725a..8c95f4725a 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/NoHeadFoot.doc
+++ b/test-data/document/NoHeadFoot.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/NoHeadFoot.docx b/test-data/document/NoHeadFoot.docx
index 7af2a14583..7af2a14583 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/NoHeadFoot.docx
+++ b/test-data/document/NoHeadFoot.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/PageSpecificHeadFoot.doc b/test-data/document/PageSpecificHeadFoot.doc
index 26866afae5..26866afae5 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/PageSpecificHeadFoot.doc
+++ b/test-data/document/PageSpecificHeadFoot.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/PageSpecificHeadFoot.docx b/test-data/document/PageSpecificHeadFoot.docx
index 13097b9901..13097b9901 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/PageSpecificHeadFoot.docx
+++ b/test-data/document/PageSpecificHeadFoot.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/PasswordProtected.doc b/test-data/document/PasswordProtected.doc
index 0d6c169063..0d6c169063 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/PasswordProtected.doc
+++ b/test-data/document/PasswordProtected.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ProblemExtracting.doc b/test-data/document/ProblemExtracting.doc
index b980089439..b980089439 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ProblemExtracting.doc
+++ b/test-data/document/ProblemExtracting.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/SampleDoc.doc b/test-data/document/SampleDoc.doc
index e82c7def3f..e82c7def3f 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/SampleDoc.doc
+++ b/test-data/document/SampleDoc.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/SampleDoc.docx b/test-data/document/SampleDoc.docx
index a43c77ae23..a43c77ae23 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/SampleDoc.docx
+++ b/test-data/document/SampleDoc.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/SampleDoc.txt b/test-data/document/SampleDoc.txt
index 6b5fd46554..6b5fd46554 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/SampleDoc.txt
+++ b/test-data/document/SampleDoc.txt
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/SimpleHeadThreeColFoot.doc b/test-data/document/SimpleHeadThreeColFoot.doc
index 2f8daec639..2f8daec639 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/SimpleHeadThreeColFoot.doc
+++ b/test-data/document/SimpleHeadThreeColFoot.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/SimpleHeadThreeColFoot.docx b/test-data/document/SimpleHeadThreeColFoot.docx
index fb17df23a4..fb17df23a4 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/SimpleHeadThreeColFoot.docx
+++ b/test-data/document/SimpleHeadThreeColFoot.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/TestDocument.docx b/test-data/document/TestDocument.docx
index 058dec5e4c..058dec5e4c 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/TestDocument.docx
+++ b/test-data/document/TestDocument.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColFoot.doc b/test-data/document/ThreeColFoot.doc
index d0d6daf77d..d0d6daf77d 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColFoot.doc
+++ b/test-data/document/ThreeColFoot.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColFoot.docx b/test-data/document/ThreeColFoot.docx
index b01e35636c..b01e35636c 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColFoot.docx
+++ b/test-data/document/ThreeColFoot.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColHead.doc b/test-data/document/ThreeColHead.doc
index 1a49b962a0..1a49b962a0 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColHead.doc
+++ b/test-data/document/ThreeColHead.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColHead.docx b/test-data/document/ThreeColHead.docx
index 448d046d32..448d046d32 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColHead.docx
+++ b/test-data/document/ThreeColHead.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColHeadFoot.doc b/test-data/document/ThreeColHeadFoot.doc
index 67e77de80d..67e77de80d 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColHeadFoot.doc
+++ b/test-data/document/ThreeColHeadFoot.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColHeadFoot.docx b/test-data/document/ThreeColHeadFoot.docx
index 51602ccfe3..51602ccfe3 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/ThreeColHeadFoot.docx
+++ b/test-data/document/ThreeColHeadFoot.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/WithArtShapes.doc b/test-data/document/WithArtShapes.doc
index 27793c37a4..27793c37a4 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/WithArtShapes.doc
+++ b/test-data/document/WithArtShapes.doc
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/data/WordWithAttachments.docx b/test-data/document/WordWithAttachments.docx
index ebefabc443..ebefabc443 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/data/WordWithAttachments.docx
+++ b/test-data/document/WordWithAttachments.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/delins.docx b/test-data/document/delins.docx
index b53069135b..b53069135b 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/delins.docx
+++ b/test-data/document/delins.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/documentProperties.docx b/test-data/document/documentProperties.docx
index 4ec577ee93..4ec577ee93 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/documentProperties.docx
+++ b/test-data/document/documentProperties.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/emf_2003_image.doc b/test-data/document/emf_2003_image.doc
index a475813c87..a475813c87 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/emf_2003_image.doc
+++ b/test-data/document/emf_2003_image.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hdf/data/empty.doc b/test-data/document/empty.doc
index 1b4ac2d922..1b4ac2d922 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdf/data/empty.doc
+++ b/test-data/document/empty.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/endnotes.docx b/test-data/document/endnotes.docx
index a5db3492c3..a5db3492c3 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/endnotes.docx
+++ b/test-data/document/endnotes.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/footnote.doc b/test-data/document/footnote.doc
index 5e11a4437f..5e11a4437f 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/footnote.doc
+++ b/test-data/document/footnote.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/footnotes.docx b/test-data/document/footnotes.docx
index db4386c09c..db4386c09c 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/footnotes.docx
+++ b/test-data/document/footnotes.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/form_footnotes.docx b/test-data/document/form_footnotes.docx
index 70abb60c9a..70abb60c9a 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/form_footnotes.docx
+++ b/test-data/document/form_footnotes.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/headerFooter.docx b/test-data/document/headerFooter.docx
index 87a86c302f..87a86c302f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/headerFooter.docx
+++ b/test-data/document/headerFooter.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/sample.docx b/test-data/document/sample.docx
index 8dd04bcdb8..8dd04bcdb8 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/sample.docx
+++ b/test-data/document/sample.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/saved-by-table.doc b/test-data/document/saved-by-table.doc
index c3ea6bc861..c3ea6bc861 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/saved-by-table.doc
+++ b/test-data/document/saved-by-table.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hdf/data/simple-list.doc b/test-data/document/simple-list.doc
index 8ff94b21e8..8ff94b21e8 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdf/data/simple-list.doc
+++ b/test-data/document/simple-list.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hdf/data/simple-table.doc b/test-data/document/simple-table.doc
index 5249334172..5249334172 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdf/data/simple-table.doc
+++ b/test-data/document/simple-table.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hdf/data/simple.doc b/test-data/document/simple.doc
index 11262f996e..11262f996e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hdf/data/simple.doc
+++ b/test-data/document/simple.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/simple_image.jpg b/test-data/document/simple_image.jpg
index af68bcabf7..af68bcabf7 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/simple_image.jpg
+++ b/test-data/document/simple_image.jpg
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/simple_image.png b/test-data/document/simple_image.png
index a9120d70db..a9120d70db 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/simple_image.png
+++ b/test-data/document/simple_image.png
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/table_footnotes.docx b/test-data/document/table_footnotes.docx
index f4d0b2bd03..f4d0b2bd03 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/table_footnotes.docx
+++ b/test-data/document/table_footnotes.docx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/test.doc b/test-data/document/test.doc
index c183d57dd8..c183d57dd8 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/test.doc
+++ b/test-data/document/test.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/test.dotx b/test-data/document/test.dotx
index 0b74e39326..0b74e39326 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/test.dotx
+++ b/test-data/document/test.dotx
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/test2.doc b/test-data/document/test2.doc
index 06921df395..06921df395 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/test2.doc
+++ b/test-data/document/test2.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/testPictures.doc b/test-data/document/testPictures.doc
index d031993cd7..d031993cd7 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/testPictures.doc
+++ b/test-data/document/testPictures.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/testRangeDelete.doc b/test-data/document/testRangeDelete.doc
index 896108397c..896108397c 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/testRangeDelete.doc
+++ b/test-data/document/testRangeDelete.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/testRangeInsertion.doc b/test-data/document/testRangeInsertion.doc
index 322431c27b..322431c27b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/testRangeInsertion.doc
+++ b/test-data/document/testRangeInsertion.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/testRangeReplacement.doc b/test-data/document/testRangeReplacement.doc
index 949980d4e1..949980d4e1 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/testRangeReplacement.doc
+++ b/test-data/document/testRangeReplacement.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/two_images.doc b/test-data/document/two_images.doc
index f94867d229..f94867d229 100755
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/two_images.doc
+++ b/test-data/document/two_images.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/vector_image.doc b/test-data/document/vector_image.doc
index 8922471888..8922471888 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/vector_image.doc
+++ b/test-data/document/vector_image.doc
diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/data/vector_image.emf b/test-data/document/vector_image.emf
index ccd53057d0..ccd53057d0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hwpf/data/vector_image.emf
+++ b/test-data/document/vector_image.emf
diff --git a/src/testcases/org/apache/poi/poifs/data/word_with_embeded.doc b/test-data/document/word_with_embeded.doc
index 36417221d7..36417221d7 100644
--- a/src/testcases/org/apache/poi/poifs/data/word_with_embeded.doc
+++ b/test-data/document/word_with_embeded.doc
diff --git a/src/testcases/org/apache/poi/hpsf/data/Test0313rur.adm b/test-data/hpsf/Test0313rur.adm
index 1e1f9547be..1e1f9547be 100644
--- a/src/testcases/org/apache/poi/hpsf/data/Test0313rur.adm
+++ b/test-data/hpsf/Test0313rur.adm
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestBug44375.xls b/test-data/hpsf/TestBug44375.xls
index 0ebd762934..0ebd762934 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestBug44375.xls
+++ b/test-data/hpsf/TestBug44375.xls
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestChineseProperties.doc b/test-data/hpsf/TestChineseProperties.doc
index fd2b478e4c..fd2b478e4c 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestChineseProperties.doc
+++ b/test-data/hpsf/TestChineseProperties.doc
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestCorel.shw b/test-data/hpsf/TestCorel.shw
index e0af1945e8..e0af1945e8 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestCorel.shw
+++ b/test-data/hpsf/TestCorel.shw
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestEditTime.doc b/test-data/hpsf/TestEditTime.doc
index 8b30417dea..8b30417dea 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestEditTime.doc
+++ b/test-data/hpsf/TestEditTime.doc
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestGermanWord90.doc b/test-data/hpsf/TestGermanWord90.doc
index 63bbed326e..63bbed326e 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestGermanWord90.doc
+++ b/test-data/hpsf/TestGermanWord90.doc
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestMickey.doc b/test-data/hpsf/TestMickey.doc
index f62ade3161..f62ade3161 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestMickey.doc
+++ b/test-data/hpsf/TestMickey.doc
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestRobert_Flaherty.doc b/test-data/hpsf/TestRobert_Flaherty.doc
index ee3e14296b..ee3e14296b 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestRobert_Flaherty.doc
+++ b/test-data/hpsf/TestRobert_Flaherty.doc
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestSectionDictionary.doc b/test-data/hpsf/TestSectionDictionary.doc
index 6114a76572..6114a76572 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestSectionDictionary.doc
+++ b/test-data/hpsf/TestSectionDictionary.doc
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestShiftJIS.doc b/test-data/hpsf/TestShiftJIS.doc
index f8516d3a75..f8516d3a75 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestShiftJIS.doc
+++ b/test-data/hpsf/TestShiftJIS.doc
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestSolidWorks.sldprt b/test-data/hpsf/TestSolidWorks.sldprt
index a7962b369f..a7962b369f 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestSolidWorks.sldprt
+++ b/test-data/hpsf/TestSolidWorks.sldprt
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestUnicode.xls b/test-data/hpsf/TestUnicode.xls
index 30c8f3c1c1..30c8f3c1c1 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestUnicode.xls
+++ b/test-data/hpsf/TestUnicode.xls
diff --git a/src/testcases/org/apache/poi/hpsf/data/TestWriteWellKnown.doc b/test-data/hpsf/TestWriteWellKnown.doc
index d3a0433041..d3a0433041 100644
--- a/src/testcases/org/apache/poi/hpsf/data/TestWriteWellKnown.doc
+++ b/test-data/hpsf/TestWriteWellKnown.doc
diff --git a/src/testcases/org/apache/poi/hpsf/data/Test_Humor-Generation.ppt b/test-data/hpsf/Test_Humor-Generation.ppt
index e5763ccca1..7408832478 100644
--- a/src/testcases/org/apache/poi/hpsf/data/Test_Humor-Generation.ppt
+++ b/test-data/hpsf/Test_Humor-Generation.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/data/attachment_test_msg.msg b/test-data/hsmf/attachment_test_msg.msg
index ea82d915ed..ea82d915ed 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/data/attachment_test_msg.msg
+++ b/test-data/hsmf/attachment_test_msg.msg
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/data/blank.msg b/test-data/hsmf/blank.msg
index 0bdb812401..0bdb812401 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/data/blank.msg
+++ b/test-data/hsmf/blank.msg
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/data/outlook_30_msg.msg b/test-data/hsmf/outlook_30_msg.msg
index 0a585699a2..0a585699a2 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/data/outlook_30_msg.msg
+++ b/test-data/hsmf/outlook_30_msg.msg
diff --git a/src/scratchpad/testcases/org/apache/poi/hsmf/data/simple_test_msg.msg b/test-data/hsmf/simple_test_msg.msg
index 731fecc236..731fecc236 100644
--- a/src/scratchpad/testcases/org/apache/poi/hsmf/data/simple_test_msg.msg
+++ b/test-data/hsmf/simple_test_msg.msg
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/ExcelWithHyperlinks.xlsx b/test-data/openxml4j/ExcelWithHyperlinks.xlsx
index ba5ed27d23..ba5ed27d23 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/ExcelWithHyperlinks.xlsx
+++ b/test-data/openxml4j/ExcelWithHyperlinks.xlsx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx b/test-data/openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
index 89533f0310..89533f0310 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
+++ b/test-data/openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx b/test-data/openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
index 63555e47db..63555e47db 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
+++ b/test-data/openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx b/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
index 304e5ce288..304e5ce288 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
+++ b/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx b/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
index 7b4f765e6f..7b4f765e6f 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
+++ b/test-data/openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx b/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
index 7a63ee15d6..7a63ee15d6 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
+++ b/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx b/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
index 3ee9fc3339..3ee9fc3339 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
+++ b/test-data/openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_SUCCESS.docx b/test-data/openxml4j/OPCCompliance_CoreProperties_SUCCESS.docx
index 7a63ee15d6..7a63ee15d6 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_SUCCESS.docx
+++ b/test-data/openxml4j/OPCCompliance_CoreProperties_SUCCESS.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx b/test-data/openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
index 3984aeafc3..3984aeafc3 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
+++ b/test-data/openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_DerivedPartNameFAIL.docx b/test-data/openxml4j/OPCCompliance_DerivedPartNameFAIL.docx
index 8ccfb6155c..8ccfb6155c 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/data/OPCCompliance_DerivedPartNameFAIL.docx
+++ b/test-data/openxml4j/OPCCompliance_DerivedPartNameFAIL.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestOpenPackageINPUT.docx b/test-data/openxml4j/TestOpenPackageINPUT.docx
index dc105f0046..dc105f0046 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestOpenPackageINPUT.docx
+++ b/test-data/openxml4j/TestOpenPackageINPUT.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCommon.docx b/test-data/openxml4j/TestPackageCommon.docx
index 771cd18145..771cd18145 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCommon.docx
+++ b/test-data/openxml4j/TestPackageCommon.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesGetters.docx b/test-data/openxml4j/TestPackageCoreProperiesGetters.docx
index 2d8bb359b5..2d8bb359b5 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesGetters.docx
+++ b/test-data/openxml4j/TestPackageCoreProperiesGetters.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesSetters.docx b/test-data/openxml4j/TestPackageCoreProperiesSetters.docx
index 2d8bb359b5..2d8bb359b5 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageCoreProperiesSetters.docx
+++ b/test-data/openxml4j/TestPackageCoreProperiesSetters.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageThumbnail.docx b/test-data/openxml4j/TestPackageThumbnail.docx
index ccc990df33..ccc990df33 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/TestPackageThumbnail.docx
+++ b/test-data/openxml4j/TestPackageThumbnail.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.docx b/test-data/openxml4j/sample.docx
index 8e77521434..8e77521434 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.docx
+++ b/test-data/openxml4j/sample.docx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.xlsx b/test-data/openxml4j/sample.xlsx
index a275cf417e..a275cf417e 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/sample.xlsx
+++ b/test-data/openxml4j/sample.xlsx
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/thumbnail.jpg b/test-data/openxml4j/thumbnail.jpg
index 5119960023..5119960023 100755
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/data/thumbnail.jpg
+++ b/test-data/openxml4j/thumbnail.jpg
diff --git a/src/testcases/org/apache/poi/poifs/data/ShortLastBlock.qwp b/test-data/poifs/ShortLastBlock.qwp
index b278d06c20..b278d06c20 100644
--- a/src/testcases/org/apache/poi/poifs/data/ShortLastBlock.qwp
+++ b/test-data/poifs/ShortLastBlock.qwp
diff --git a/src/testcases/org/apache/poi/poifs/data/ShortLastBlock.wps b/test-data/poifs/ShortLastBlock.wps
index 1b1a627a99..1b1a627a99 100644
--- a/src/testcases/org/apache/poi/poifs/data/ShortLastBlock.wps
+++ b/test-data/poifs/ShortLastBlock.wps
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt0And10.pub b/test-data/publisher/LinkAt0And10.pub
index c4459fb830..c4459fb830 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt0And10.pub
+++ b/test-data/publisher/LinkAt0And10.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt10.pub b/test-data/publisher/LinkAt10.pub
index 89c4a44271..89c4a44271 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt10.pub
+++ b/test-data/publisher/LinkAt10.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt10And20And30.pub b/test-data/publisher/LinkAt10And20And30.pub
index 5f7f747d5b..5f7f747d5b 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt10And20And30.pub
+++ b/test-data/publisher/LinkAt10And20And30.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt10And20And30And40.pub b/test-data/publisher/LinkAt10And20And30And40.pub
index d19ddc46a3..d19ddc46a3 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt10And20And30And40.pub
+++ b/test-data/publisher/LinkAt10And20And30And40.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt10Longer.pub b/test-data/publisher/LinkAt10Longer.pub
index 8a3dcc277e..8a3dcc277e 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt10Longer.pub
+++ b/test-data/publisher/LinkAt10Longer.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt20.pub b/test-data/publisher/LinkAt20.pub
index 091a38c718..091a38c718 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/LinkAt20.pub
+++ b/test-data/publisher/LinkAt20.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample.pub b/test-data/publisher/Sample.pub
index b870168319..b870168319 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample.pub
+++ b/test-data/publisher/Sample.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample.txt b/test-data/publisher/Sample.txt
index 279395e5de..279395e5de 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample.txt
+++ b/test-data/publisher/Sample.txt
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample2.pub b/test-data/publisher/Sample2.pub
index 610362c471..610362c471 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample2.pub
+++ b/test-data/publisher/Sample2.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample2.txt b/test-data/publisher/Sample2.txt
index f8a68bb649..f8a68bb649 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample2.txt
+++ b/test-data/publisher/Sample2.txt
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample2000.pub b/test-data/publisher/Sample2000.pub
index 2c6174e5e8..2c6174e5e8 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample2000.pub
+++ b/test-data/publisher/Sample2000.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample3.pub b/test-data/publisher/Sample3.pub
index 4f19bec93d..4f19bec93d 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample3.pub
+++ b/test-data/publisher/Sample3.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample3.txt b/test-data/publisher/Sample3.txt
index c2d791b9af..c2d791b9af 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample3.txt
+++ b/test-data/publisher/Sample3.txt
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample4.pub b/test-data/publisher/Sample4.pub
index 445df85f09..445df85f09 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample4.pub
+++ b/test-data/publisher/Sample4.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample4.txt b/test-data/publisher/Sample4.txt
index 279395e5de..279395e5de 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample4.txt
+++ b/test-data/publisher/Sample4.txt
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample98.pub b/test-data/publisher/Sample98.pub
index 8adffda77a..8adffda77a 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Sample98.pub
+++ b/test-data/publisher/Sample98.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/SampleBrochure.pub b/test-data/publisher/SampleBrochure.pub
index 00deec14dc..00deec14dc 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/SampleBrochure.pub
+++ b/test-data/publisher/SampleBrochure.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/SampleNewsletter.pub b/test-data/publisher/SampleNewsletter.pub
index 94900925af..94900925af 100644
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/SampleNewsletter.pub
+++ b/test-data/publisher/SampleNewsletter.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Simple.pub b/test-data/publisher/Simple.pub
index 2397b9d01c..2397b9d01c 100755
--- a/src/scratchpad/testcases/org/apache/poi/hpbf/data/Simple.pub
+++ b/test-data/publisher/Simple.pub
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/38256.ppt b/test-data/slideshow/38256.ppt
index a0883bda00..a0883bda00 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/38256.ppt
+++ b/test-data/slideshow/38256.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/41071.ppt b/test-data/slideshow/41071.ppt
index 4a443025e2..4a443025e2 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/41071.ppt
+++ b/test-data/slideshow/41071.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/41384.ppt b/test-data/slideshow/41384.ppt
index 7a206ecdd6..7a206ecdd6 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/41384.ppt
+++ b/test-data/slideshow/41384.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/42474-1.ppt b/test-data/slideshow/42474-1.ppt
index 15b654d26f..15b654d26f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/42474-1.ppt
+++ b/test-data/slideshow/42474-1.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/42474-2.ppt b/test-data/slideshow/42474-2.ppt
index 5c6f8ca90a..5c6f8ca90a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/42474-2.ppt
+++ b/test-data/slideshow/42474-2.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/42485.ppt b/test-data/slideshow/42485.ppt
index e9e3dda1e5..e9e3dda1e5 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/42485.ppt
+++ b/test-data/slideshow/42485.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/42486.ppt b/test-data/slideshow/42486.ppt
index af45163c5f..af45163c5f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/42486.ppt
+++ b/test-data/slideshow/42486.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/42520.ppt b/test-data/slideshow/42520.ppt
index 15bcf64106..15bcf64106 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/42520.ppt
+++ b/test-data/slideshow/42520.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/43781.ppt b/test-data/slideshow/43781.ppt
index ddea91fe89..ddea91fe89 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/43781.ppt
+++ b/test-data/slideshow/43781.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/44296.ppt b/test-data/slideshow/44296.ppt
index 1e0529db1d..1e0529db1d 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/44296.ppt
+++ b/test-data/slideshow/44296.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/44770.ppt b/test-data/slideshow/44770.ppt
index d7ae12b569..d7ae12b569 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/44770.ppt
+++ b/test-data/slideshow/44770.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/45537_Footer.ppt b/test-data/slideshow/45537_Footer.ppt
index f358b14e9d..f358b14e9d 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/45537_Footer.ppt
+++ b/test-data/slideshow/45537_Footer.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/45537_Header.ppt b/test-data/slideshow/45537_Header.ppt
index e09d7752b7..e09d7752b7 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/45537_Header.ppt
+++ b/test-data/slideshow/45537_Header.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/45541_Footer.pptx b/test-data/slideshow/45541_Footer.pptx
index 84e3f47cd0..84e3f47cd0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/45541_Footer.pptx
+++ b/test-data/slideshow/45541_Footer.pptx
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/45541_Header.pptx b/test-data/slideshow/45541_Header.pptx
index fe7b7a1149..fe7b7a1149 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/45541_Header.pptx
+++ b/test-data/slideshow/45541_Header.pptx
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/45543.ppt b/test-data/slideshow/45543.ppt
index d5b04f8d55..d5b04f8d55 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/45543.ppt
+++ b/test-data/slideshow/45543.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/45545_Comment.pptx b/test-data/slideshow/45545_Comment.pptx
index ce34eeac3d..ce34eeac3d 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/45545_Comment.pptx
+++ b/test-data/slideshow/45545_Comment.pptx
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/47261.ppt b/test-data/slideshow/47261.ppt
index 7a26a7981e..7a26a7981e 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/47261.ppt
+++ b/test-data/slideshow/47261.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/PPT95.ppt b/test-data/slideshow/PPT95.ppt
index 3f338d433b..3f338d433b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/PPT95.ppt
+++ b/test-data/slideshow/PPT95.ppt
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/data/PPTWithAttachments.pptm b/test-data/slideshow/PPTWithAttachments.pptm
index 00b148da14..00b148da14 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/data/PPTWithAttachments.pptm
+++ b/test-data/slideshow/PPTWithAttachments.pptm
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/ParagraphStylesShorterThanCharStyles.ppt b/test-data/slideshow/ParagraphStylesShorterThanCharStyles.ppt
index 19a8a75a53..19a8a75a53 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/ParagraphStylesShorterThanCharStyles.ppt
+++ b/test-data/slideshow/ParagraphStylesShorterThanCharStyles.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/Password_Protected-56-hello.ppt b/test-data/slideshow/Password_Protected-56-hello.ppt
index d1e5d6617c..d1e5d6617c 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/Password_Protected-56-hello.ppt
+++ b/test-data/slideshow/Password_Protected-56-hello.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/Password_Protected-hello.ppt b/test-data/slideshow/Password_Protected-hello.ppt
index 3bbab4d5c0..3bbab4d5c0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/Password_Protected-hello.ppt
+++ b/test-data/slideshow/Password_Protected-hello.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/Password_Protected-np-hello.ppt b/test-data/slideshow/Password_Protected-np-hello.ppt
index 8634183731..8634183731 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/Password_Protected-np-hello.ppt
+++ b/test-data/slideshow/Password_Protected-np-hello.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/PictureLengthZero.ppt b/test-data/slideshow/PictureLengthZero.ppt
index 1cb0cda0fa..1cb0cda0fa 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/PictureLengthZero.ppt
+++ b/test-data/slideshow/PictureLengthZero.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/PictureTypeZero.ppt b/test-data/slideshow/PictureTypeZero.ppt
index 66b4e50c00..66b4e50c00 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/PictureTypeZero.ppt
+++ b/test-data/slideshow/PictureTypeZero.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/SampleShow.ppt b/test-data/slideshow/SampleShow.ppt
index 81b99e100f..81b99e100f 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/SampleShow.ppt
+++ b/test-data/slideshow/SampleShow.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/SampleShow.pptx b/test-data/slideshow/SampleShow.pptx
index e5237f4c15..e5237f4c15 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/SampleShow.pptx
+++ b/test-data/slideshow/SampleShow.pptx
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/SampleShow.txt b/test-data/slideshow/SampleShow.txt
index ccfe4d2714..ccfe4d2714 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/SampleShow.txt
+++ b/test-data/slideshow/SampleShow.txt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/Single_Coloured_Page.ppt b/test-data/slideshow/Single_Coloured_Page.ppt
index 4555025128..4555025128 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/Single_Coloured_Page.ppt
+++ b/test-data/slideshow/Single_Coloured_Page.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/Single_Coloured_Page_With_Fonts_and_Alignments.ppt b/test-data/slideshow/Single_Coloured_Page_With_Fonts_and_Alignments.ppt
index a177642c9e..a177642c9e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/Single_Coloured_Page_With_Fonts_and_Alignments.ppt
+++ b/test-data/slideshow/Single_Coloured_Page_With_Fonts_and_Alignments.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/WithComments.ppt b/test-data/slideshow/WithComments.ppt
index 2b5f8642e4..2b5f8642e4 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/WithComments.ppt
+++ b/test-data/slideshow/WithComments.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/WithLinks.ppt b/test-data/slideshow/WithLinks.ppt
index f08a81a09b..f08a81a09b 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/WithLinks.ppt
+++ b/test-data/slideshow/WithLinks.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/WithMacros.ppt b/test-data/slideshow/WithMacros.ppt
index 1c72231531..1c72231531 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/WithMacros.ppt
+++ b/test-data/slideshow/WithMacros.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/alterman_security.ppt b/test-data/slideshow/alterman_security.ppt
index 72c2261334..72c2261334 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/alterman_security.ppt
+++ b/test-data/slideshow/alterman_security.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/backgrounds.ppt b/test-data/slideshow/backgrounds.ppt
index 591efafef2..591efafef2 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/backgrounds.ppt
+++ b/test-data/slideshow/backgrounds.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/basic_test_ppt_file.ppt b/test-data/slideshow/basic_test_ppt_file.ppt
index af16393f44..af16393f44 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/basic_test_ppt_file.ppt
+++ b/test-data/slideshow/basic_test_ppt_file.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/bug-41015.ppt b/test-data/slideshow/bug-41015.ppt
index b804a60210..b804a60210 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/bug-41015.ppt
+++ b/test-data/slideshow/bug-41015.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/bullets.ppt b/test-data/slideshow/bullets.ppt
index be2f8bba9f..be2f8bba9f 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/bullets.ppt
+++ b/test-data/slideshow/bullets.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/clock.jpg b/test-data/slideshow/clock.jpg
index 5f05e42eac..5f05e42eac 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/clock.jpg
+++ b/test-data/slideshow/clock.jpg
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/cow.pict b/test-data/slideshow/cow.pict
index 71b81d2540..71b81d2540 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/cow.pict
+++ b/test-data/slideshow/cow.pict
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/empty.ppt b/test-data/slideshow/empty.ppt
index 20d2398e39..20d2398e39 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/empty.ppt
+++ b/test-data/slideshow/empty.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/empty_textbox.ppt b/test-data/slideshow/empty_textbox.ppt
index 403b2861e2..403b2861e2 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/empty_textbox.ppt
+++ b/test-data/slideshow/empty_textbox.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/headers_footers.ppt b/test-data/slideshow/headers_footers.ppt
index 891d73f95e..891d73f95e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/headers_footers.ppt
+++ b/test-data/slideshow/headers_footers.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/headers_footers_2007.ppt b/test-data/slideshow/headers_footers_2007.ppt
index 51b2c53b62..51b2c53b62 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/headers_footers_2007.ppt
+++ b/test-data/slideshow/headers_footers_2007.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/iisd_report.ppt b/test-data/slideshow/iisd_report.ppt
index 976fa94b6a..976fa94b6a 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/iisd_report.ppt
+++ b/test-data/slideshow/iisd_report.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/incorrect_slide_order.ppt b/test-data/slideshow/incorrect_slide_order.ppt
index 6aead5df97..6aead5df97 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/incorrect_slide_order.ppt
+++ b/test-data/slideshow/incorrect_slide_order.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/missing_core_records.ppt b/test-data/slideshow/missing_core_records.ppt
index 67325ebcf6..67325ebcf6 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/missing_core_records.ppt
+++ b/test-data/slideshow/missing_core_records.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/next_test_ppt_file.ppt b/test-data/slideshow/next_test_ppt_file.ppt
index 69b2c47877..69b2c47877 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/next_test_ppt_file.ppt
+++ b/test-data/slideshow/next_test_ppt_file.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/ole2-embedding-2003.ppt b/test-data/slideshow/ole2-embedding-2003.ppt
index 506888fdbb..506888fdbb 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/ole2-embedding-2003.ppt
+++ b/test-data/slideshow/ole2-embedding-2003.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/painting.png b/test-data/slideshow/painting.png
index 28f1233008..28f1233008 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/painting.png
+++ b/test-data/slideshow/painting.png
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/pictures.ppt b/test-data/slideshow/pictures.ppt
index 9f6ce6dea1..9f6ce6dea1 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/pictures.ppt
+++ b/test-data/slideshow/pictures.ppt
diff --git a/src/testcases/org/apache/poi/poifs/data/ppt_with_embeded.ppt b/test-data/slideshow/ppt_with_embeded.ppt
index 588dcefe93..588dcefe93 100644
--- a/src/testcases/org/apache/poi/poifs/data/ppt_with_embeded.ppt
+++ b/test-data/slideshow/ppt_with_embeded.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/ppt_with_png.ppt b/test-data/slideshow/ppt_with_png.ppt
index 0e0ac673a2..0e0ac673a2 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/ppt_with_png.ppt
+++ b/test-data/slideshow/ppt_with_png.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/ringin.wav b/test-data/slideshow/ringin.wav
index f8d4292d0f..f8d4292d0f 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/ringin.wav
+++ b/test-data/slideshow/ringin.wav
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/sample.pptx b/test-data/slideshow/sample.pptx
index fbd540c1e0..fbd540c1e0 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/sample.pptx
+++ b/test-data/slideshow/sample.pptx
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/santa.wmf b/test-data/slideshow/santa.wmf
index 20993ba952..20993ba952 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/santa.wmf
+++ b/test-data/slideshow/santa.wmf
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/sci_cec.dib b/test-data/slideshow/sci_cec.dib
index 61bfb62546..61bfb62546 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/sci_cec.dib
+++ b/test-data/slideshow/sci_cec.dib
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/slide_master.ppt b/test-data/slideshow/slide_master.ppt
index 0889a5d64e..0889a5d64e 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/slide_master.ppt
+++ b/test-data/slideshow/slide_master.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/sound.ppt b/test-data/slideshow/sound.ppt
index 2d1316acf3..2d1316acf3 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/sound.ppt
+++ b/test-data/slideshow/sound.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/text-margins.ppt b/test-data/slideshow/text-margins.ppt
index cf539aea74..cf539aea74 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/text-margins.ppt
+++ b/test-data/slideshow/text-margins.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/text_shapes.ppt b/test-data/slideshow/text_shapes.ppt
index c36183ac35..c36183ac35 100755
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/text_shapes.ppt
+++ b/test-data/slideshow/text_shapes.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/tomcat.png b/test-data/slideshow/tomcat.png
index b10c6b75ff..b10c6b75ff 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/tomcat.png
+++ b/test-data/slideshow/tomcat.png
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/with_textbox.ppt b/test-data/slideshow/with_textbox.ppt
index d79584f6b2..d79584f6b2 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/with_textbox.ppt
+++ b/test-data/slideshow/with_textbox.ppt
diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/data/wrench.emf b/test-data/slideshow/wrench.emf
index 80016074b9..80016074b9 100644
--- a/src/scratchpad/testcases/org/apache/poi/hslf/data/wrench.emf
+++ b/test-data/slideshow/wrench.emf
diff --git a/src/testcases/org/apache/poi/hssf/data/12561-1.xls b/test-data/spreadsheet/12561-1.xls
index 40b7276cb8..40b7276cb8 100755
--- a/src/testcases/org/apache/poi/hssf/data/12561-1.xls
+++ b/test-data/spreadsheet/12561-1.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/12561-2.xls b/test-data/spreadsheet/12561-2.xls
index bb360c1ab4..bb360c1ab4 100755
--- a/src/testcases/org/apache/poi/hssf/data/12561-2.xls
+++ b/test-data/spreadsheet/12561-2.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/12843-1.xls b/test-data/spreadsheet/12843-1.xls
index 0ef5df4264..0ef5df4264 100644
--- a/src/testcases/org/apache/poi/hssf/data/12843-1.xls
+++ b/test-data/spreadsheet/12843-1.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/12843-2.xls b/test-data/spreadsheet/12843-2.xls
index beff64650f..beff64650f 100644
--- a/src/testcases/org/apache/poi/hssf/data/12843-2.xls
+++ b/test-data/spreadsheet/12843-2.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/13224.xls b/test-data/spreadsheet/13224.xls
index 81f69d3334..81f69d3334 100755
--- a/src/testcases/org/apache/poi/hssf/data/13224.xls
+++ b/test-data/spreadsheet/13224.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/13796.xls b/test-data/spreadsheet/13796.xls
index efae53f48d..efae53f48d 100644
--- a/src/testcases/org/apache/poi/hssf/data/13796.xls
+++ b/test-data/spreadsheet/13796.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/14330-1.xls b/test-data/spreadsheet/14330-1.xls
index 6fd2d9524a..6fd2d9524a 100644
--- a/src/testcases/org/apache/poi/hssf/data/14330-1.xls
+++ b/test-data/spreadsheet/14330-1.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/14330-2.xls b/test-data/spreadsheet/14330-2.xls
index 8e56a6df3d..8e56a6df3d 100644
--- a/src/testcases/org/apache/poi/hssf/data/14330-2.xls
+++ b/test-data/spreadsheet/14330-2.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/14460.xls b/test-data/spreadsheet/14460.xls
index 284d684613..284d684613 100644
--- a/src/testcases/org/apache/poi/hssf/data/14460.xls
+++ b/test-data/spreadsheet/14460.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/15228.xls b/test-data/spreadsheet/15228.xls
index 3b26ed1e90..3b26ed1e90 100644
--- a/src/testcases/org/apache/poi/hssf/data/15228.xls
+++ b/test-data/spreadsheet/15228.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/15375.xls b/test-data/spreadsheet/15375.xls
index 99ab193be6..99ab193be6 100644
--- a/src/testcases/org/apache/poi/hssf/data/15375.xls
+++ b/test-data/spreadsheet/15375.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/15556.xls b/test-data/spreadsheet/15556.xls
index 82b48a55bc..82b48a55bc 100644
--- a/src/testcases/org/apache/poi/hssf/data/15556.xls
+++ b/test-data/spreadsheet/15556.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/15573.xls b/test-data/spreadsheet/15573.xls
index 172f255030..172f255030 100644
--- a/src/testcases/org/apache/poi/hssf/data/15573.xls
+++ b/test-data/spreadsheet/15573.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/1900DateWindowing.xls b/test-data/spreadsheet/1900DateWindowing.xls
index 94fe5c1bec..94fe5c1bec 100644
--- a/src/testcases/org/apache/poi/hssf/data/1900DateWindowing.xls
+++ b/test-data/spreadsheet/1900DateWindowing.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/1904DateWindowing.xls b/test-data/spreadsheet/1904DateWindowing.xls
index 8c0dba1d7a..8c0dba1d7a 100644
--- a/src/testcases/org/apache/poi/hssf/data/1904DateWindowing.xls
+++ b/test-data/spreadsheet/1904DateWindowing.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/19599-1.xls b/test-data/spreadsheet/19599-1.xls
index 4ce27d1fb7..4ce27d1fb7 100644
--- a/src/testcases/org/apache/poi/hssf/data/19599-1.xls
+++ b/test-data/spreadsheet/19599-1.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/19599-2.xls b/test-data/spreadsheet/19599-2.xls
index 17f45839dd..17f45839dd 100644
--- a/src/testcases/org/apache/poi/hssf/data/19599-2.xls
+++ b/test-data/spreadsheet/19599-2.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/22742.xls b/test-data/spreadsheet/22742.xls
index cd367ca9b6..cd367ca9b6 100644
--- a/src/testcases/org/apache/poi/hssf/data/22742.xls
+++ b/test-data/spreadsheet/22742.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/24207.xls b/test-data/spreadsheet/24207.xls
index eca56425ef..eca56425ef 100755
--- a/src/testcases/org/apache/poi/hssf/data/24207.xls
+++ b/test-data/spreadsheet/24207.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/24215.xls b/test-data/spreadsheet/24215.xls
index bcbbe63121..bcbbe63121 100644
--- a/src/testcases/org/apache/poi/hssf/data/24215.xls
+++ b/test-data/spreadsheet/24215.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/25183.xls b/test-data/spreadsheet/25183.xls
index 635a649879..635a649879 100644
--- a/src/testcases/org/apache/poi/hssf/data/25183.xls
+++ b/test-data/spreadsheet/25183.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/25695.xls b/test-data/spreadsheet/25695.xls
index 08b5035664..08b5035664 100644
--- a/src/testcases/org/apache/poi/hssf/data/25695.xls
+++ b/test-data/spreadsheet/25695.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/26100.xls b/test-data/spreadsheet/26100.xls
index 802cf89601..802cf89601 100644
--- a/src/testcases/org/apache/poi/hssf/data/26100.xls
+++ b/test-data/spreadsheet/26100.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/27272_1.xls b/test-data/spreadsheet/27272_1.xls
index 1715db85d3..1715db85d3 100644
--- a/src/testcases/org/apache/poi/hssf/data/27272_1.xls
+++ b/test-data/spreadsheet/27272_1.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/27272_2.xls b/test-data/spreadsheet/27272_2.xls
index 3e69928d55..3e69928d55 100644
--- a/src/testcases/org/apache/poi/hssf/data/27272_2.xls
+++ b/test-data/spreadsheet/27272_2.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/27349-vlookupAcrossSheets.xls b/test-data/spreadsheet/27349-vlookupAcrossSheets.xls
index c21d434a70..c21d434a70 100755
--- a/src/testcases/org/apache/poi/hssf/data/27349-vlookupAcrossSheets.xls
+++ b/test-data/spreadsheet/27349-vlookupAcrossSheets.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/27364.xls b/test-data/spreadsheet/27364.xls
index 73aa3fa2f1..73aa3fa2f1 100755
--- a/src/testcases/org/apache/poi/hssf/data/27364.xls
+++ b/test-data/spreadsheet/27364.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/27394.xls b/test-data/spreadsheet/27394.xls
index e9ba1cc9bb..e9ba1cc9bb 100755
--- a/src/testcases/org/apache/poi/hssf/data/27394.xls
+++ b/test-data/spreadsheet/27394.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/27852.xls b/test-data/spreadsheet/27852.xls
index b4b0a4c6cd..b4b0a4c6cd 100644
--- a/src/testcases/org/apache/poi/hssf/data/27852.xls
+++ b/test-data/spreadsheet/27852.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/27933.xls b/test-data/spreadsheet/27933.xls
index 79722370b4..79722370b4 100644
--- a/src/testcases/org/apache/poi/hssf/data/27933.xls
+++ b/test-data/spreadsheet/27933.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/28772.xls b/test-data/spreadsheet/28772.xls
index a5190de645..a5190de645 100644
--- a/src/testcases/org/apache/poi/hssf/data/28772.xls
+++ b/test-data/spreadsheet/28772.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/28774.xls b/test-data/spreadsheet/28774.xls
index 476f3bafe9..476f3bafe9 100755
--- a/src/testcases/org/apache/poi/hssf/data/28774.xls
+++ b/test-data/spreadsheet/28774.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/29675.xls b/test-data/spreadsheet/29675.xls
index a80df1ffb9..a80df1ffb9 100644
--- a/src/testcases/org/apache/poi/hssf/data/29675.xls
+++ b/test-data/spreadsheet/29675.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/29942.xls b/test-data/spreadsheet/29942.xls
index 9fac290a07..9fac290a07 100644
--- a/src/testcases/org/apache/poi/hssf/data/29942.xls
+++ b/test-data/spreadsheet/29942.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/29982.xls b/test-data/spreadsheet/29982.xls
index 8430ff72b0..8430ff72b0 100644
--- a/src/testcases/org/apache/poi/hssf/data/29982.xls
+++ b/test-data/spreadsheet/29982.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/30070.xls b/test-data/spreadsheet/30070.xls
index 5ae6685831..5ae6685831 100755
--- a/src/testcases/org/apache/poi/hssf/data/30070.xls
+++ b/test-data/spreadsheet/30070.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/30540.xls b/test-data/spreadsheet/30540.xls
index bf91e1bb16..bf91e1bb16 100644
--- a/src/testcases/org/apache/poi/hssf/data/30540.xls
+++ b/test-data/spreadsheet/30540.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/30978-alt.xls b/test-data/spreadsheet/30978-alt.xls
index c591582885..c591582885 100644
--- a/src/testcases/org/apache/poi/hssf/data/30978-alt.xls
+++ b/test-data/spreadsheet/30978-alt.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/30978-deleted.xls b/test-data/spreadsheet/30978-deleted.xls
index 0a2cabedce..0a2cabedce 100755
--- a/src/testcases/org/apache/poi/hssf/data/30978-deleted.xls
+++ b/test-data/spreadsheet/30978-deleted.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/31661.xls b/test-data/spreadsheet/31661.xls
index 79050b4325..79050b4325 100755
--- a/src/testcases/org/apache/poi/hssf/data/31661.xls
+++ b/test-data/spreadsheet/31661.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/31749.xls b/test-data/spreadsheet/31749.xls
index 6962a09237..6962a09237 100644
--- a/src/testcases/org/apache/poi/hssf/data/31749.xls
+++ b/test-data/spreadsheet/31749.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/31979.xls b/test-data/spreadsheet/31979.xls
index a0c743d28a..a0c743d28a 100644
--- a/src/testcases/org/apache/poi/hssf/data/31979.xls
+++ b/test-data/spreadsheet/31979.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/32822.xls b/test-data/spreadsheet/32822.xls
index b95a5fc7ee..b95a5fc7ee 100644
--- a/src/testcases/org/apache/poi/hssf/data/32822.xls
+++ b/test-data/spreadsheet/32822.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/33082.xls b/test-data/spreadsheet/33082.xls
index 74a2df4ded..74a2df4ded 100644
--- a/src/testcases/org/apache/poi/hssf/data/33082.xls
+++ b/test-data/spreadsheet/33082.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/34775.xls b/test-data/spreadsheet/34775.xls
index 9ad8f23836..9ad8f23836 100644
--- a/src/testcases/org/apache/poi/hssf/data/34775.xls
+++ b/test-data/spreadsheet/34775.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/35564.xls b/test-data/spreadsheet/35564.xls
index db18e0187a..db18e0187a 100644
--- a/src/testcases/org/apache/poi/hssf/data/35564.xls
+++ b/test-data/spreadsheet/35564.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/35565.xls b/test-data/spreadsheet/35565.xls
index ee97f0a365..ee97f0a365 100644
--- a/src/testcases/org/apache/poi/hssf/data/35565.xls
+++ b/test-data/spreadsheet/35565.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/36947.xls b/test-data/spreadsheet/36947.xls
index 4c7bde6c2a..4c7bde6c2a 100755
--- a/src/testcases/org/apache/poi/hssf/data/36947.xls
+++ b/test-data/spreadsheet/36947.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/37376.xls b/test-data/spreadsheet/37376.xls
index 59176a66e5..59176a66e5 100644
--- a/src/testcases/org/apache/poi/hssf/data/37376.xls
+++ b/test-data/spreadsheet/37376.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/37630.xls b/test-data/spreadsheet/37630.xls
index ad2b0ef505..ad2b0ef505 100644
--- a/src/testcases/org/apache/poi/hssf/data/37630.xls
+++ b/test-data/spreadsheet/37630.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/37684-1.xls b/test-data/spreadsheet/37684-1.xls
index a59769eb39..a59769eb39 100755
--- a/src/testcases/org/apache/poi/hssf/data/37684-1.xls
+++ b/test-data/spreadsheet/37684-1.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/37684-2.xls b/test-data/spreadsheet/37684-2.xls
index b17d0fa227..b17d0fa227 100755
--- a/src/testcases/org/apache/poi/hssf/data/37684-2.xls
+++ b/test-data/spreadsheet/37684-2.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/37684.xls b/test-data/spreadsheet/37684.xls
index 3aecf073c3..3aecf073c3 100644
--- a/src/testcases/org/apache/poi/hssf/data/37684.xls
+++ b/test-data/spreadsheet/37684.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/39234.xls b/test-data/spreadsheet/39234.xls
index 20fc9a0011..20fc9a0011 100644
--- a/src/testcases/org/apache/poi/hssf/data/39234.xls
+++ b/test-data/spreadsheet/39234.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/39512.xls b/test-data/spreadsheet/39512.xls
index 44cf5718ec..44cf5718ec 100644
--- a/src/testcases/org/apache/poi/hssf/data/39512.xls
+++ b/test-data/spreadsheet/39512.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/39634.xls b/test-data/spreadsheet/39634.xls
index 0f76bffe47..0f76bffe47 100755
--- a/src/testcases/org/apache/poi/hssf/data/39634.xls
+++ b/test-data/spreadsheet/39634.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/3dFormulas.xls b/test-data/spreadsheet/3dFormulas.xls
index 82519ed839..82519ed839 100644
--- a/src/testcases/org/apache/poi/hssf/data/3dFormulas.xls
+++ b/test-data/spreadsheet/3dFormulas.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/40285.xls b/test-data/spreadsheet/40285.xls
index 077e1c8341..077e1c8341 100644
--- a/src/testcases/org/apache/poi/hssf/data/40285.xls
+++ b/test-data/spreadsheet/40285.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/41139.xls b/test-data/spreadsheet/41139.xls
index e4925fe2d2..e4925fe2d2 100644
--- a/src/testcases/org/apache/poi/hssf/data/41139.xls
+++ b/test-data/spreadsheet/41139.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/41546.xls b/test-data/spreadsheet/41546.xls
index 1332f3eef5..1332f3eef5 100644
--- a/src/testcases/org/apache/poi/hssf/data/41546.xls
+++ b/test-data/spreadsheet/41546.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/42464-ExpPtg-bad.xls b/test-data/spreadsheet/42464-ExpPtg-bad.xls
index 54a7edb404..54a7edb404 100644
--- a/src/testcases/org/apache/poi/hssf/data/42464-ExpPtg-bad.xls
+++ b/test-data/spreadsheet/42464-ExpPtg-bad.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/42464-ExpPtg-ok.xls b/test-data/spreadsheet/42464-ExpPtg-ok.xls
index 5ae84bc90e..5ae84bc90e 100644
--- a/src/testcases/org/apache/poi/hssf/data/42464-ExpPtg-ok.xls
+++ b/test-data/spreadsheet/42464-ExpPtg-ok.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/42726.xls b/test-data/spreadsheet/42726.xls
index e492c5d3d9..e492c5d3d9 100755
--- a/src/testcases/org/apache/poi/hssf/data/42726.xls
+++ b/test-data/spreadsheet/42726.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/42844.xls b/test-data/spreadsheet/42844.xls
index 50bb5a85b8..50bb5a85b8 100644
--- a/src/testcases/org/apache/poi/hssf/data/42844.xls
+++ b/test-data/spreadsheet/42844.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/43251.xls b/test-data/spreadsheet/43251.xls
index abc476ab0f..abc476ab0f 100644
--- a/src/testcases/org/apache/poi/hssf/data/43251.xls
+++ b/test-data/spreadsheet/43251.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/43493.xls b/test-data/spreadsheet/43493.xls
index 2a02f3d740..2a02f3d740 100644
--- a/src/testcases/org/apache/poi/hssf/data/43493.xls
+++ b/test-data/spreadsheet/43493.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/43623.xls b/test-data/spreadsheet/43623.xls
index 401cb2a887..401cb2a887 100644
--- a/src/testcases/org/apache/poi/hssf/data/43623.xls
+++ b/test-data/spreadsheet/43623.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/43902.xls b/test-data/spreadsheet/43902.xls
index a67720d6c4..a67720d6c4 100644
--- a/src/testcases/org/apache/poi/hssf/data/43902.xls
+++ b/test-data/spreadsheet/43902.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44010-SingleChart.xls b/test-data/spreadsheet/44010-SingleChart.xls
index fe0df2750a..fe0df2750a 100644
--- a/src/testcases/org/apache/poi/hssf/data/44010-SingleChart.xls
+++ b/test-data/spreadsheet/44010-SingleChart.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44010-TwoCharts.xls b/test-data/spreadsheet/44010-TwoCharts.xls
index 4a61523fe0..4a61523fe0 100644
--- a/src/testcases/org/apache/poi/hssf/data/44010-TwoCharts.xls
+++ b/test-data/spreadsheet/44010-TwoCharts.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44167.xls b/test-data/spreadsheet/44167.xls
index c5470210d8..c5470210d8 100755
--- a/src/testcases/org/apache/poi/hssf/data/44167.xls
+++ b/test-data/spreadsheet/44167.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44200.xls b/test-data/spreadsheet/44200.xls
index 691afedb80..691afedb80 100755
--- a/src/testcases/org/apache/poi/hssf/data/44200.xls
+++ b/test-data/spreadsheet/44200.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44201.xls b/test-data/spreadsheet/44201.xls
index 593d5aa187..593d5aa187 100644
--- a/src/testcases/org/apache/poi/hssf/data/44201.xls
+++ b/test-data/spreadsheet/44201.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44235.xls b/test-data/spreadsheet/44235.xls
index 39b76588a3..39b76588a3 100755
--- a/src/testcases/org/apache/poi/hssf/data/44235.xls
+++ b/test-data/spreadsheet/44235.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44297.xls b/test-data/spreadsheet/44297.xls
index bc65efd4e0..bc65efd4e0 100755
--- a/src/testcases/org/apache/poi/hssf/data/44297.xls
+++ b/test-data/spreadsheet/44297.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44593.xls b/test-data/spreadsheet/44593.xls
index 84d1311441..84d1311441 100644
--- a/src/testcases/org/apache/poi/hssf/data/44593.xls
+++ b/test-data/spreadsheet/44593.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44636.xls b/test-data/spreadsheet/44636.xls
index 3108a620b2..3108a620b2 100644
--- a/src/testcases/org/apache/poi/hssf/data/44636.xls
+++ b/test-data/spreadsheet/44636.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44643.xls b/test-data/spreadsheet/44643.xls
index 7ae5071864..7ae5071864 100644
--- a/src/testcases/org/apache/poi/hssf/data/44643.xls
+++ b/test-data/spreadsheet/44643.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44693.xls b/test-data/spreadsheet/44693.xls
index dd954c63d6..dd954c63d6 100644
--- a/src/testcases/org/apache/poi/hssf/data/44693.xls
+++ b/test-data/spreadsheet/44693.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44840.xls b/test-data/spreadsheet/44840.xls
index 66dd9185ea..66dd9185ea 100644
--- a/src/testcases/org/apache/poi/hssf/data/44840.xls
+++ b/test-data/spreadsheet/44840.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44861.xls b/test-data/spreadsheet/44861.xls
index bab82b3135..bab82b3135 100644
--- a/src/testcases/org/apache/poi/hssf/data/44861.xls
+++ b/test-data/spreadsheet/44861.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44891.xls b/test-data/spreadsheet/44891.xls
index 30082aa8ff..30082aa8ff 100644
--- a/src/testcases/org/apache/poi/hssf/data/44891.xls
+++ b/test-data/spreadsheet/44891.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/44958.xls b/test-data/spreadsheet/44958.xls
index c16701118d..c16701118d 100644
--- a/src/testcases/org/apache/poi/hssf/data/44958.xls
+++ b/test-data/spreadsheet/44958.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45290.xls b/test-data/spreadsheet/45290.xls
index dd064497a0..dd064497a0 100644
--- a/src/testcases/org/apache/poi/hssf/data/45290.xls
+++ b/test-data/spreadsheet/45290.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45322.xls b/test-data/spreadsheet/45322.xls
index 711721400e..711721400e 100644
--- a/src/testcases/org/apache/poi/hssf/data/45322.xls
+++ b/test-data/spreadsheet/45322.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45365-2.xls b/test-data/spreadsheet/45365-2.xls
index b5e66c1d73..b5e66c1d73 100644
--- a/src/testcases/org/apache/poi/hssf/data/45365-2.xls
+++ b/test-data/spreadsheet/45365-2.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45365.xls b/test-data/spreadsheet/45365.xls
index fbf1d97c58..fbf1d97c58 100644
--- a/src/testcases/org/apache/poi/hssf/data/45365.xls
+++ b/test-data/spreadsheet/45365.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45430.xlsx b/test-data/spreadsheet/45430.xlsx
index 48af3f9cee..48af3f9cee 100644
--- a/src/testcases/org/apache/poi/hssf/data/45430.xlsx
+++ b/test-data/spreadsheet/45430.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/45431.xlsm b/test-data/spreadsheet/45431.xlsm
index fabbd0df39..fabbd0df39 100644
--- a/src/testcases/org/apache/poi/hssf/data/45431.xlsm
+++ b/test-data/spreadsheet/45431.xlsm
diff --git a/src/testcases/org/apache/poi/hssf/data/45492.xls b/test-data/spreadsheet/45492.xls
index 7e044e8977..7e044e8977 100644
--- a/src/testcases/org/apache/poi/hssf/data/45492.xls
+++ b/test-data/spreadsheet/45492.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45538_classic_Footer.xls b/test-data/spreadsheet/45538_classic_Footer.xls
index 2ab1d241ca..2ab1d241ca 100644
--- a/src/testcases/org/apache/poi/hssf/data/45538_classic_Footer.xls
+++ b/test-data/spreadsheet/45538_classic_Footer.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45538_classic_Header.xls b/test-data/spreadsheet/45538_classic_Header.xls
index fe67b84f85..fe67b84f85 100644
--- a/src/testcases/org/apache/poi/hssf/data/45538_classic_Header.xls
+++ b/test-data/spreadsheet/45538_classic_Header.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45538_form_Footer.xls b/test-data/spreadsheet/45538_form_Footer.xls
index 6d1731d6a8..6d1731d6a8 100644
--- a/src/testcases/org/apache/poi/hssf/data/45538_form_Footer.xls
+++ b/test-data/spreadsheet/45538_form_Footer.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45538_form_Header.xls b/test-data/spreadsheet/45538_form_Header.xls
index c2a28219ca..c2a28219ca 100644
--- a/src/testcases/org/apache/poi/hssf/data/45538_form_Header.xls
+++ b/test-data/spreadsheet/45538_form_Header.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45540_classic_Footer.xlsx b/test-data/spreadsheet/45540_classic_Footer.xlsx
index dda1c10fb4..dda1c10fb4 100644
--- a/src/testcases/org/apache/poi/hssf/data/45540_classic_Footer.xlsx
+++ b/test-data/spreadsheet/45540_classic_Footer.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/45540_classic_Header.xlsx b/test-data/spreadsheet/45540_classic_Header.xlsx
index b01180bf51..b01180bf51 100644
--- a/src/testcases/org/apache/poi/hssf/data/45540_classic_Header.xlsx
+++ b/test-data/spreadsheet/45540_classic_Header.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/45540_form_Footer.xlsx b/test-data/spreadsheet/45540_form_Footer.xlsx
index c14dcbf24a..c14dcbf24a 100644
--- a/src/testcases/org/apache/poi/hssf/data/45540_form_Footer.xlsx
+++ b/test-data/spreadsheet/45540_form_Footer.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/45540_form_Header.xlsx b/test-data/spreadsheet/45540_form_Header.xlsx
index 13df686319..13df686319 100644
--- a/src/testcases/org/apache/poi/hssf/data/45540_form_Header.xlsx
+++ b/test-data/spreadsheet/45540_form_Header.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/45544.xlsx b/test-data/spreadsheet/45544.xlsx
index 2390e6d9ab..2390e6d9ab 100644
--- a/src/testcases/org/apache/poi/hssf/data/45544.xlsx
+++ b/test-data/spreadsheet/45544.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/45720.xls b/test-data/spreadsheet/45720.xls
index 9c6c484d62..9c6c484d62 100755
--- a/src/testcases/org/apache/poi/hssf/data/45720.xls
+++ b/test-data/spreadsheet/45720.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45761.xls b/test-data/spreadsheet/45761.xls
index ee44612c40..ee44612c40 100644
--- a/src/testcases/org/apache/poi/hssf/data/45761.xls
+++ b/test-data/spreadsheet/45761.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45784.xls b/test-data/spreadsheet/45784.xls
index f0d25fddfb..f0d25fddfb 100644
--- a/src/testcases/org/apache/poi/hssf/data/45784.xls
+++ b/test-data/spreadsheet/45784.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/45829.png b/test-data/spreadsheet/45829.png
index eccaf30b26..eccaf30b26 100755
--- a/src/testcases/org/apache/poi/hssf/data/45829.png
+++ b/test-data/spreadsheet/45829.png
diff --git a/src/testcases/org/apache/poi/hssf/data/46137.xls b/test-data/spreadsheet/46137.xls
index 5fc399dd62..5fc399dd62 100644
--- a/src/testcases/org/apache/poi/hssf/data/46137.xls
+++ b/test-data/spreadsheet/46137.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/46445.xls b/test-data/spreadsheet/46445.xls
index 30aaf343ad..30aaf343ad 100755
--- a/src/testcases/org/apache/poi/hssf/data/46445.xls
+++ b/test-data/spreadsheet/46445.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/46535.xlsx b/test-data/spreadsheet/46535.xlsx
index 555145b070..555145b070 100755
--- a/src/testcases/org/apache/poi/hssf/data/46535.xlsx
+++ b/test-data/spreadsheet/46535.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/46536.xlsx b/test-data/spreadsheet/46536.xlsx
index 9b625bf369..9b625bf369 100755
--- a/src/testcases/org/apache/poi/hssf/data/46536.xlsx
+++ b/test-data/spreadsheet/46536.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/46904.xls b/test-data/spreadsheet/46904.xls
index 5720672dd1..5720672dd1 100644
--- a/src/testcases/org/apache/poi/hssf/data/46904.xls
+++ b/test-data/spreadsheet/46904.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/47026.xlsm b/test-data/spreadsheet/47026.xlsm
index 77e4eb97f3..77e4eb97f3 100755
--- a/src/testcases/org/apache/poi/hssf/data/47026.xlsm
+++ b/test-data/spreadsheet/47026.xlsm
diff --git a/src/testcases/org/apache/poi/hssf/data/47034.xls b/test-data/spreadsheet/47034.xls
index 81c5849e9f..81c5849e9f 100644
--- a/src/testcases/org/apache/poi/hssf/data/47034.xls
+++ b/test-data/spreadsheet/47034.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/47089.xlsm b/test-data/spreadsheet/47089.xlsm
index 698f79b43e..698f79b43e 100755
--- a/src/testcases/org/apache/poi/hssf/data/47089.xlsm
+++ b/test-data/spreadsheet/47089.xlsm
diff --git a/src/testcases/org/apache/poi/hssf/data/47154.xls b/test-data/spreadsheet/47154.xls
index 2840cc61b6..2840cc61b6 100644
--- a/src/testcases/org/apache/poi/hssf/data/47154.xls
+++ b/test-data/spreadsheet/47154.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/47504.xlsx b/test-data/spreadsheet/47504.xlsx
index 8805a78ac5..8805a78ac5 100755
--- a/src/testcases/org/apache/poi/hssf/data/47504.xlsx
+++ b/test-data/spreadsheet/47504.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/47668.xlsx b/test-data/spreadsheet/47668.xlsx
index 74a073ff00..74a073ff00 100755
--- a/src/testcases/org/apache/poi/hssf/data/47668.xlsx
+++ b/test-data/spreadsheet/47668.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/AbnormalSharedFormulaFlag.xls b/test-data/spreadsheet/AbnormalSharedFormulaFlag.xls
index 788865b3b9..788865b3b9 100755
--- a/src/testcases/org/apache/poi/hssf/data/AbnormalSharedFormulaFlag.xls
+++ b/test-data/spreadsheet/AbnormalSharedFormulaFlag.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/AreaErrPtg.xls b/test-data/spreadsheet/AreaErrPtg.xls
index ce863b8f61..ce863b8f61 100644
--- a/src/testcases/org/apache/poi/hssf/data/AreaErrPtg.xls
+++ b/test-data/spreadsheet/AreaErrPtg.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/AverageTaxRates.xlsx b/test-data/spreadsheet/AverageTaxRates.xlsx
index fee8059e2b..fee8059e2b 100644
--- a/src/testcases/org/apache/poi/hssf/data/AverageTaxRates.xlsx
+++ b/test-data/spreadsheet/AverageTaxRates.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord b/test-data/spreadsheet/BigSSTRecord
index 6cebff51ba..6cebff51ba 100755
--- a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord
+++ b/test-data/spreadsheet/BigSSTRecord
diff --git a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2 b/test-data/spreadsheet/BigSSTRecord2
index 88697cddfd..88697cddfd 100755
--- a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2
+++ b/test-data/spreadsheet/BigSSTRecord2
diff --git a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR1 b/test-data/spreadsheet/BigSSTRecord2CR1
index 359e3b4a3f..359e3b4a3f 100755
--- a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR1
+++ b/test-data/spreadsheet/BigSSTRecord2CR1
diff --git a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR2 b/test-data/spreadsheet/BigSSTRecord2CR2
index 05aa7e9dc3..05aa7e9dc3 100755
--- a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR2
+++ b/test-data/spreadsheet/BigSSTRecord2CR2
diff --git a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR3 b/test-data/spreadsheet/BigSSTRecord2CR3
index 461dfae5e4..461dfae5e4 100755
--- a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR3
+++ b/test-data/spreadsheet/BigSSTRecord2CR3
diff --git a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR4 b/test-data/spreadsheet/BigSSTRecord2CR4
index f8fd5342ae..f8fd5342ae 100755
--- a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR4
+++ b/test-data/spreadsheet/BigSSTRecord2CR4
diff --git a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR5 b/test-data/spreadsheet/BigSSTRecord2CR5
index e1105745b7..e1105745b7 100755
--- a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR5
+++ b/test-data/spreadsheet/BigSSTRecord2CR5
diff --git a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR6 b/test-data/spreadsheet/BigSSTRecord2CR6
index a937fe447d..a937fe447d 100755
--- a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR6
+++ b/test-data/spreadsheet/BigSSTRecord2CR6
diff --git a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR7 b/test-data/spreadsheet/BigSSTRecord2CR7
index 571474ebdc..571474ebdc 100755
--- a/src/testcases/org/apache/poi/hssf/data/BigSSTRecord2CR7
+++ b/test-data/spreadsheet/BigSSTRecord2CR7
diff --git a/src/testcases/org/apache/poi/hssf/data/BigSSTRecordCR b/test-data/spreadsheet/BigSSTRecordCR
index c35783de8b..c35783de8b 100755
--- a/src/testcases/org/apache/poi/hssf/data/BigSSTRecordCR
+++ b/test-data/spreadsheet/BigSSTRecordCR
diff --git a/src/testcases/org/apache/poi/hssf/data/Booleans.xlsx b/test-data/spreadsheet/Booleans.xlsx
index 7528346119..7528346119 100755
--- a/src/testcases/org/apache/poi/hssf/data/Booleans.xlsx
+++ b/test-data/spreadsheet/Booleans.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/ColumnStyle1dp.xls b/test-data/spreadsheet/ColumnStyle1dp.xls
index 1318b0fa5d..1318b0fa5d 100755
--- a/src/testcases/org/apache/poi/hssf/data/ColumnStyle1dp.xls
+++ b/test-data/spreadsheet/ColumnStyle1dp.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ColumnStyle1dpColoured.xls b/test-data/spreadsheet/ColumnStyle1dpColoured.xls
index 25dd8de6de..25dd8de6de 100755
--- a/src/testcases/org/apache/poi/hssf/data/ColumnStyle1dpColoured.xls
+++ b/test-data/spreadsheet/ColumnStyle1dpColoured.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ColumnStyleNone.xls b/test-data/spreadsheet/ColumnStyleNone.xls
index 3f0128aad4..3f0128aad4 100755
--- a/src/testcases/org/apache/poi/hssf/data/ColumnStyleNone.xls
+++ b/test-data/spreadsheet/ColumnStyleNone.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ContinueRecordProblem.xls b/test-data/spreadsheet/ContinueRecordProblem.xls
index c74b864f79..c74b864f79 100644
--- a/src/testcases/org/apache/poi/hssf/data/ContinueRecordProblem.xls
+++ b/test-data/spreadsheet/ContinueRecordProblem.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/CustomXMLMapping-singleattributenamespace.xlsx b/test-data/spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx
index 635dea78f1..635dea78f1 100644
--- a/src/testcases/org/apache/poi/hssf/data/CustomXMLMapping-singleattributenamespace.xlsx
+++ b/test-data/spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/CustomXMLMappings-complex-type.xlsx b/test-data/spreadsheet/CustomXMLMappings-complex-type.xlsx
index 0d6d8d0099..0d6d8d0099 100755
--- a/src/testcases/org/apache/poi/hssf/data/CustomXMLMappings-complex-type.xlsx
+++ b/test-data/spreadsheet/CustomXMLMappings-complex-type.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/CustomXMLMappings.xlsx b/test-data/spreadsheet/CustomXMLMappings.xlsx
index 32a5573c29..32a5573c29 100755
--- a/src/testcases/org/apache/poi/hssf/data/CustomXMLMappings.xlsx
+++ b/test-data/spreadsheet/CustomXMLMappings.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/CustomXmlMappings-inverse-order.xlsx b/test-data/spreadsheet/CustomXmlMappings-inverse-order.xlsx
index f3acef3359..f3acef3359 100755
--- a/src/testcases/org/apache/poi/hssf/data/CustomXmlMappings-inverse-order.xlsx
+++ b/test-data/spreadsheet/CustomXmlMappings-inverse-order.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/DBCSHeader.xls b/test-data/spreadsheet/DBCSHeader.xls
index d97daf1edb..d97daf1edb 100644
--- a/src/testcases/org/apache/poi/hssf/data/DBCSHeader.xls
+++ b/test-data/spreadsheet/DBCSHeader.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/DBCSSheetName.xls b/test-data/spreadsheet/DBCSSheetName.xls
index 17aa94475e..17aa94475e 100644
--- a/src/testcases/org/apache/poi/hssf/data/DBCSSheetName.xls
+++ b/test-data/spreadsheet/DBCSSheetName.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/DateFormats.xls b/test-data/spreadsheet/DateFormats.xls
index 6b2c3480b2..6b2c3480b2 100644
--- a/src/testcases/org/apache/poi/hssf/data/DateFormats.xls
+++ b/test-data/spreadsheet/DateFormats.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/EmbeddedChartHeaderTest.xls b/test-data/spreadsheet/EmbeddedChartHeaderTest.xls
index af0cb2276e..af0cb2276e 100644
--- a/src/testcases/org/apache/poi/hssf/data/EmbeddedChartHeaderTest.xls
+++ b/test-data/spreadsheet/EmbeddedChartHeaderTest.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/Employee.xls b/test-data/spreadsheet/Employee.xls
index bb9be26b9d..bb9be26b9d 100755
--- a/src/testcases/org/apache/poi/hssf/data/Employee.xls
+++ b/test-data/spreadsheet/Employee.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ErrPtg.xls b/test-data/spreadsheet/ErrPtg.xls
index 50035994a4..50035994a4 100644
--- a/src/testcases/org/apache/poi/hssf/data/ErrPtg.xls
+++ b/test-data/spreadsheet/ErrPtg.xls
diff --git a/src/ooxml/testcases/org/apache/poi/ooxml/data/ExcelWithAttachments.xlsm b/test-data/spreadsheet/ExcelWithAttachments.xlsm
index cb3e564428..cb3e564428 100644
--- a/src/ooxml/testcases/org/apache/poi/ooxml/data/ExcelWithAttachments.xlsm
+++ b/test-data/spreadsheet/ExcelWithAttachments.xlsm
diff --git a/src/testcases/org/apache/poi/hssf/data/ForShifting.xls b/test-data/spreadsheet/ForShifting.xls
index 7cb3ebd7d1..7cb3ebd7d1 100755
--- a/src/testcases/org/apache/poi/hssf/data/ForShifting.xls
+++ b/test-data/spreadsheet/ForShifting.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ForShifting.xlsx b/test-data/spreadsheet/ForShifting.xlsx
index f05923b2f5..f05923b2f5 100755
--- a/src/testcases/org/apache/poi/hssf/data/ForShifting.xlsx
+++ b/test-data/spreadsheet/ForShifting.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/Formatting.xls b/test-data/spreadsheet/Formatting.xls
index b8354173e2..b8354173e2 100755
--- a/src/testcases/org/apache/poi/hssf/data/Formatting.xls
+++ b/test-data/spreadsheet/Formatting.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/Formatting.xlsx b/test-data/spreadsheet/Formatting.xlsx
index b1f2e26a03..b1f2e26a03 100755
--- a/src/testcases/org/apache/poi/hssf/data/Formatting.xlsx
+++ b/test-data/spreadsheet/Formatting.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls b/test-data/spreadsheet/FormulaEvalTestData.xls
index f91091ad25..f91091ad25 100644
--- a/src/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls
+++ b/test-data/spreadsheet/FormulaEvalTestData.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/FormulaEvalTestData_Copy.xlsx b/test-data/spreadsheet/FormulaEvalTestData_Copy.xlsx
index 8e491a54ed..8e491a54ed 100755
--- a/src/testcases/org/apache/poi/hssf/data/FormulaEvalTestData_Copy.xlsx
+++ b/test-data/spreadsheet/FormulaEvalTestData_Copy.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/HyperlinksOnManySheets.xls b/test-data/spreadsheet/HyperlinksOnManySheets.xls
index 1884e57c5b..1884e57c5b 100755
--- a/src/testcases/org/apache/poi/hssf/data/HyperlinksOnManySheets.xls
+++ b/test-data/spreadsheet/HyperlinksOnManySheets.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/IfFormulaTest.xls b/test-data/spreadsheet/IfFormulaTest.xls
index d307bee12c..d307bee12c 100644
--- a/src/testcases/org/apache/poi/hssf/data/IfFormulaTest.xls
+++ b/test-data/spreadsheet/IfFormulaTest.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/IndexFunctionTestCaseData.xls b/test-data/spreadsheet/IndexFunctionTestCaseData.xls
index bf0b23accb..bf0b23accb 100644
--- a/src/testcases/org/apache/poi/hssf/data/IndexFunctionTestCaseData.xls
+++ b/test-data/spreadsheet/IndexFunctionTestCaseData.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/IntersectionPtg.xls b/test-data/spreadsheet/IntersectionPtg.xls
index 74b87db3cd..74b87db3cd 100644
--- a/src/testcases/org/apache/poi/hssf/data/IntersectionPtg.xls
+++ b/test-data/spreadsheet/IntersectionPtg.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/LookupFunctionsTestCaseData.xls b/test-data/spreadsheet/LookupFunctionsTestCaseData.xls
index 94f16e9840..94f16e9840 100755
--- a/src/testcases/org/apache/poi/hssf/data/LookupFunctionsTestCaseData.xls
+++ b/test-data/spreadsheet/LookupFunctionsTestCaseData.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/MRExtraLines.xls b/test-data/spreadsheet/MRExtraLines.xls
index e82e4f6f40..e82e4f6f40 100644
--- a/src/testcases/org/apache/poi/hssf/data/MRExtraLines.xls
+++ b/test-data/spreadsheet/MRExtraLines.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/MissingBits.xls b/test-data/spreadsheet/MissingBits.xls
index 4dba467a4f..4dba467a4f 100644
--- a/src/testcases/org/apache/poi/hssf/data/MissingBits.xls
+++ b/test-data/spreadsheet/MissingBits.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/NoGutsRecords.xls b/test-data/spreadsheet/NoGutsRecords.xls
index c4340f6b83..c4340f6b83 100644
--- a/src/testcases/org/apache/poi/hssf/data/NoGutsRecords.xls
+++ b/test-data/spreadsheet/NoGutsRecords.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/OddStyleRecord.xls b/test-data/spreadsheet/OddStyleRecord.xls
index dcaa79b5e1..dcaa79b5e1 100644
--- a/src/testcases/org/apache/poi/hssf/data/OddStyleRecord.xls
+++ b/test-data/spreadsheet/OddStyleRecord.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/PercentPtg.xls b/test-data/spreadsheet/PercentPtg.xls
index 42414766c5..42414766c5 100644
--- a/src/testcases/org/apache/poi/hssf/data/PercentPtg.xls
+++ b/test-data/spreadsheet/PercentPtg.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/RangePtg.xls b/test-data/spreadsheet/RangePtg.xls
index 889dd00717..889dd00717 100644
--- a/src/testcases/org/apache/poi/hssf/data/RangePtg.xls
+++ b/test-data/spreadsheet/RangePtg.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ReadOnlyRecommended.xls b/test-data/spreadsheet/ReadOnlyRecommended.xls
index d479b94f60..d479b94f60 100644
--- a/src/testcases/org/apache/poi/hssf/data/ReadOnlyRecommended.xls
+++ b/test-data/spreadsheet/ReadOnlyRecommended.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ReferencePtg.xls b/test-data/spreadsheet/ReferencePtg.xls
index d415034d1a..d415034d1a 100644
--- a/src/testcases/org/apache/poi/hssf/data/ReferencePtg.xls
+++ b/test-data/spreadsheet/ReferencePtg.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SampleSS.txt b/test-data/spreadsheet/SampleSS.txt
index b1dc6b63b5..b1dc6b63b5 100644
--- a/src/testcases/org/apache/poi/hssf/data/SampleSS.txt
+++ b/test-data/spreadsheet/SampleSS.txt
diff --git a/src/testcases/org/apache/poi/hssf/data/SampleSS.xls b/test-data/spreadsheet/SampleSS.xls
index 771aacf914..771aacf914 100755
--- a/src/testcases/org/apache/poi/hssf/data/SampleSS.xls
+++ b/test-data/spreadsheet/SampleSS.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SampleSS.xlsx b/test-data/spreadsheet/SampleSS.xlsx
index b94809ebc9..b94809ebc9 100755
--- a/src/testcases/org/apache/poi/hssf/data/SampleSS.xlsx
+++ b/test-data/spreadsheet/SampleSS.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/SharedFormulaTest.xls b/test-data/spreadsheet/SharedFormulaTest.xls
index 8db77d9824..8db77d9824 100644
--- a/src/testcases/org/apache/poi/hssf/data/SharedFormulaTest.xls
+++ b/test-data/spreadsheet/SharedFormulaTest.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SheetWithDrawing.xls b/test-data/spreadsheet/SheetWithDrawing.xls
index e1395291b0..e1395291b0 100644
--- a/src/testcases/org/apache/poi/hssf/data/SheetWithDrawing.xls
+++ b/test-data/spreadsheet/SheetWithDrawing.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/Simple.xls b/test-data/spreadsheet/Simple.xls
index b06799fea5..b06799fea5 100755
--- a/src/testcases/org/apache/poi/hssf/data/Simple.xls
+++ b/test-data/spreadsheet/Simple.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleChart.xls b/test-data/spreadsheet/SimpleChart.xls
index 7a980800c7..7a980800c7 100755
--- a/src/testcases/org/apache/poi/hssf/data/SimpleChart.xls
+++ b/test-data/spreadsheet/SimpleChart.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleMultiCell.xls b/test-data/spreadsheet/SimpleMultiCell.xls
index 3c8c8b0b00..3c8c8b0b00 100644
--- a/src/testcases/org/apache/poi/hssf/data/SimpleMultiCell.xls
+++ b/test-data/spreadsheet/SimpleMultiCell.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleMultiCell.xlsx b/test-data/spreadsheet/SimpleMultiCell.xlsx
index d5dfe7adc3..d5dfe7adc3 100755
--- a/src/testcases/org/apache/poi/hssf/data/SimpleMultiCell.xlsx
+++ b/test-data/spreadsheet/SimpleMultiCell.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithAutofilter.xls b/test-data/spreadsheet/SimpleWithAutofilter.xls
index 900699c6e0..900699c6e0 100644
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithAutofilter.xls
+++ b/test-data/spreadsheet/SimpleWithAutofilter.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithChoose.xls b/test-data/spreadsheet/SimpleWithChoose.xls
index 96a8e743a8..96a8e743a8 100755
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithChoose.xls
+++ b/test-data/spreadsheet/SimpleWithChoose.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithColours.xls b/test-data/spreadsheet/SimpleWithColours.xls
index ab3cdecf0b..ab3cdecf0b 100755
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithColours.xls
+++ b/test-data/spreadsheet/SimpleWithColours.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithComments.xls b/test-data/spreadsheet/SimpleWithComments.xls
index 0fbec16a63..0fbec16a63 100644
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithComments.xls
+++ b/test-data/spreadsheet/SimpleWithComments.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithDataFormat.xls b/test-data/spreadsheet/SimpleWithDataFormat.xls
index 7d5909eb21..7d5909eb21 100644
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithDataFormat.xls
+++ b/test-data/spreadsheet/SimpleWithDataFormat.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithFormula.xls b/test-data/spreadsheet/SimpleWithFormula.xls
index 758b341906..758b341906 100755
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithFormula.xls
+++ b/test-data/spreadsheet/SimpleWithFormula.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithImages-mac.xls b/test-data/spreadsheet/SimpleWithImages-mac.xls
index 942e727ff6..942e727ff6 100644
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithImages-mac.xls
+++ b/test-data/spreadsheet/SimpleWithImages-mac.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithImages.xls b/test-data/spreadsheet/SimpleWithImages.xls
index 1567fd1ffc..1567fd1ffc 100644
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithImages.xls
+++ b/test-data/spreadsheet/SimpleWithImages.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithPageBreaks.xls b/test-data/spreadsheet/SimpleWithPageBreaks.xls
index bb2e8041e9..bb2e8041e9 100644
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithPageBreaks.xls
+++ b/test-data/spreadsheet/SimpleWithPageBreaks.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithPrintArea.xls b/test-data/spreadsheet/SimpleWithPrintArea.xls
index 0434dbcc82..0434dbcc82 100755
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithPrintArea.xls
+++ b/test-data/spreadsheet/SimpleWithPrintArea.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithSkip.xls b/test-data/spreadsheet/SimpleWithSkip.xls
index 11b81aeca2..11b81aeca2 100755
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithSkip.xls
+++ b/test-data/spreadsheet/SimpleWithSkip.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SimpleWithStyling.xls b/test-data/spreadsheet/SimpleWithStyling.xls
index b5793d251b..b5793d251b 100755
--- a/src/testcases/org/apache/poi/hssf/data/SimpleWithStyling.xls
+++ b/test-data/spreadsheet/SimpleWithStyling.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SingleLetterRanges.xls b/test-data/spreadsheet/SingleLetterRanges.xls
index e35058d410..e35058d410 100644
--- a/src/testcases/org/apache/poi/hssf/data/SingleLetterRanges.xls
+++ b/test-data/spreadsheet/SingleLetterRanges.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/SquareMacro.xls b/test-data/spreadsheet/SquareMacro.xls
index 54beeeb37e..54beeeb37e 100644
--- a/src/testcases/org/apache/poi/hssf/data/SquareMacro.xls
+++ b/test-data/spreadsheet/SquareMacro.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/StringContinueRecords.xls b/test-data/spreadsheet/StringContinueRecords.xls
index f2ada9eb28..f2ada9eb28 100644
--- a/src/testcases/org/apache/poi/hssf/data/StringContinueRecords.xls
+++ b/test-data/spreadsheet/StringContinueRecords.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/StringFormulas.xls b/test-data/spreadsheet/StringFormulas.xls
index ebf28b0793..ebf28b0793 100644
--- a/src/testcases/org/apache/poi/hssf/data/StringFormulas.xls
+++ b/test-data/spreadsheet/StringFormulas.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/Tables.xlsx b/test-data/spreadsheet/Tables.xlsx
index 705e0ae373..705e0ae373 100644
--- a/src/testcases/org/apache/poi/hssf/data/Tables.xlsx
+++ b/test-data/spreadsheet/Tables.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/TwoSheetsNoneHidden.xls b/test-data/spreadsheet/TwoSheetsNoneHidden.xls
index 969f01408e..969f01408e 100644
--- a/src/testcases/org/apache/poi/hssf/data/TwoSheetsNoneHidden.xls
+++ b/test-data/spreadsheet/TwoSheetsNoneHidden.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/TwoSheetsNoneHidden.xlsx b/test-data/spreadsheet/TwoSheetsNoneHidden.xlsx
index 46f61473a5..46f61473a5 100755
--- a/src/testcases/org/apache/poi/hssf/data/TwoSheetsNoneHidden.xlsx
+++ b/test-data/spreadsheet/TwoSheetsNoneHidden.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/TwoSheetsOneHidden.xls b/test-data/spreadsheet/TwoSheetsOneHidden.xls
index 940ffc0582..940ffc0582 100644
--- a/src/testcases/org/apache/poi/hssf/data/TwoSheetsOneHidden.xls
+++ b/test-data/spreadsheet/TwoSheetsOneHidden.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/TwoSheetsOneHidden.xlsx b/test-data/spreadsheet/TwoSheetsOneHidden.xlsx
index c92febb0a7..c92febb0a7 100755
--- a/src/testcases/org/apache/poi/hssf/data/TwoSheetsOneHidden.xlsx
+++ b/test-data/spreadsheet/TwoSheetsOneHidden.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/UncalcedRecord.xls b/test-data/spreadsheet/UncalcedRecord.xls
index f1a0396c00..f1a0396c00 100644
--- a/src/testcases/org/apache/poi/hssf/data/UncalcedRecord.xls
+++ b/test-data/spreadsheet/UncalcedRecord.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/UnionPtg.xls b/test-data/spreadsheet/UnionPtg.xls
index 189f8c6413..189f8c6413 100644
--- a/src/testcases/org/apache/poi/hssf/data/UnionPtg.xls
+++ b/test-data/spreadsheet/UnionPtg.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/WORKBOOK_in_capitals.xls b/test-data/spreadsheet/WORKBOOK_in_capitals.xls
index 1c3ef61d97..1c3ef61d97 100644
--- a/src/testcases/org/apache/poi/hssf/data/WORKBOOK_in_capitals.xls
+++ b/test-data/spreadsheet/WORKBOOK_in_capitals.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/WithChart.xls b/test-data/spreadsheet/WithChart.xls
index 624b767289..624b767289 100755
--- a/src/testcases/org/apache/poi/hssf/data/WithChart.xls
+++ b/test-data/spreadsheet/WithChart.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/WithChart.xlsx b/test-data/spreadsheet/WithChart.xlsx
index 5de94080d1..5de94080d1 100755
--- a/src/testcases/org/apache/poi/hssf/data/WithChart.xlsx
+++ b/test-data/spreadsheet/WithChart.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/WithCheckBoxes.xls b/test-data/spreadsheet/WithCheckBoxes.xls
index 66dd9185ea..66dd9185ea 100644
--- a/src/testcases/org/apache/poi/hssf/data/WithCheckBoxes.xls
+++ b/test-data/spreadsheet/WithCheckBoxes.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/WithDrawing.xlsx b/test-data/spreadsheet/WithDrawing.xlsx
index 862cd374d5..862cd374d5 100755
--- a/src/testcases/org/apache/poi/hssf/data/WithDrawing.xlsx
+++ b/test-data/spreadsheet/WithDrawing.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/WithEmbeded.xlsx b/test-data/spreadsheet/WithEmbeded.xlsx
index 411de4a08c..411de4a08c 100755
--- a/src/testcases/org/apache/poi/hssf/data/WithEmbeded.xlsx
+++ b/test-data/spreadsheet/WithEmbeded.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/WithExtendedStyles.xls b/test-data/spreadsheet/WithExtendedStyles.xls
index 4a80f56f5d..4a80f56f5d 100644
--- a/src/testcases/org/apache/poi/hssf/data/WithExtendedStyles.xls
+++ b/test-data/spreadsheet/WithExtendedStyles.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/WithFormattedGraphTitle.xls b/test-data/spreadsheet/WithFormattedGraphTitle.xls
index 477b1f6a15..477b1f6a15 100644
--- a/src/testcases/org/apache/poi/hssf/data/WithFormattedGraphTitle.xls
+++ b/test-data/spreadsheet/WithFormattedGraphTitle.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/WithHyperlink.xls b/test-data/spreadsheet/WithHyperlink.xls
index e136506c20..e136506c20 100644
--- a/src/testcases/org/apache/poi/hssf/data/WithHyperlink.xls
+++ b/test-data/spreadsheet/WithHyperlink.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/WithMoreVariousData.xlsx b/test-data/spreadsheet/WithMoreVariousData.xlsx
index ba5ed27d23..ba5ed27d23 100644
--- a/src/testcases/org/apache/poi/hssf/data/WithMoreVariousData.xlsx
+++ b/test-data/spreadsheet/WithMoreVariousData.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/WithThreeCharts.xls b/test-data/spreadsheet/WithThreeCharts.xls
index 157bf331b8..157bf331b8 100755
--- a/src/testcases/org/apache/poi/hssf/data/WithThreeCharts.xls
+++ b/test-data/spreadsheet/WithThreeCharts.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/WithThreeCharts.xlsx b/test-data/spreadsheet/WithThreeCharts.xlsx
index e7398e274b..e7398e274b 100755
--- a/src/testcases/org/apache/poi/hssf/data/WithThreeCharts.xlsx
+++ b/test-data/spreadsheet/WithThreeCharts.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/WithTwoCharts.xls b/test-data/spreadsheet/WithTwoCharts.xls
index ea05d5ce49..ea05d5ce49 100755
--- a/src/testcases/org/apache/poi/hssf/data/WithTwoCharts.xls
+++ b/test-data/spreadsheet/WithTwoCharts.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/WithTwoCharts.xlsx b/test-data/spreadsheet/WithTwoCharts.xlsx
index 9b8deceae2..9b8deceae2 100755
--- a/src/testcases/org/apache/poi/hssf/data/WithTwoCharts.xlsx
+++ b/test-data/spreadsheet/WithTwoCharts.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/WithTwoHyperLinks.xls b/test-data/spreadsheet/WithTwoHyperLinks.xls
index 6ee60b535f..6ee60b535f 100644
--- a/src/testcases/org/apache/poi/hssf/data/WithTwoHyperLinks.xls
+++ b/test-data/spreadsheet/WithTwoHyperLinks.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/WithVariousData.xlsx b/test-data/spreadsheet/WithVariousData.xlsx
index 5459734b23..5459734b23 100644
--- a/src/testcases/org/apache/poi/hssf/data/WithVariousData.xlsx
+++ b/test-data/spreadsheet/WithVariousData.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/WrongFormulaRecordType.xls b/test-data/spreadsheet/WrongFormulaRecordType.xls
index 726d2317ff..726d2317ff 100644
--- a/src/testcases/org/apache/poi/hssf/data/WrongFormulaRecordType.xls
+++ b/test-data/spreadsheet/WrongFormulaRecordType.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/blankworkbook.xls b/test-data/spreadsheet/blankworkbook.xls
index fcf734d6a8..fcf734d6a8 100644
--- a/src/testcases/org/apache/poi/hssf/data/blankworkbook.xls
+++ b/test-data/spreadsheet/blankworkbook.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/bug_42794.mdb b/test-data/spreadsheet/bug_42794.mdb
index 431eff734e..431eff734e 100644
--- a/src/testcases/org/apache/poi/hssf/data/bug_42794.mdb
+++ b/test-data/spreadsheet/bug_42794.mdb
diff --git a/src/testcases/org/apache/poi/hssf/data/bug_42794.xls b/test-data/spreadsheet/bug_42794.xls
index 2827d5ac6d..2827d5ac6d 100644
--- a/src/testcases/org/apache/poi/hssf/data/bug_42794.xls
+++ b/test-data/spreadsheet/bug_42794.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/colwidth.xls b/test-data/spreadsheet/colwidth.xls
index 7ffd3a42b4..7ffd3a42b4 100755
--- a/src/testcases/org/apache/poi/hssf/data/colwidth.xls
+++ b/test-data/spreadsheet/colwidth.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/comments.xls b/test-data/spreadsheet/comments.xls
index 9eb0329b0e..9eb0329b0e 100644
--- a/src/testcases/org/apache/poi/hssf/data/comments.xls
+++ b/test-data/spreadsheet/comments.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/comments.xlsx b/test-data/spreadsheet/comments.xlsx
index d4e139853c..d4e139853c 100755
--- a/src/testcases/org/apache/poi/hssf/data/comments.xlsx
+++ b/test-data/spreadsheet/comments.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/countifExamples.xls b/test-data/spreadsheet/countifExamples.xls
index b15bd162a2..b15bd162a2 100644
--- a/src/testcases/org/apache/poi/hssf/data/countifExamples.xls
+++ b/test-data/spreadsheet/countifExamples.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/duprich1.xls b/test-data/spreadsheet/duprich1.xls
index 3fddbedd27..3fddbedd27 100644
--- a/src/testcases/org/apache/poi/hssf/data/duprich1.xls
+++ b/test-data/spreadsheet/duprich1.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/duprich2.xls b/test-data/spreadsheet/duprich2.xls
index 57af63b3d4..57af63b3d4 100644
--- a/src/testcases/org/apache/poi/hssf/data/duprich2.xls
+++ b/test-data/spreadsheet/duprich2.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/dvEmpty.xls b/test-data/spreadsheet/dvEmpty.xls
index 72c78cfa49..72c78cfa49 100644
--- a/src/testcases/org/apache/poi/hssf/data/dvEmpty.xls
+++ b/test-data/spreadsheet/dvEmpty.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/evencontinuation.txt b/test-data/spreadsheet/evencontinuation.txt
index a0c37bc81a..a0c37bc81a 100644
--- a/src/testcases/org/apache/poi/hssf/data/evencontinuation.txt
+++ b/test-data/spreadsheet/evencontinuation.txt
diff --git a/src/testcases/org/apache/poi/hssf/data/ex41187-19267.xls b/test-data/spreadsheet/ex41187-19267.xls
index c07bfca594..c07bfca594 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex41187-19267.xls
+++ b/test-data/spreadsheet/ex41187-19267.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ex42564-21435.xls b/test-data/spreadsheet/ex42564-21435.xls
index dff150e2dc..dff150e2dc 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex42564-21435.xls
+++ b/test-data/spreadsheet/ex42564-21435.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ex42564-21503.xls b/test-data/spreadsheet/ex42564-21503.xls
index 3a93b40783..3a93b40783 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex42564-21503.xls
+++ b/test-data/spreadsheet/ex42564-21503.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ex42564-elementOrder.xls b/test-data/spreadsheet/ex42564-elementOrder.xls
index 3c49fc2572..3c49fc2572 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex42564-elementOrder.xls
+++ b/test-data/spreadsheet/ex42564-elementOrder.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ex42570-20305.xls b/test-data/spreadsheet/ex42570-20305.xls
index e3d4cc8372..e3d4cc8372 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex42570-20305.xls
+++ b/test-data/spreadsheet/ex42570-20305.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ex44921-21902.xls b/test-data/spreadsheet/ex44921-21902.xls
index d0fbf3cab8..d0fbf3cab8 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex44921-21902.xls
+++ b/test-data/spreadsheet/ex44921-21902.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ex45046-21984.xls b/test-data/spreadsheet/ex45046-21984.xls
index 96ef3ee7ca..96ef3ee7ca 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex45046-21984.xls
+++ b/test-data/spreadsheet/ex45046-21984.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ex45582-22397.xls b/test-data/spreadsheet/ex45582-22397.xls
index 2dc16f5e33..2dc16f5e33 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex45582-22397.xls
+++ b/test-data/spreadsheet/ex45582-22397.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ex45672.xls b/test-data/spreadsheet/ex45672.xls
index fbf48e8a21..fbf48e8a21 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex45672.xls
+++ b/test-data/spreadsheet/ex45672.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ex45698-22488.xls b/test-data/spreadsheet/ex45698-22488.xls
index 615e6c5d8c..615e6c5d8c 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex45698-22488.xls
+++ b/test-data/spreadsheet/ex45698-22488.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ex45978-extraLinkTableSheets.xls b/test-data/spreadsheet/ex45978-extraLinkTableSheets.xls
index 5e496142cb..5e496142cb 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex45978-extraLinkTableSheets.xls
+++ b/test-data/spreadsheet/ex45978-extraLinkTableSheets.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ex46548-23133.xls b/test-data/spreadsheet/ex46548-23133.xls
index cc1fe3a291..cc1fe3a291 100644
--- a/src/testcases/org/apache/poi/hssf/data/ex46548-23133.xls
+++ b/test-data/spreadsheet/ex46548-23133.xls
diff --git a/src/testcases/org/apache/poi/poifs/data/excel_with_embeded.xls b/test-data/spreadsheet/excel_with_embeded.xls
index 789cccfee1..789cccfee1 100644
--- a/src/testcases/org/apache/poi/poifs/data/excel_with_embeded.xls
+++ b/test-data/spreadsheet/excel_with_embeded.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/extendedtextstrings.txt b/test-data/spreadsheet/extendedtextstrings.txt
index 93c080bb9f..93c080bb9f 100644
--- a/src/testcases/org/apache/poi/hssf/data/extendedtextstrings.txt
+++ b/test-data/spreadsheet/extendedtextstrings.txt
diff --git a/src/testcases/org/apache/poi/hssf/data/externalFunctionExample.xls b/test-data/spreadsheet/externalFunctionExample.xls
index b8dabbf718..b8dabbf718 100755
--- a/src/testcases/org/apache/poi/hssf/data/externalFunctionExample.xls
+++ b/test-data/spreadsheet/externalFunctionExample.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/logoKarmokar4.png b/test-data/spreadsheet/logoKarmokar4.png
index 90a915a3a9..90a915a3a9 100755
--- a/src/testcases/org/apache/poi/hssf/data/logoKarmokar4.png
+++ b/test-data/spreadsheet/logoKarmokar4.png
diff --git a/src/testcases/org/apache/poi/hssf/data/missingFuncs44675.xls b/test-data/spreadsheet/missingFuncs44675.xls
index 4a68472450..4a68472450 100644
--- a/src/testcases/org/apache/poi/hssf/data/missingFuncs44675.xls
+++ b/test-data/spreadsheet/missingFuncs44675.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/multibookFormulaA.xls b/test-data/spreadsheet/multibookFormulaA.xls
index b844fc1dba..b844fc1dba 100644
--- a/src/testcases/org/apache/poi/hssf/data/multibookFormulaA.xls
+++ b/test-data/spreadsheet/multibookFormulaA.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/multibookFormulaB.xls b/test-data/spreadsheet/multibookFormulaB.xls
index 3e4708d6c9..3e4708d6c9 100644
--- a/src/testcases/org/apache/poi/hssf/data/multibookFormulaB.xls
+++ b/test-data/spreadsheet/multibookFormulaB.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/namedinput.xls b/test-data/spreadsheet/namedinput.xls
index 115fcd5908..115fcd5908 100755
--- a/src/testcases/org/apache/poi/hssf/data/namedinput.xls
+++ b/test-data/spreadsheet/namedinput.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/noHeaderFooter47244.xls b/test-data/spreadsheet/noHeaderFooter47244.xls
index 1323ab3c53..1323ab3c53 100644
--- a/src/testcases/org/apache/poi/hssf/data/noHeaderFooter47244.xls
+++ b/test-data/spreadsheet/noHeaderFooter47244.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/ole2-embedding.xls b/test-data/spreadsheet/ole2-embedding.xls
index 521082b697..521082b697 100644
--- a/src/testcases/org/apache/poi/hssf/data/ole2-embedding.xls
+++ b/test-data/spreadsheet/ole2-embedding.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/overlapSharedFormula.xls b/test-data/spreadsheet/overlapSharedFormula.xls
index 51c65672af..51c65672af 100644
--- a/src/testcases/org/apache/poi/hssf/data/overlapSharedFormula.xls
+++ b/test-data/spreadsheet/overlapSharedFormula.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/password.xls b/test-data/spreadsheet/password.xls
index a6ad86a113..a6ad86a113 100755
--- a/src/testcases/org/apache/poi/hssf/data/password.xls
+++ b/test-data/spreadsheet/password.xls
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/data/picture.xlsx b/test-data/spreadsheet/picture.xlsx
index 9cdec42562..9cdec42562 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/data/picture.xlsx
+++ b/test-data/spreadsheet/picture.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/reordered_sheets.xlsx b/test-data/spreadsheet/reordered_sheets.xlsx
index f46f59b032..f46f59b032 100755
--- a/src/testcases/org/apache/poi/hssf/data/reordered_sheets.xlsx
+++ b/test-data/spreadsheet/reordered_sheets.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/richtextdata.txt b/test-data/spreadsheet/richtextdata.txt
index 0741d7ad74..0741d7ad74 100644
--- a/src/testcases/org/apache/poi/hssf/data/richtextdata.txt
+++ b/test-data/spreadsheet/richtextdata.txt
diff --git a/src/testcases/org/apache/poi/hssf/data/rk.xls b/test-data/spreadsheet/rk.xls
index 5fcc558648..5fcc558648 100755
--- a/src/testcases/org/apache/poi/hssf/data/rk.xls
+++ b/test-data/spreadsheet/rk.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/sample-beta.xlsx b/test-data/spreadsheet/sample-beta.xlsx
index 2eb36ee2a0..2eb36ee2a0 100644
--- a/src/testcases/org/apache/poi/hssf/data/sample-beta.xlsx
+++ b/test-data/spreadsheet/sample-beta.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/sample.xlsx b/test-data/spreadsheet/sample.xlsx
index 6a53fd9929..6a53fd9929 100644
--- a/src/testcases/org/apache/poi/hssf/data/sample.xlsx
+++ b/test-data/spreadsheet/sample.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/shared_formulas.xlsx b/test-data/spreadsheet/shared_formulas.xlsx
index 0a3cb70cb4..0a3cb70cb4 100755
--- a/src/testcases/org/apache/poi/hssf/data/shared_formulas.xlsx
+++ b/test-data/spreadsheet/shared_formulas.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/stringacross2continuations.txt b/test-data/spreadsheet/stringacross2continuations.txt
index c874c6d960..c874c6d960 100644
--- a/src/testcases/org/apache/poi/hssf/data/stringacross2continuations.txt
+++ b/test-data/spreadsheet/stringacross2continuations.txt
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/data/styles.xlsx b/test-data/spreadsheet/styles.xlsx
index dbfa53cfbf..dbfa53cfbf 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/data/styles.xlsx
+++ b/test-data/spreadsheet/styles.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/sumifformula.xls b/test-data/spreadsheet/sumifformula.xls
index 706eb425bc..706eb425bc 100755
--- a/src/testcases/org/apache/poi/hssf/data/sumifformula.xls
+++ b/test-data/spreadsheet/sumifformula.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/templateExcelWithAutofilter.xls b/test-data/spreadsheet/templateExcelWithAutofilter.xls
index 5813fde385..5813fde385 100644
--- a/src/testcases/org/apache/poi/hssf/data/templateExcelWithAutofilter.xls
+++ b/test-data/spreadsheet/templateExcelWithAutofilter.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/test.xltx b/test-data/spreadsheet/test.xltx
index 3974eb2f4e..3974eb2f4e 100755
--- a/src/testcases/org/apache/poi/hssf/data/test.xltx
+++ b/test-data/spreadsheet/test.xltx
diff --git a/src/testcases/org/apache/poi/hssf/data/testArraysAndTables.xls b/test-data/spreadsheet/testArraysAndTables.xls
index 8489844ed5..8489844ed5 100644
--- a/src/testcases/org/apache/poi/hssf/data/testArraysAndTables.xls
+++ b/test-data/spreadsheet/testArraysAndTables.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/testNames.xls b/test-data/spreadsheet/testNames.xls
index c5d43cc038..c5d43cc038 100644
--- a/src/testcases/org/apache/poi/hssf/data/testNames.xls
+++ b/test-data/spreadsheet/testNames.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/testRRaC.xls b/test-data/spreadsheet/testRRaC.xls
index 25939e85f6..25939e85f6 100644
--- a/src/testcases/org/apache/poi/hssf/data/testRRaC.xls
+++ b/test-data/spreadsheet/testRRaC.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/testRVA.xls b/test-data/spreadsheet/testRVA.xls
index f24b6926e8..f24b6926e8 100644
--- a/src/testcases/org/apache/poi/hssf/data/testRVA.xls
+++ b/test-data/spreadsheet/testRVA.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/test_properties1 b/test-data/spreadsheet/test_properties1
index d4800280ec..d4800280ec 100755
--- a/src/testcases/org/apache/poi/hssf/data/test_properties1
+++ b/test-data/spreadsheet/test_properties1
diff --git a/src/testcases/org/apache/poi/hssf/data/unicodeNameRecord.xls b/test-data/spreadsheet/unicodeNameRecord.xls
index d1d246062c..d1d246062c 100644
--- a/src/testcases/org/apache/poi/hssf/data/unicodeNameRecord.xls
+++ b/test-data/spreadsheet/unicodeNameRecord.xls
diff --git a/src/testcases/org/apache/poi/hssf/data/xlsx-jdbc.xlsx b/test-data/spreadsheet/xlsx-jdbc.xlsx
index d9823b428e..d9823b428e 100755
--- a/src/testcases/org/apache/poi/hssf/data/xlsx-jdbc.xlsx
+++ b/test-data/spreadsheet/xlsx-jdbc.xlsx
diff --git a/src/testcases/org/apache/poi/hssf/data/yearfracExamples.xls b/test-data/spreadsheet/yearfracExamples.xls
index 2b2be7d7d8..2b2be7d7d8 100644
--- a/src/testcases/org/apache/poi/hssf/data/yearfracExamples.xls
+++ b/test-data/spreadsheet/yearfracExamples.xls