Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs
===================================================================
diff -u -r686466dda6406ee2c7fb1f33faa60494878b1fc8 -ra62bdac10817e985d8d81ef33ef6ac7e20a99d8a
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs	(.../PipingSoilLayerTableTest.cs)	(revision 686466dda6406ee2c7fb1f33faa60494878b1fc8)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs	(.../PipingSoilLayerTableTest.cs)	(revision a62bdac10817e985d8d81ef33ef6ac7e20a99d8a)
@@ -23,6 +23,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Base.Data;
+using Core.Common.Controls.DataGrid;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Probabilistics;
@@ -54,6 +55,8 @@
             using (var table = new PipingSoilLayerTable())
             {
                 // Assert
+                Assert.IsInstanceOf<DataGridViewControl>(table);
+
                 DataGridViewColumn nameColumn = table.GetColumnFromIndex(nameColumnIndex);
                 Assert.AreEqual("Naam", nameColumn.HeaderText);
                 DataGridViewColumn colorColumn = table.GetColumnFromIndex(colorColumnIndex);
@@ -100,7 +103,7 @@
                 table.SetData(layers);
 
                 // Assert
-                Assert.AreEqual(3, table.Rows.Count);
+                Assert.AreEqual(layers.Length, table.Rows.Count);
             }
         }
 
@@ -132,22 +135,23 @@
             // Setup
             using (var table = new PipingSoilLayerTable())
             {
-                var layers = new[]
+                table.SetData(new[]
                 {
+                    new PipingSoilLayer(1.0)
+                });
+
+                var newLayers = new[]
+                {
                     new PipingSoilLayer(2.5),
                     new PipingSoilLayer(2.3),
                     new PipingSoilLayer(1.1)
                 };
-                table.SetData(new[]
-                {
-                    new PipingSoilLayer(1.0)
-                });
 
                 // Call
-                table.SetData(layers);
+                table.SetData(newLayers);
 
                 // Assert
-                Assert.AreEqual(3, table.Rows.Count);
+                Assert.AreEqual(newLayers.Length, table.Rows.Count);
             }
         }
 
@@ -168,7 +172,7 @@
                 table.SetData(layers);
 
                 // Assert
-                Assert.AreEqual(3, table.Rows.Count);
+                Assert.AreEqual(layers.Length, table.Rows.Count);
                 for (var i = 0; i < table.Rows.Count; i++)
                 {
                     PipingSoilLayer pipingSoilLayer = layers[i];