diff --git a/lib/opencsv-2.2.jar b/lib/opencsv-2.2.jar
index e31ff1c2d..ff554816e 100644
Binary files a/lib/opencsv-2.2.jar and b/lib/opencsv-2.2.jar differ
diff --git a/src/main/java/com/metaweb/gridworks/exporters/CsvExporter.java b/src/main/java/com/metaweb/gridworks/exporters/CsvExporter.java
index 95e894266..7955ea5c5 100644
--- a/src/main/java/com/metaweb/gridworks/exporters/CsvExporter.java
+++ b/src/main/java/com/metaweb/gridworks/exporters/CsvExporter.java
@@ -48,7 +48,7 @@ public class CsvExporter implements Exporter{
                         for(int i = 0; i < cols.length; i++){
                             cols[i] = project.columnModel.columns.get(i).getName();
                         }
-                        csvWriter.writeNext(cols);
+                        csvWriter.writeNext(cols,false);
                         columnHeader = false; //switch off flag
                     }
 
@@ -60,7 +60,7 @@ public class CsvExporter implements Exporter{
                         }
                     }
 
-                    csvWriter.writeNext(vals);
+                    csvWriter.writeNext(vals,false);
                     return false;
                 }
 
diff --git a/tests/java/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java b/tests/java/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java
index 3527c87c0..62c6afe1f 100644
--- a/tests/java/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java
+++ b/tests/java/src/com/metaweb/gridworks/tests/exporters/CsvExporterTests.java
@@ -57,9 +57,9 @@ public class CsvExporterTests {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), "\"column0\",\"column1\"\n" +
-                                               "\"row0cell0\",\"row0cell1\"\n" +
-                                               "\"row1cell0\",\"row1cell1\"\n");
+        Assert.assertEquals(writer.toString(), "column0,column1\n" +
+                                               "row0cell0,row0cell1\n" +
+                                               "row1cell0,row1cell1\n");
 
     }
     
@@ -74,10 +74,10 @@ public class CsvExporterTests {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), "\"column0\",\"column1\",\"column2\"\n" +
-                                               "\"row0cell0\",\"row0cell1\",\"row0cell2\"\n" +
-                                               "\"row1cell0\",\"line\n\n\nbreak\",\"row1cell2\"\n" +
-                                               "\"row2cell0\",\"row2cell1\",\"row2cell2\"\n");
+        Assert.assertEquals(writer.toString(), "column0,column1,column2\n" +
+                                               "row0cell0,row0cell1,row0cell2\n" +
+                                               "row1cell0,\"line\n\n\nbreak\",row1cell2\n" +
+                                               "row2cell0,row2cell1,row2cell2\n");
     }
     
     @Test
@@ -91,10 +91,10 @@ public class CsvExporterTests {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), "\"column0\",\"column1\",\"column2\"\n" +
-                                               "\"row0cell0\",\"row0cell1\",\"row0cell2\"\n" +
-                                               "\"row1cell0\",\"with, comma\",\"row1cell2\"\n" +
-                                               "\"row2cell0\",\"row2cell1\",\"row2cell2\"\n");
+        Assert.assertEquals(writer.toString(), "column0,column1,column2\n" +
+                                               "row0cell0,row0cell1,row0cell2\n" +
+                                               "row1cell0,\"with, comma\",row1cell2\n" +
+                                               "row2cell0,row2cell1,row2cell2\n");
     }
     
     @Test
@@ -108,10 +108,10 @@ public class CsvExporterTests {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), "\"column0\",\"column1\",\"column2\"\n" +
-                                               "\"row0cell0\",\"row0cell1\",\"row0cell2\"\n" +
-                                               "\"row1cell0\",\"line has \"\"quote\"\"\",\"row1cell2\"\n" +
-                                               "\"row2cell0\",\"row2cell1\",\"row2cell2\"\n");
+        Assert.assertEquals(writer.toString(), "column0,column1,column2\n" +
+                                               "row0cell0,row0cell1,row0cell2\n" +
+                                               "row1cell0,\"line has \"\"quote\"\"\",row1cell2\n" +
+                                               "row2cell0,row2cell1,row2cell2\n");
     }
     
     @Test
@@ -126,10 +126,10 @@ public class CsvExporterTests {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), "\"column0\",\"column1\",\"column2\"\n" +
-                                               "\"row0cell0\",\"row0cell1\",\"row0cell2\"\n" +
-                                               "\"row1cell0\",,\"row1cell2\"\n" +
-                                               ",\"row2cell1\",\"row2cell2\"\n");
+        Assert.assertEquals(writer.toString(), "column0,column1,column2\n" +
+                                               "row0cell0,row0cell1,row0cell2\n" +
+                                               "row1cell0,,row1cell2\n" +
+                                               ",row2cell1,row2cell2\n");
     }
     
     //helper methods
