Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs
===================================================================
diff -u -r943ac728e2f094215c61674360ae191288b85a47 -racd4494f50f92b7e883b1c3f918b1b39b7bf261c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs	(.../MacroStabilityInwardsCalculationsViewTest.cs)	(revision 943ac728e2f094215c61674360ae191288b85a47)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs	(.../MacroStabilityInwardsCalculationsViewTest.cs)	(revision acd4494f50f92b7e883b1c3f918b1b39b7bf261c)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
@@ -108,21 +107,15 @@
             using (ShowMacroStabilityInwardsCalculationsView())
             {
                 // Call
-                var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl").TheObject;
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Assert
-                DataGridViewColumn nameColumn = dataGridViewControl.GetColumnFromIndex(nameColumnIndex);
-                Assert.AreEqual("Naam", nameColumn.HeaderText);
-                DataGridViewColumn stochasticSoilModelsColumn = dataGridViewControl.GetColumnFromIndex(stochasticSoilModelsColumnIndex);
-                Assert.AreEqual("Stochastisch ondergrondmodel", stochasticSoilModelsColumn.HeaderText);
-                DataGridViewColumn stochasticSoilProfilesColumn = dataGridViewControl.GetColumnFromIndex(stochasticSoilProfilesColumnIndex);
-                Assert.AreEqual("Ondergrondschematisatie", stochasticSoilProfilesColumn.HeaderText);
-                DataGridViewColumn stochasticSoilProfilesProbabilityColumn = dataGridViewControl.GetColumnFromIndex(stochasticSoilProfilesProbabilityColumnIndex);
-                Assert.AreEqual("Aandeel van schematisatie\r\nin het stochastische ondergrondmodel\r\n[%]", stochasticSoilProfilesProbabilityColumn.HeaderText);
-                DataGridViewColumn hydraulicBoundaryLocationColumn = dataGridViewControl.GetColumnFromIndex(selectableHydraulicBoundaryLocationsColumnIndex);
-                Assert.AreEqual("Hydraulische belastingenlocatie", hydraulicBoundaryLocationColumn.HeaderText);
-
-                Assert.Throws<ArgumentOutOfRangeException>(() => dataGridViewControl.GetColumnFromIndex(selectableHydraulicBoundaryLocationsColumnIndex + 1));
+                Assert.AreEqual(5, dataGridView.ColumnCount);
+                Assert.AreEqual("Naam", dataGridView.Columns[nameColumnIndex].HeaderText);
+                Assert.AreEqual("Stochastisch ondergrondmodel", dataGridView.Columns[stochasticSoilModelsColumnIndex].HeaderText);
+                Assert.AreEqual("Ondergrondschematisatie", dataGridView.Columns[stochasticSoilProfilesColumnIndex].HeaderText);
+                Assert.AreEqual("Aandeel van schematisatie\r\nin het stochastische ondergrondmodel\r\n[%]", dataGridView.Columns[stochasticSoilProfilesProbabilityColumnIndex].HeaderText);
+                Assert.AreEqual("Hydraulische belastingenlocatie", dataGridView.Columns[selectableHydraulicBoundaryLocationsColumnIndex].HeaderText);
             }
         }
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs
===================================================================
diff -u -r4c0537118f15af6c231ff4a781c979109a74d02b -racd4494f50f92b7e883b1c3f918b1b39b7bf261c
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs	(.../MacroStabilityInwardsScenariosViewTest.cs)	(revision 4c0537118f15af6c231ff4a781c979109a74d02b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs	(.../MacroStabilityInwardsScenariosViewTest.cs)	(revision acd4494f50f92b7e883b1c3f918b1b39b7bf261c)
@@ -25,7 +25,6 @@
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
-using Core.Common.Controls.DataGrid;
 using Core.Common.Controls.Views;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -109,19 +108,14 @@
             using (ShowMacroStabilityInwardsScenarioView())
             {
                 // Call
-                var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl").TheObject;
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Assert
-                DataGridViewColumn isRelevantColumn = dataGridViewControl.GetColumnFromIndex(isRelevantColumnIndex);
-                Assert.AreEqual("In oordeel", isRelevantColumn.HeaderText);
-                DataGridViewColumn contributionColumn = dataGridViewControl.GetColumnFromIndex(contributionColumnIndex);
-                Assert.AreEqual("Bijdrage aan\r\nscenario\r\n[%]", contributionColumn.HeaderText);
-                DataGridViewColumn nameColumn = dataGridViewControl.GetColumnFromIndex(nameColumnIndex);
-                Assert.AreEqual("Naam", nameColumn.HeaderText);
-                DataGridViewColumn failureProbabilityColumn = dataGridViewControl.GetColumnFromIndex(failureProbabilityColumnIndex);
-                Assert.AreEqual("Faalkans\r\n[1/jaar]", failureProbabilityColumn.HeaderText);
-
-                Assert.Throws<ArgumentOutOfRangeException>(() => dataGridViewControl.GetColumnFromIndex(failureProbabilityColumnIndex + 1));
+                Assert.AreEqual(4, dataGridView.ColumnCount);
+                Assert.AreEqual("In oordeel", dataGridView.Columns[isRelevantColumnIndex].HeaderText);
+                Assert.AreEqual("Bijdrage aan\r\nscenario\r\n[%]", dataGridView.Columns[contributionColumnIndex].HeaderText);
+                Assert.AreEqual("Naam", dataGridView.Columns[nameColumnIndex].HeaderText);
+                Assert.AreEqual("Faalkans\r\n[1/jaar]", dataGridView.Columns[failureProbabilityColumnIndex].HeaderText);
             }
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u -rabed5bb89a45cdc0d4ebc0e006ce6a76bdb865a1 -racd4494f50f92b7e883b1c3f918b1b39b7bf261c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision abed5bb89a45cdc0d4ebc0e006ce6a76bdb865a1)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(.../PipingCalculationsViewTest.cs)	(revision acd4494f50f92b7e883b1c3f918b1b39b7bf261c)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Globalization;
 using System.Linq;
 using System.Threading;
