diff --git a/main/tests/server/src/com/google/refine/tests/model/RowTests.java b/main/tests/server/src/com/google/refine/tests/model/RowTests.java
new file mode 100644
index 000000000..952f8c176
--- /dev/null
+++ b/main/tests/server/src/com/google/refine/tests/model/RowTests.java
@@ -0,0 +1,170 @@
+/*
+
+Copyright 2010, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,           
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY           
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+package com.google.refine.tests.model;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.StringWriter;
+import java.util.Properties;
+
+import org.slf4j.LoggerFactory;
+import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.BeforeTest;
+import org.testng.annotations.Test;
+
+import com.google.refine.exporters.CsvExporter;
+import com.google.refine.model.Cell;
+import com.google.refine.model.Project;
+import com.google.refine.model.Row;
+import com.google.refine.tests.RefineTest;
+
+public class RowTests extends RefineTest {
+
+    @BeforeTest
+    public void init() {
+        logger = LoggerFactory.getLogger(this.getClass());
+    }
+
+    // dependencies
+    StringWriter writer;
+    Project project;
+    Properties options;
+
+    // System Under Test
+    CsvExporter SUT;
+
+    @BeforeMethod
+    public void SetUp() {
+        SUT = new CsvExporter();
+        writer = new StringWriter();
+        project = new Project();
+        options = mock(Properties.class);
+    }
+
+    @AfterMethod
+    public void TearDown() {
+        SUT = null;
+        writer = null;
+        project = null;
+        options = null;
+    }
+
+    @Test
+    public void emptyRow() {
+        Row row = new Row(5);
+        Assert.assertTrue(row.isEmpty());
+    }
+
+    @Test
+    public void notEmptyRow() {
+        Row row = new Row(1);
+        row.setCell(0, new Cell("I'm not empty", null));
+        Assert.assertFalse(row.isEmpty());
+    }
+
+    @Test
+    public void duplicateRow() {
+        Row row = new Row(5);
+        row.flagged = true;
+        Row duplicateRow = row.dup();
+        Assert.assertTrue(duplicateRow.flagged);
+    }
+
+    @Test
+    public void saveRow() {
+        Row row = new Row(5);
+        row.setCell(0, new Cell("I'm not empty", null));
+        row.save(writer, options);
+        Assert.assertEquals(writer.getBuffer().toString(),
+                "{\"flagged\":false,\"starred\":false,\"cells\":[{\"v\":\"I'm not empty\"}]}");
+    }
+
+    @Test
+    public void saveRowWithRecordIndex() {
+        Row row = new Row(5);
+        row.setCell(0, new Cell("I'm not empty", null));
+        when(options.containsKey("rowIndex")).thenReturn(true);
+        when(options.get("rowIndex")).thenReturn(0);
+        when(options.containsKey("recordIndex")).thenReturn(true);
+        when(options.get("recordIndex")).thenReturn(1);
+        row.save(writer, options);
+        Assert.assertEquals(
+                writer.getBuffer().toString(),
+                "{\"flagged\":false,\"starred\":false,\"cells\":[{\"v\":\"I'm not empty\"}],\"i\":0,\"j\":1}");
+    }
+
+    @Test
+    public void toStringTest() {
+        Row row = new Row(5);
+        row.setCell(0, new Cell(1, null));
+        row.setCell(1, new Cell(2, null));
+        row.setCell(2, new Cell(3, null));
+        row.setCell(3, new Cell(4, null));
+        row.setCell(4, new Cell(5, null));
+        Assert.assertEquals(row.toString(), "1,2,3,4,5,");
+    }
+
+    @Test
+    public void blankCell() {
+        Row row = new Row(5);
+        Assert.assertTrue(row.isCellBlank(0));
+    }
+
+    @Test
+    public void nonBlankCell() {
+        Row row = new Row(5);
+        row.setCell(0, new Cell("I'm not empty", null));
+        Assert.assertFalse(row.isCellBlank(0));
+        row.setCell(3, new Cell("I'm not empty", null));
+        Assert.assertFalse(row.isCellBlank(3));
+    }
+
+    @Test
+    public void getFlaggedField() {
+        Row row = new Row(5);
+        row.flagged = true;
+        Assert.assertTrue((Boolean) row.getField("flagged", options));
+    }
+
+    @Test
+    public void getStarredField() {
+        Row row = new Row(5);
+        row.starred = true;
+        Assert.assertTrue((Boolean) row.getField("starred", options));
+    }
+
+}