diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java b/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
index 583e1b479..9b0d70706 100644
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFPatriarch.java
@@ -25,7 +25,6 @@ import org.apache.poi.ddf.EscherComplexProperty;
 import org.apache.poi.ddf.EscherOptRecord;
 import org.apache.poi.ddf.EscherProperty;
 import org.apache.poi.hssf.record.EscherAggregate;
-import org.apache.poi.util.LittleEndian;
 import org.apache.poi.util.StringUtil;
 
 /**
@@ -34,8 +33,7 @@ import org.apache.poi.util.StringUtil;
  *
  * @author Glen Stampoultzis (glens at apache.org)
  */
-public class HSSFPatriarch
-        implements HSSFShapeContainer
+public final class HSSFPatriarch implements HSSFShapeContainer
 {
     List shapes = new ArrayList();
     HSSFSheet sheet;
@@ -58,7 +56,7 @@ public class HSSFPatriarch
      */
     HSSFPatriarch(HSSFSheet sheet, EscherAggregate boundAggregate)
     {
-    	this.boundAggregate = boundAggregate;
+        this.boundAggregate = boundAggregate;
         this.sheet = sheet;
     }
 
@@ -197,29 +195,29 @@ public class HSSFPatriarch
      *  to work on some charts so far)
      */
     public boolean containsChart() {
-    	// TODO - support charts properly in usermodel
-    	
-    	// We're looking for a EscherOptRecord
-    	EscherOptRecord optRecord = (EscherOptRecord)
-    		boundAggregate.findFirstWithId(EscherOptRecord.RECORD_ID);
-    	if(optRecord == null) {
-    		// No opt record, can't have chart
-    		return false;
-    	}
-    	
-    	for(Iterator it = optRecord.getEscherProperties().iterator(); it.hasNext();) {
-    		EscherProperty prop = (EscherProperty)it.next();
-    		if(prop.getPropertyNumber() == 896 && prop.isComplex()) {
-    			EscherComplexProperty cp = (EscherComplexProperty)prop;
-    			String str = StringUtil.getFromUnicodeLE(cp.getComplexData());
-    			System.err.println(str);
-    			if(str.equals("Chart 1\0")) {
-    				return true;
-    			}
-    		}
-    	}
+        // TODO - support charts properly in usermodel
+        
+        // We're looking for a EscherOptRecord
+        EscherOptRecord optRecord = (EscherOptRecord)
+            boundAggregate.findFirstWithId(EscherOptRecord.RECORD_ID);
+        if(optRecord == null) {
+            // No opt record, can't have chart
+            return false;
+        }
+        
+        for(Iterator it = optRecord.getEscherProperties().iterator(); it.hasNext();) {
+            EscherProperty prop = (EscherProperty)it.next();
+            if(prop.getPropertyNumber() == 896 && prop.isComplex()) {
+                EscherComplexProperty cp = (EscherComplexProperty)prop;
+                String str = StringUtil.getFromUnicodeLE(cp.getComplexData());
+                //System.err.println(str);
+                if(str.equals("Chart 1\0")) {
+                    return true;
+                }
+            }
+        }
 
-    	return false;
+        return false;
     }
 
     /**
@@ -258,6 +256,6 @@ public class HSSFPatriarch
      * Returns the aggregate escher record we're bound to 
      */
     protected EscherAggregate _getBoundAggregate() {
-    	return boundAggregate;
+        return boundAggregate;
     }
 }
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
index d0095c18c..20fded35e 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
@@ -23,7 +23,7 @@ import org.apache.poi.hssf.record.ColumnInfoRecord;
 /**
  * @author Glen Stampoultzis
  */
-public class TestColumnInfoRecordsAggregate extends TestCase
+public final class TestColumnInfoRecordsAggregate extends TestCase
 {
     ColumnInfoRecordsAggregate columnInfoRecordsAggregate;
 
@@ -35,7 +35,7 @@ public class TestColumnInfoRecordsAggregate extends TestCase
         columnInfoRecordsAggregate.insertColumn( createColumn( (short)8, (short)8 ));
 //        columnInfoRecordsAggregate.setColumn( (short)2, new Short( (short)200 ), new Integer( 1 ), new Boolean( true ), null);
         columnInfoRecordsAggregate.groupColumnRange( (short)2, (short)5, true );
-        System.out.println( "columnInfoRecordsAggregate = " + columnInfoRecordsAggregate.getNumColumns() );
+        assertEquals(6, columnInfoRecordsAggregate.getNumColumns());
 
         assertEquals(columnInfoRecordsAggregate.getRecordSize(), columnInfoRecordsAggregate.serialize().length);
 
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
index 94c19cbc0..f05c1d115 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
@@ -357,14 +357,14 @@ extends TestCase {
         book.createSheet("TEST");
         HSSFSheet sheet = book.cloneSheet(0);
         book.setSheetName(1,"CLONE");
-        sheet.createRow(0).createCell((short)0).setCellValue("Test");
+        sheet.createRow(0).createCell((short)0).setCellValue(new HSSFRichTextString("Test"));
         book.write(out);
         
         book = new HSSFWorkbook(new ByteArrayInputStream(out.toByteArray()));
         sheet = book.getSheet("CLONE");
         HSSFRow row = sheet.getRow(0);
         HSSFCell cell = row.getCell((short)0);
-        System.out.println(cell.getStringCellValue());
+        assertEquals("Test", cell.getRichStringCellValue().getString());
     }
     
     /**