@@ -114,29 +113,19 @@
             using (ShowPipingCalculationsView())
             {
                 // Call
-                var dataGridViewControl = (DataGridViewControl)new ControlTester("dataGridViewControl").TheObject;
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Assert
-                DataGridViewColumn nameColumn = dataGridViewControl.GetColumnFromIndex(nameColumnIndex);
-                Assert.AreEqual("Naam", nameColumn.HeaderText);
-                DataGridViewColumn stochasticSoilModelsColumn = dataGridViewControl.GetColumnFromIndex(stochasticSoilModelsColumnIndex);
-                Assert.AreEqual("Stochastisch ondergrondmodel", stochasticSoilModelsColumn.HeaderText);
-                DataGridViewColumn stochasticSoilProfilesColumn = dataGridViewControl.GetColumnFromIndex(stochasticSoilProfilesColumnIndex);
-                Assert.AreEqual("Ondergrondschematisatie", stochasticSoilProfilesColumn.HeaderText);
-                DataGridViewColumn stochasticSoilProfilesProbabilityColumn = dataGridViewControl.GetColumnFromIndex(stochasticSoilProfilesProbabilityColumnIndex);
-                Assert.AreEqual("Aandeel van schematisatie\r\nin het stochastische ondergrondmodel\r\n[%]", stochasticSoilProfilesProbabilityColumn.HeaderText);
-                DataGridViewColumn hydraulicBoundaryLocationColumn = dataGridViewControl.GetColumnFromIndex(selectableHydraulicBoundaryLocationsColumnIndex);
-                Assert.AreEqual("Hydraulische belastingenlocatie", hydraulicBoundaryLocationColumn.HeaderText);
-                DataGridViewColumn dampingFactorExitMeanColumn = dataGridViewControl.GetColumnFromIndex(dampingFactorExitMeanColumnIndex);
-                Assert.AreEqual("Verwachtingswaarde\r\ndempingsfactor bij uitredepunt\r\n[-]", dampingFactorExitMeanColumn.HeaderText);
-                DataGridViewColumn phreaticLevelExitMeanColumn = dataGridViewControl.GetColumnFromIndex(phreaticLevelExitMeanColumnIndex);
-                Assert.AreEqual("Verwachtingswaarde\r\npolderpeil\r\n[m+NAP]", phreaticLevelExitMeanColumn.HeaderText);
-                DataGridViewColumn entryPointLColumn = dataGridViewControl.GetColumnFromIndex(entryPointLColumnIndex);
-                Assert.AreEqual("Intredepunt", entryPointLColumn.HeaderText);
-                DataGridViewColumn exitPointLColumn = dataGridViewControl.GetColumnFromIndex(exitPointLColumnIndex);
-                Assert.AreEqual("Uittredepunt", exitPointLColumn.HeaderText);
-
-                Assert.Throws<ArgumentOutOfRangeException>(() => dataGridViewControl.GetColumnFromIndex(exitPointLColumnIndex + 1));
+                Assert.AreEqual(9, dataGridView.ColumnCount);
+                Assert.AreEqual("Naam", dataGridView.Columns[nameColumnIndex].HeaderText);
+                Assert.AreEqual("Stochastisch ondergrondmodel", dataGridView.Columns[stochasticSoilModelsColumnIndex].HeaderText);
+                Assert.AreEqual("Ondergrondschematisatie", dataGridView.Columns[stochasticSoilProfilesColumnIndex].HeaderText);
+                Assert.AreEqual("Aandeel van schematisatie\r\nin het stochastische ondergrondmodel\r\n[%]", dataGridView.Columns[stochasticSoilProfilesProbabilityColumnIndex].HeaderText);
+                Assert.AreEqual("Hydraulische belastingenlocatie", dataGridView.Columns[selectableHydraulicBoundaryLocationsColumnIndex].HeaderText);
+                Assert.AreEqual("Verwachtingswaarde\r\ndempingsfactor bij uitredepunt\r\n[-]", dataGridView.Columns[dampingFactorExitMeanColumnIndex].HeaderText);
+                Assert.AreEqual("Verwachtingswaarde\r\npolderpeil\r\n[m+NAP]", dataGridView.Columns[phreaticLevelExitMeanColumnIndex].HeaderText);
+                Assert.AreEqual("Intredepunt", dataGridView.Columns[entryPointLColumnIndex].HeaderText);
+                Assert.AreEqual("Uittredepunt", dataGridView.Columns[exitPointLColumnIndex].HeaderText);
             }
         }
 
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs
===================================================================
diff -u -raeb1cd4411d0b141176963c03d05bab56df2b794 -racd4494f50f92b7e883b1c3f918b1b39b7bf261c
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision aeb1cd4411d0b141176963c03d05bab56df2b794)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs	(.../PipingScenariosViewTest.cs)	(revision acd4494f50f92b7e883b1c3f918b1b39b7bf261c)
@@ -26,7 +26,6 @@
 using Core.Common.Base;
 using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
