Index: Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs
===================================================================
diff -u -r764e091fd9cde60228960a6ba3e3736e4e4fd7bd -r18717ab15e848b490cff0995c15b98fc77a27aef
--- Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs	(.../DataGridViewControl.cs)	(revision 764e091fd9cde60228960a6ba3e3736e4e4fd7bd)
+++ Core/Common/src/Core.Common.Controls/DataGrid/DataGridViewControl.cs	(.../DataGridViewControl.cs)	(revision 18717ab15e848b490cff0995c15b98fc77a27aef)
@@ -448,7 +448,7 @@
         }
 
         /// <summary>
-        /// 
+        /// Clears the column collection.
         /// </summary>
         public void ClearColumns()
         {
Index: Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs
===================================================================
diff -u -rdd0ee44b3b6b22f58ed82e3352aece504f447745 -r18717ab15e848b490cff0995c15b98fc77a27aef
--- Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs	(.../DataGridViewControlTest.cs)	(revision dd0ee44b3b6b22f58ed82e3352aece504f447745)
+++ Core/Common/test/Core.Common.Controls.Test/DataGrid/DataGridViewControlTest.cs	(.../DataGridViewControlTest.cs)	(revision 18717ab15e848b490cff0995c15b98fc77a27aef)
@@ -719,6 +719,7 @@
         [Test]
         public void RefreshDataGridView_ShouldAutoResizeFalseAndShorterText_SameColumnWidth()
         {
+            // Setup
             using (var form = new Form())
             using (var control = new DataGridViewControl())
             {
@@ -746,7 +747,33 @@
                 Assert.AreEqual(newTextWidth, initialWidth);
             }
         }
+        
+        [Test]
+        public void DataGridView_ClearColumns_ClearsAllColumns()
+        {
+            // Setup
+            using (var form = new Form())
+            using (var control = new DataGridViewControl())
+            {
+                form.Controls.Add(control);
+                form.Show();
 
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+
+                control.AddTextBoxColumn("Test property", "Test header");
+                control.AddTextBoxColumn("Test property2", "Test header2");
+
+                // Precondition
+                Assert.AreEqual(2, dataGridView.Columns.Count);
+                
+                // Call
+                control.ClearColumns();
+
+                // Assert
+                Assert.AreEqual(0, dataGridView.Columns.Count);
+            }
+        }
+
         [Test]
         public void AutoResizeColumns_AddLongerText_IncreasesColumnWidth()
         {