diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java b/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java
index 81c20d162..66a667daa 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/PlexOfCps.java
@@ -18,6 +18,7 @@
 package org.apache.poi.hwpf.model;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.poi.util.Internal;
 import org.apache.poi.util.LittleEndian;
@@ -37,7 +38,7 @@ public final class PlexOfCps
     private int _iMac;
     private int _offset;
     private int _cbStruct;
-    private ArrayList<GenericPropertyNode> _props;
+    private List<GenericPropertyNode> _props;
 
     public PlexOfCps( int sizeOfStruct )
     {
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
index be7b0b984..ad90fd8a7 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
@@ -17,8 +17,10 @@
 
 package org.apache.poi.hssf.usermodel;
 
-import org.apache.poi.hssf.HSSFTestDataSamples;
+import java.io.IOException;
+
 import org.apache.poi.hssf.HSSFITestDataProvider;
+import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.ss.usermodel.BaseTestHyperlink;
 
 /**
@@ -107,8 +109,9 @@ public final class TestHSSFHyperlink extends BaseTestHyperlink {
      *  link.setTextMark("'Target Sheet-1'!A1"); //HSSF-specific
      *  or
      *  link.setAddress("'Target Sheet-1'!A1"); //common between XSSF and HSSF
+     * @throws IOException 
      */
-    public void testCreateDocumentLink() {
+    public void testCreateDocumentLink() throws IOException {
         HSSFWorkbook wb = new HSSFWorkbook();
 
         //link to a place in this workbook
@@ -134,8 +137,10 @@ public final class TestHSSFHyperlink extends BaseTestHyperlink {
         link.setAddress("'Hyperlinks'!A1");
         cell.setHyperlink(link);
 
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheet("Hyperlinks");
+        HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
+        wb.close();
+        
+        sheet = wbBack.getSheet("Hyperlinks");
 
         cell = sheet.getRow(0).getCell(0);
         link = cell.getHyperlink();
@@ -148,6 +153,8 @@ public final class TestHSSFHyperlink extends BaseTestHyperlink {
         assertNotNull(link);
         assertEquals("'Hyperlinks'!A1", link.getTextMark());
         assertEquals("'Hyperlinks'!A1", link.getAddress());
+        
+        wbBack.close();
     }
 
     public void testCloneSheet() {
@@ -169,7 +176,7 @@ public final class TestHSSFHyperlink extends BaseTestHyperlink {
         assertEquals("http://poi.apache.org/hssf/", link.getAddress());
     }
 
-    public void testCreate() {
+    public void testCreate() throws IOException {
         HSSFWorkbook wb = new HSSFWorkbook();
 
         HSSFHyperlink link;
@@ -182,13 +189,18 @@ public final class TestHSSFHyperlink extends BaseTestHyperlink {
         link.setAddress("testfolder\\test.PDF");
         cell.setHyperlink(link);
 
-        wb = HSSFTestDataSamples.writeOutAndReadBack(wb);
-        sheet = wb.getSheet("Hyperlinks");
+        HSSFWorkbook wbBack = HSSFTestDataSamples.writeOutAndReadBack(wb);
+        
+        wb.close();
+
+        sheet = wbBack.getSheet("Hyperlinks");
 
         cell = sheet.getRow(1).getCell(0);
         link = cell.getHyperlink();
         assertNotNull(link);
         assertEquals("testfolder\\test.PDF", link.getAddress());
+        
+        wbBack.close();
     }
 
     /**