@@ -137,7 +137,7 @@ public class CsvExporterTests {
     protected void CreateColumns(int noOfColumns){
         for(int i = 0; i < noOfColumns; i++){
             try {
-                project.columnModel.addColumn(i, new Column(0, "column" + i), true);
+                project.columnModel.addColumn(i, new Column(i, "column" + i), true);
             } catch (ModelException e1) {
                 Assert.fail("Could not create column");
             }
diff --git a/tests/java/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java b/tests/java/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java
index f7b9ef75b..9093ed25d 100644
--- a/tests/java/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java
+++ b/tests/java/src/com/metaweb/gridworks/tests/exporters/TsvExporterTests.java
@@ -47,7 +47,7 @@ public class TsvExporterTests {
         options = null;
     }
 
-    @Test(groups={"broken"})
+    @Test
     public void exportSimpleTsv(){
         CreateGrid(2, 2);
 
@@ -57,16 +57,16 @@ public class TsvExporterTests {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), "\"column0\"\t\"column1\"\n" +
-                                               "\"row0cell0\"\t\"row0cell1\"\n" +
-                                               "\"row1cell0\"\t\"row1cell1\"\n");
+        Assert.assertEquals(writer.toString(), "column0\tcolumn1\n" +
+                                               "row0cell0\trow0cell1\n" +
+                                               "row1cell0\trow1cell1\n");
 
     }
-    
+
     @Test(groups={"broken"})
     public void exportTsvWithLineBreaks(){
         CreateGrid(3,3);
-        
+
         project.rows.get(1).cells.set(1, new Cell("line\n\n\nbreak", null));
         try {
             SUT.export(project, options, engine, writer);
@@ -74,14 +74,14 @@ public class TsvExporterTests {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), "\"column0\"\t\"column1\"\t\"column2\"\n" +
-                                               "\"row0cell0\"\t\"row0cell1\"\t\"row0cell2\"\n" +
-                                               "\"row1cell0\"\t\"line\n\n\nbreak\"\t\"row1cell2\"\n" +
-                                               "\"row2cell0\"\t\"row2cell1\"\t\"row2cell2\"\n");
+        Assert.assertEquals(writer.toString(), "column0\tcolumn1\tcolumn2\n" +
+                                               "row0cell0\trow0cell1\trow0cell2\n" +
+                                               "row1cell0\t\"line\n\n\nbreak\"\trow1cell2\n" +
+                                               "row2cell0\trow2cell1\trow2cell2\n");
     }
-    
+
     @Test(groups={"broken"})
-    public void exportCsvWithComma(){
+    public void exportTsvWithComma(){
         CreateGrid(3,3);
 
         project.rows.get(1).cells.set(1, new Cell("with\t tab", null));
@@ -91,16 +91,16 @@ public class TsvExporterTests {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), "\"column0\"\t\"column1\"\t\"column2\"\n" +
-                                               "\"row0cell0\"\t\"row0cell1\"\t\"row0cell2\"\n" +
-                                               "\"row1cell0\"\t\"with\t tab\"\t\"row1cell2\"\n" +
-                                               "\"row2cell0\"\t\"row2cell1\"\t\"row2cell2\"\n");
+        Assert.assertEquals(writer.toString(), "column0\tcolumn1\tcolumn2\n" +
+                                               "row0cell0\trow0cell1\trow0cell2\n" +
+                                               "row1cell0\t\"with\t tab\"\trow1cell2\n" +
+                                               "row2cell0\trow2cell1\trow2cell2\n");
     }
-    
+
     @Test(groups={"broken"})
     public void exportTsvWithQuote(){
         CreateGrid(3,3);
-        
+
         project.rows.get(1).cells.set(1, new Cell("line has \"quote\"", null));
         try {
             SUT.export(project, options, engine, writer);
@@ -108,16 +108,16 @@ public class TsvExporterTests {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), "\"column0\"\t\"column1\"\t\"column2\"\n" +
-                                               "\"row0cell0\"\t\"row0cell1\"\t\"row0cell2\"\n" +
-                                               "\"row1cell0\"\t\"line has \"\"quote\"\"\"\t\"row1cell2\"\n" +
-                                               "\"row2cell0\"\t\"row2cell1\"\t\"row2cell2\"\n");
+        Assert.assertEquals(writer.toString(), "column0\tcolumn1\tcolumn2\n" +
+                                               "row0cell0\trow0cell1\trow0cell2\n" +
+                                               "row1cell0\t\"line has \"\"quote\"\"\"\trow1cell2\n" +
+                                               "row2cell0\trow2cell1\trow2cell2\n");
     }
-    
-    @Test(groups={"broken"})
+
+    @Test
     public void exportTsvWithEmptyCells(){
         CreateGrid(3,3);
-        
+
         project.rows.get(1).cells.set(1, null);
         project.rows.get(2).cells.set(0, null);
         try {
@@ -126,18 +126,19 @@ public class TsvExporterTests {
             Assert.fail();
         }
 
-        Assert.assertEquals(writer.toString(), "\"column0\"\t\"column1\"\t\"column2\"\n" +
-                                               "\"row0cell0\"\t\"row0cell1\"\t\"row0cell2\"\n" +
-                                               "\"row1cell0\"\t\t\"row1cell2\"\n" +
-                                               "\t\"row2cell1\"\t\"row2cell2\"\n");
+        Assert.assertEquals(writer.toString(), "column0\tcolumn1\tcolumn2\n" +
+                                               "row0cell0\trow0cell1\trow0cell2\n" +
+                                               "row1cell0\t\trow1cell2\n" +
+                                               "\trow2cell1\trow2cell2\n");
     }
-    
+
     //helper methods
 
     protected void CreateColumns(int noOfColumns){
         for(int i = 0; i < noOfColumns; i++){
             try {
-                project.columnModel.addColumn(i, new Column(0, "column" + i), true);
+                project.columnModel.addColumn(i, new Column(i, "column" + i), true);
+                project.columnModel.columns.get(i).getCellIndex();
             } catch (ModelException e1) {
                 Assert.fail("Could not create column");
             }
@@ -146,7 +147,7 @@ public class TsvExporterTests {
 
     protected void CreateGrid(int noOfRows, int noOfColumns){
         CreateColumns(noOfColumns);
-        
+
         for(int i = 0; i < noOfRows; i++){
             Row row = new Row(noOfColumns);
             for(int j = 0; j < noOfColumns; j++){