diff --git a/t/cell.vim b/t/cell.vim
index 32a2407..efbac6d 100644
--- a/t/cell.vim
+++ b/t/cell.vim
@@ -3,47 +3,127 @@ source t/config/options.vim
 
 call vspec#hint({'scope': 'tablemode#spreadsheet#cell#scope()', 'sid': 'tablemode#spreadsheet#cell#sid()'})
 
-describe 'cell API'
-  before
-    new
-    read t/fixtures/sample.txt
+describe 'cell'
+  describe 'API'
+    before
+      new
+      read t/fixtures/sample.txt
+    end
+
+    it 'should return the cells'
+      Expect tablemode#spreadsheet#cell#GetCells(2, 1, 1) ==# 'test11'
+      " Get Rows
+      Expect tablemode#spreadsheet#cell#GetCells(2, 1) == ['test11', 'test12']
+      Expect tablemode#spreadsheet#cell#GetCells(2, 2) == ['test21', 'test22']
+      " Get Columns
+      Expect tablemode#spreadsheet#cell#GetCells(2, 0, 1) == ['test11', 'test21']
+      Expect tablemode#spreadsheet#cell#GetCells(2, 0, 2) == ['test12', 'test22']
+    end
+
+    it 'should return the cells in a range'
+      " Entire table as range
+      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:2,2', 2, 1) == [['test11', 'test21'], ['test12', 'test22']]
+
+      " Get Rows given different seed lines and columns
+      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 2, 1) == ['test11', 'test12']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 2, 2) == ['test11', 'test12']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 1) == ['test11', 'test12']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 2) == ['test11', 'test12']
+      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 2, 1) == ['test21', 'test22']
+      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 2, 2) == ['test21', 'test22']
+      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 1) == ['test21', 'test22']
+      Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 2) == ['test21', 'test22']
+
+      " Get Columns given different seed lines and column
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 2, 1) == ['test11', 'test21']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 2, 2) == ['test12', 'test22']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 1) == ['test11', 'test21']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 2) == ['test12', 'test22']
+
+      " Get Column given negative values in range for representing rows from
+      " the end, -1 being the second last row.
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 2, 1) == ['test11']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 1) == ['test11']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 2, 2) == ['test12']
+      Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 2) == ['test12']
+    end
   end
 
-  it 'should return the cells'
-    Expect tablemode#spreadsheet#cell#GetCells(2, 1, 1) ==# 'test11'
-    " Get Rows
-    Expect tablemode#spreadsheet#cell#GetCells(2, 1) == ['test11', 'test12']
-    Expect tablemode#spreadsheet#cell#GetCells(2, 2) == ['test21', 'test22']
-    " Get Columns
-    Expect tablemode#spreadsheet#cell#GetCells(2, 0, 1) == ['test11', 'test21']
-    Expect tablemode#spreadsheet#cell#GetCells(2, 0, 2) == ['test12', 'test22']
-  end
+  describe 'Motions'
+    describe 'left or right'
+      before
+        new
+        normal! ggdG
+        call tablemode#TableModeEnable()
+        normal i|test11|test12|
|test21|test22|
+        call cursor(1, 3)
+      end
 
-  it 'should return the cells in a range'
-    " Entire table as range
-    Expect tablemode#spreadsheet#cell#GetCellRange('1,1:2,2', 2, 1) == [['test11', 'test21'], ['test12', 'test22']]
+      it 'should move left when not on first column'
+        call cursor(1, 12)
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+        call tablemode#spreadsheet#cell#Motion('h')
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+      end
 
-    " Get Rows given different seed lines and columns
-    Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 2, 1) == ['test11', 'test12']
-    Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 2, 2) == ['test11', 'test12']
-    Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 1) == ['test11', 'test12']
-    Expect tablemode#spreadsheet#cell#GetCellRange('1,1:1,2', 3, 2) == ['test11', 'test12']
-    Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 2, 1) == ['test21', 'test22']
-    Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 2, 2) == ['test21', 'test22']
-    Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 1) == ['test21', 'test22']
-    Expect tablemode#spreadsheet#cell#GetCellRange('2,1:2,2', 3, 2) == ['test21', 'test22']
+      it 'should move to the previous row last column if it exists when on first column'
+        call cursor(2, 3)
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('h')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+      end
 