-using Core.Common.Controls.DataGrid;
 using Core.Common.Controls.Views;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
@@ -113,25 +112,17 @@
             using (ShowPipingScenarioView())
             {
                 // Call
-                var dataGridViewControl = (DataGridViewControl) new ControlTester("dataGridViewControl").TheObject;
+                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
 
                 // Assert
-                DataGridViewColumn isRelevantColumn = dataGridViewControl.GetColumnFromIndex(isRelevantColumnIndex);
-                Assert.AreEqual("In oordeel", isRelevantColumn.HeaderText);
-                DataGridViewColumn contributionColumn = dataGridViewControl.GetColumnFromIndex(contributionColumnIndex);
-                Assert.AreEqual("Bijdrage aan\r\nscenario\r\n[%]", contributionColumn.HeaderText);
-                DataGridViewColumn nameColumn = dataGridViewControl.GetColumnFromIndex(nameColumnIndex);
-                Assert.AreEqual("Naam", nameColumn.HeaderText);
-                DataGridViewColumn failureProbabilityPipingColumn = dataGridViewControl.GetColumnFromIndex(failureProbabilityPipingColumnIndex);
-                Assert.AreEqual("Faalkans\r\n[1/jaar]", failureProbabilityPipingColumn.HeaderText);
-                DataGridViewColumn failureProbabilityUpliftColumn = dataGridViewControl.GetColumnFromIndex(failureProbabilityUpliftColumnIndex);
-                Assert.AreEqual("Kans op\r\nopbarsten\r\n[1/jaar]", failureProbabilityUpliftColumn.HeaderText);
-                DataGridViewColumn failureProbabilityHeaveColumn = dataGridViewControl.GetColumnFromIndex(failureProbabilityHeaveColumnIndex);
-                Assert.AreEqual("Kans op\r\nheave\r\n[1/jaar]", failureProbabilityHeaveColumn.HeaderText);
-                DataGridViewColumn failureProbabilitySellmeijerColumn = dataGridViewControl.GetColumnFromIndex(failureProbabilitySellmeijerColumnIndex);
-                Assert.AreEqual("Kans op\r\nterugschrijdende erosie\r\n[1/jaar]", failureProbabilitySellmeijerColumn.HeaderText);
-
-                Assert.Throws<ArgumentOutOfRangeException>(() => dataGridViewControl.GetColumnFromIndex(failureProbabilitySellmeijerColumnIndex + 1));
+                Assert.AreEqual(7, dataGridView.ColumnCount);
+                Assert.AreEqual("In oordeel", dataGridView.Columns[isRelevantColumnIndex].HeaderText);
+                Assert.AreEqual("Bijdrage aan\r\nscenario\r\n[%]", dataGridView.Columns[contributionColumnIndex].HeaderText);
+                Assert.AreEqual("Naam", dataGridView.Columns[nameColumnIndex].HeaderText);
+                Assert.AreEqual("Faalkans\r\n[1/jaar]", dataGridView.Columns[failureProbabilityPipingColumnIndex].HeaderText);
+                Assert.AreEqual("Kans op\r\nopbarsten\r\n[1/jaar]", dataGridView.Columns[failureProbabilityUpliftColumnIndex].HeaderText);
+                Assert.AreEqual("Kans op\r\nheave\r\n[1/jaar]", dataGridView.Columns[failureProbabilityHeaveColumnIndex].HeaderText);
+                Assert.AreEqual("Kans op\r\nterugschrijdende erosie\r\n[1/jaar]", dataGridView.Columns[failureProbabilitySellmeijerColumnIndex].HeaderText);
             }
         }