Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs
===================================================================
diff -u -r711f6909f672eff30cea67489cb7372f01e7aff9 -r027027b23d66d1372718b775d7f2626cfd025910
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs	(.../GrassCoverErosionInwardsOutputPropertiesTest.cs)	(revision 711f6909f672eff30cea67489cb7372f01e7aff9)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsOutputPropertiesTest.cs	(.../GrassCoverErosionInwardsOutputPropertiesTest.cs)	(revision 027027b23d66d1372718b775d7f2626cfd025910)
@@ -53,17 +53,31 @@
         [Test]
         public void Constructor_ExpectedValues()
         {
+            // Setup
+            var data = new TestGrassCoverErosionInwardsOutput();
+
             // Call
-            var properties = new GrassCoverErosionInwardsOutputProperties();
+            var properties = new GrassCoverErosionInwardsOutputProperties(data);
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<GrassCoverErosionInwardsOutput>>(properties);
-            Assert.IsNull(properties.Data);
+            Assert.AreSame(data, properties.Data);
         }
 
         [Test]
-        public void Data_SetNewInputContextInstance_ReturnCorrectPropertyValues()
+        public void Constructor_DataNull_ThrowsArgumentNullException()
         {
+            // Call
+            TestDelegate test = () => new GrassCoverErosionInwardsOutputProperties(null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("data", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_WithDataSet_ReturnCorrectPropertyValues()
+        {
             // Setup
             var random = new Random();
             double waveHeight = random.NextDouble();
@@ -108,10 +122,7 @@
             var output = new GrassCoverErosionInwardsOutput(resultOutput, dikeHeightOutput, overtoppingRateOutput);
 
             // Call
-            var properties = new GrassCoverErosionInwardsOutputProperties
-            {
-                Data = output
-            };
+            var properties = new GrassCoverErosionInwardsOutputProperties(output);
 
             // Assert
             Assert.AreEqual(2, properties.WaveHeight.NumberOfDecimalPlaces);
@@ -179,10 +190,7 @@
                                                             overtoppingRateOutput);
 
             // Call
-            var properties = new GrassCoverErosionInwardsOutputProperties
-            {
-                Data = output
-            };
+            var properties = new GrassCoverErosionInwardsOutputProperties(output);
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
@@ -223,10 +231,7 @@
                                                             overtoppingRateOutput);
 
             // Call
-            var properties = new GrassCoverErosionInwardsOutputProperties
-            {
-                Data = output
-            };
+            var properties = new GrassCoverErosionInwardsOutputProperties(output);
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
@@ -259,10 +264,7 @@
             var output = new GrassCoverErosionInwardsOutput(resultOutput, null, null);
 
             // Call
-            var properties = new GrassCoverErosionInwardsOutputProperties
-            {
-                Data = output
-            };
+            var properties = new GrassCoverErosionInwardsOutputProperties(output);
 
             // Assert
             int propertiesCount = double.IsNaN(waveHeight) ? 6 : 7;