-    " Get Columns given different seed lines and column
-    Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 2, 1) == ['test11', 'test21']
-    Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 2, 2) == ['test12', 'test22']
-    Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 1) == ['test11', 'test21']
-    Expect tablemode#spreadsheet#cell#GetCellRange('1:2', 3, 2) == ['test12', 'test22']
+      it 'should move right when not on last column'
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('l')
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+      end
 
-    " Get Column given negative values in range for representing rows from
-    " the end, -1 being the second last row.
-    Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 2, 1) == ['test11']
-    Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 1) == ['test11']
-    Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 2, 2) == ['test12']
-    Expect tablemode#spreadsheet#cell#GetCellRange('1:-1', 3, 2) == ['test12']
+      it 'should move to the next row first column if it exists when on last column'
+        call cursor(1, 12)
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        Expect tablemode#spreadsheet#ColumnNr('.') == 2
+        call tablemode#spreadsheet#cell#Motion('l')
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+        Expect tablemode#spreadsheet#ColumnNr('.') == 1
+      end
+    end
+
+    describe 'up or down'
+      before
+        new
+        normal! ggdG
+        call tablemode#TableModeEnable()
+        normal i|test11|test12|
|test21|test22|
+        call cursor(1, 3)
+      end
+
+      it 'should move a row up unless on first row'
+        call cursor(2, 3)
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+        call tablemode#spreadsheet#cell#Motion('k')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+      end
+
+      it 'should remain on first row when trying to move up'
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('k')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+      end
+
+      it 'should move a row down unless on last row'
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('j')
+        Expect tablemode#spreadsheet#RowNr('.') == 2
+      end
+
+      it 'should remain on last row when trying to move down'
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+        call tablemode#spreadsheet#cell#Motion('k')
+        Expect tablemode#spreadsheet#RowNr('.') == 1
+      end
+    end
   end
 end
diff --git a/t/table.vim b/t/table.vim
index 3297622..8c86c8f 100644
--- a/t/table.vim
+++ b/t/table.vim
@@ -39,82 +39,4 @@ describe 'table'
       Expect tablemode#spreadsheet#ColumnCount(2) == 2
     end
   end
-
-  describe 'Motions'
-    describe 'left or right'
-      before
-        new
-        normal! ggdG
-        call tablemode#TableModeEnable()
-        normal i|test11|test12|
|test21|test22|
-        call cursor(1, 3)
-      end
-
-      it 'should move left when not on first column'
-        call cursor(1, 12)
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-        call tablemode#table#TableMotion('h')
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-      end
-
-      it 'should move to the previous row last column if it exists when on first column'
-        call cursor(2, 3)
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-        call tablemode#table#TableMotion('h')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-      end
-
-      it 'should move right when not on last column'
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-        call tablemode#table#TableMotion('l')
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-      end
-
-      it 'should move to the next row first column if it exists when on last column'
-        call cursor(1, 12)
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        Expect tablemode#spreadsheet#ColumnNr('.') == 2
-        call tablemode#table#TableMotion('l')
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        Expect tablemode#spreadsheet#ColumnNr('.') == 1
-      end
-    end
-
-    describe 'up or down'
-      before
-        new
-        normal! ggdG
-        call tablemode#TableModeEnable()
-        normal i|test11|test12|
|test21|test22|
-        call cursor(1, 3)
-      end
-
-      it 'should move a row up unless on first row'
-        call cursor(2, 3)
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-        call tablemode#table#TableMotion('k')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-      end
-
-      it 'should remain on first row when trying to move up'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#table#TableMotion('k')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-      end
-
-      it 'should move a row down unless on last row'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#table#TableMotion('j')
-        Expect tablemode#spreadsheet#RowNr('.') == 2
-      end
-
-      it 'should remain on last row when trying to move down'
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-        call tablemode#table#TableMotion('k')
-        Expect tablemode#spreadsheet#RowNr('.') == 1
-      end
-    end
-  end
 end