Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutput.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsOutput.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutput.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -38,8 +38,8 @@
         /// </summary>
         /// <param name="waveRunUpOutput">The wave conditions output for wave run up.</param>
         /// <param name="waveImpactOutput">The wave conditions output for wave impact.</param>
-        public GrassCoverErosionOutwardsWaveConditionsOutput(IEnumerable<WaveConditionsOutput> waveRunUpOutput, 
-                                                             IEnumerable<WaveConditionsOutput> waveImpactOutput)
+        internal GrassCoverErosionOutwardsWaveConditionsOutput(IEnumerable<WaveConditionsOutput> waveRunUpOutput,
+                                                               IEnumerable<WaveConditionsOutput> waveImpactOutput)
         {
             WaveRunUpOutput = waveRunUpOutput;
             WaveImpactOutput = waveImpactOutput;
Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/Properties/AssemblyInfo.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Data/Properties/AssemblyInfo.cs	(.../AssemblyInfo.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -20,6 +20,9 @@
 // All rights reserved.
 
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 [assembly: AssemblyTitle("Riskeer.GrassCoverErosionOutwards.Data")]
-[assembly: AssemblyProduct("Riskeer.GrassCoverErosionOutwards.Data")]
\ No newline at end of file
+[assembly: AssemblyProduct("Riskeer.GrassCoverErosionOutwards.Data")]
+[assembly: InternalsVisibleTo("Riskeer.GrassCoverErosionOutwards.Data.Test")]
+[assembly: InternalsVisibleTo("Riskeer.GrassCoverErosionOutwards.Data.TestUtil")]
\ No newline at end of file
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs	(.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -28,6 +28,7 @@
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Data;
+using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.Revetment.Data;
 
 namespace Riskeer.GrassCoverErosionOutwards.Forms.Test
@@ -359,7 +360,7 @@
         {
             return new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
         }
     }
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -27,6 +27,7 @@
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Data;
+using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Forms.PropertyClasses;
 using Riskeer.Revetment.Data.TestUtil;
 using Riskeer.Revetment.Forms.PropertyClasses;
@@ -51,24 +52,25 @@
         public void Data_WithCalculationOutput_ReturnsExpectedValues()
         {
             // Setup
-            var items = new[]
+            var waveRunUpOutput = new[]
             {
                 new TestWaveConditionsOutput()
             };
 
-            var grassCoverErosionOutwardsWaveConditionsOutput = new GrassCoverErosionOutwardsWaveConditionsOutput(items, null);
+            GrassCoverErosionOutwardsWaveConditionsOutput output = 
+                GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create(waveRunUpOutput, null);
 
             // Call
             var properties = new GrassCoverErosionOutwardsWaveConditionsOutputProperties
             {
-                Data = grassCoverErosionOutwardsWaveConditionsOutput
+                Data = output
             };
 
             // Assert 
             CollectionAssert.AllItemsAreInstancesOfType(properties.Items, typeof(WaveConditionsOutputProperties));
-            Assert.AreEqual(items.Length, properties.Items.Length);
+            Assert.AreEqual(waveRunUpOutput.Length, properties.Items.Length);
 
-            TestWaveConditionsOutput firstOutput = items[0];
+            TestWaveConditionsOutput firstOutput = waveRunUpOutput[0];
             WaveConditionsOutputProperties firstOutputProperties = properties.Items[0];
             Assert.AreEqual(firstOutput.WaterLevel, firstOutputProperties.WaterLevel);
             Assert.AreEqual(firstOutput.WaveHeight, firstOutputProperties.WaveHeight);
@@ -90,17 +92,12 @@
         public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
         {
             // Setup
-            var items = new[]
-            {
-                new TestWaveConditionsOutput()
-            };
+            GrassCoverErosionOutwardsWaveConditionsOutput output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create();
 
-            var grassCoverErosionOutwardsOutputProperties = new GrassCoverErosionOutwardsWaveConditionsOutput(items, null);
-
             // Call
             var properties = new GrassCoverErosionOutwardsWaveConditionsOutputProperties
             {
-                Data = grassCoverErosionOutwardsOutputProperties
+                Data = output
             };
 
             // Assert
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -21,14 +21,14 @@
 
 using System;
 using System.IO;
-using System.Linq;
 using Core.Common.Base.Data;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Data;
+using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.IO.Exporters;
 using Riskeer.Revetment.Data;
 using Riskeer.Revetment.Data.TestUtil;
@@ -116,7 +116,7 @@
                 {
                     new GrassCoverErosionOutwardsWaveConditionsCalculation
                     {
-                        Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                        Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
                     }
                 };
 
@@ -160,10 +160,14 @@
                             UpperBoundaryWaterLevels = (RoundedDouble) 84.26548,
                             CategoryType = FailureMechanismCategoryType.LowerLimitNorm
                         },
-                        Output = new GrassCoverErosionOutwardsWaveConditionsOutput(new[]
-                        {
-                            new TestWaveConditionsOutput()
-                        }, null)
+                        Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create(
+                            new[]
+                            {
+                                new TestWaveConditionsOutput()
+                            }, new[]
+                            {
+                                new TestWaveConditionsOutput()
+                            })
                     }
                 };
 
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextWaveConditionsExportInfoTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextWaveConditionsExportInfoTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -29,6 +29,7 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Data;
+using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Riskeer.GrassCoverErosionOutwards.IO.Exporters;
 using Riskeer.Revetment.Data;
@@ -145,7 +146,7 @@
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             });
 
             var context = new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, failureMechanism, assessmentSection);
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -29,6 +29,7 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.GrassCoverErosionOutwards.Data;
+using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Riskeer.Revetment.Data.TestUtil;
 using Riskeer.Revetment.IO.WaveConditions;
@@ -128,10 +129,7 @@
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(
                 new GrassCoverErosionOutwardsWaveConditionsCalculation
                 {
-                    Output = new GrassCoverErosionOutwardsWaveConditionsOutput(new[]
-                    {
-                        new TestWaveConditionsOutput()
-                    }, null)
+                    Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
                 },
                 new CalculationGroup(),
                 new GrassCoverErosionOutwardsFailureMechanism(),
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextWaveConditionsExportInfoTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -29,6 +29,7 @@
 using Riskeer.Common.Data.AssessmentSection;
 using Riskeer.Common.Data.Calculation;
 using Riskeer.GrassCoverErosionOutwards.Data;
+using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Riskeer.Revetment.Data.TestUtil;
 using Riskeer.Revetment.IO.WaveConditions;
@@ -132,12 +133,7 @@
 
             if (hasOutput)
             {
-                var output = new[]
-                {
-                    new TestWaveConditionsOutput()
-                };
-
-                calculation.Output = new GrassCoverErosionOutwardsWaveConditionsOutput(output, null);
+                calculation.Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create();
             }
 
             calculationGroup.Children.Add(calculation);
@@ -168,11 +164,7 @@
             GrassCoverErosionOutwardsWaveConditionsOutput grassCoverErosionOutwardsWaveConditionsOutput = null;
             if (hasOutput)
             {
-                var output = new[]
-                {
-                    new TestWaveConditionsOutput()
-                };
-                grassCoverErosionOutwardsWaveConditionsOutput = new GrassCoverErosionOutwardsWaveConditionsOutput(output, null);
+                grassCoverErosionOutwardsWaveConditionsOutput = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create();
             }
 
             calculationGroup.Children.Add(
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -183,7 +183,7 @@
             var parent = new CalculationGroup();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             calculation.Attach(observer);
 
@@ -211,7 +211,7 @@
             var parent = new CalculationGroup();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation);
@@ -242,7 +242,7 @@
             var parent = new CalculationGroup();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation,
@@ -274,7 +274,7 @@
             var parent = new CalculationGroup();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation);
@@ -379,7 +379,7 @@
             var parent = new CalculationGroup();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var foreshoreProfile = new TestForeshoreProfile(new BreakWater(BreakWaterType.Caisson, 1));
 
@@ -915,7 +915,7 @@
                 {
                     ForeshoreProfile = foreshoreProfileInput
                 },
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
 
             var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation,
@@ -1627,7 +1627,7 @@
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 Name = "A",
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation,
                                                                                         parent,
@@ -1682,7 +1682,7 @@
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 Name = "A",
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             calculation.Attach(observer);
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(calculation,
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -1348,9 +1348,9 @@
 
             var group = new CalculationGroup();
             GrassCoverErosionOutwardsWaveConditionsCalculation calculationA = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
-            calculationA.Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null);
+            calculationA.Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create();
             GrassCoverErosionOutwardsWaveConditionsCalculation calculationB = GetValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First());
-            calculationB.Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null);
+            calculationB.Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create();
             group.Children.Add(calculationA);
             group.Children.Add(calculationB);
             calculationA.Attach(observerA);
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsOutputTreeNodeInfoTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsOutputTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputTreeNodeInfoTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsOutputTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsOutputTreeNodeInfoTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -28,6 +28,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Riskeer.GrassCoverErosionOutwards.Data;
+using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.Revetment.Data;
 using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
 
@@ -70,14 +71,12 @@
         public void Text_Always_ReturnName()
         {
             // Setup
-            var output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null);
-
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
 
                 // Call
-                string nodeText = info.Text(output);
+                string nodeText = info.Text(null);
 
                 // Assert
                 Assert.AreEqual("Resultaat", nodeText);
@@ -88,14 +87,12 @@
         public void Image_Always_ReturnOutputIcon()
         {
             // Setup
-            var output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null);
-
             using (var plugin = new GrassCoverErosionOutwardsPlugin())
             {
                 TreeNodeInfo info = GetInfo(plugin);
 
                 // Call
-                Image icon = info.Image(output);
+                Image icon = info.Image(null);
 
                 // Assert
                 TestHelper.AssertImagesAreEqual(RiskeerCommonFormsResources.GeneralOutputIcon, icon);
@@ -109,7 +106,7 @@
             var mocks = new MockRepository();
             using (var treeViewControl = new TreeViewControl())
             {
-                var output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null);
+                GrassCoverErosionOutwardsWaveConditionsOutput output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create();
 
                 var menuBuilder = mocks.StrictMock<IContextMenuBuilder>();
                 using (mocks.Ordered())
Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs	(.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs	(.../GrassCoverErosionOutwardsDataSynchronizationServiceTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -54,7 +54,7 @@
             // Setup
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
 
             // Precondition
@@ -254,15 +254,15 @@
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
             var calculationWithOutput = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var calculationWithOutputAndHydraulicBoundaryLocation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 },
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var calculationWithHydraulicBoundaryLocation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
@@ -275,15 +275,15 @@
             var subCalculation = new GrassCoverErosionOutwardsWaveConditionsCalculation();
             var subCalculationWithOutput = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var subCalculationWithOutputAndHydraulicBoundaryLocation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 },
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var subCalculationWithHydraulicBoundaryLocation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
Index: Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs	(.../ForeshoreProfileUpdateDataStrategyIntegrationTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/Integration/test/Riskeer.Integration.Test/FileImporters/ForeshoreProfileUpdateDataStrategyIntegrationTest.cs	(.../ForeshoreProfileUpdateDataStrategyIntegrationTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -34,6 +34,7 @@
 using Riskeer.Common.Data.FailureMechanism;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Data;
+using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.HeightStructures.Data;
 using Riskeer.HeightStructures.Data.TestUtil;
 using Riskeer.Integration.Plugin.FileImporters;
@@ -275,10 +276,7 @@
                 {
                     ForeshoreProfile = unaffectedForeshoreProfile
                 },
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(new[]
-                {
-                    new TestWaveConditionsOutput()
-                }, null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             grassCoverErosionOutwardsFailureMechanism.WaveConditionsCalculationGroup.Children.Add(unaffectedCalculation);
             return grassCoverErosionOutwardsFailureMechanism;
Index: Riskeer/Integration/test/Riskeer.Integration.Test/Riskeer.Integration.Test.csproj
===================================================================
diff -u -r76aa972dd3f20d52926f6f6fafdb9dc13ee0deb3 -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/Integration/test/Riskeer.Integration.Test/Riskeer.Integration.Test.csproj	(.../Riskeer.Integration.Test.csproj)	(revision 76aa972dd3f20d52926f6f6fafdb9dc13ee0deb3)
+++ Riskeer/Integration/test/Riskeer.Integration.Test/Riskeer.Integration.Test.csproj	(.../Riskeer.Integration.Test.csproj)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -70,6 +70,10 @@
       <Project>{E7225477-577F-4A17-B7EC-6721158E1543}</Project>
       <Name>Riskeer.GrassCoverErosionOutwards.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\test\Riskeer.GrassCoverErosionOutwards.Data.TestUtil\Riskeer.GrassCoverErosionOutwards.Data.TestUtil.csproj">
+      <Project>{D1234D03-76BC-437D-B941-DFF14A2A108D}</Project>
+      <Name>Riskeer.GrassCoverErosionOutwards.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\HeightStructures\src\Riskeer.HeightStructures.Data\Riskeer.HeightStructures.Data.csproj">
       <Project>{1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99}</Project>
       <Name>Riskeer.HeightStructures.Data</Name>
Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/Riskeer.Integration.TestUtil.csproj
===================================================================
diff -u -rca96fecb4ca761fdbbb0f320d0eda7a6ea456c56 -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/Integration/test/Riskeer.Integration.TestUtil/Riskeer.Integration.TestUtil.csproj	(.../Riskeer.Integration.TestUtil.csproj)	(revision ca96fecb4ca761fdbbb0f320d0eda7a6ea456c56)
+++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/Riskeer.Integration.TestUtil.csproj	(.../Riskeer.Integration.TestUtil.csproj)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -94,6 +94,10 @@
       <Project>{e7225477-577f-4a17-b7ec-6721158e1543}</Project>
       <Name>Riskeer.GrassCoverErosionOutwards.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\test\Riskeer.GrassCoverErosionOutwards.Data.TestUtil\Riskeer.GrassCoverErosionOutwards.Data.TestUtil.csproj">
+      <Project>{D1234D03-76BC-437D-B941-DFF14A2A108D}</Project>
+      <Name>Riskeer.GrassCoverErosionOutwards.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\HeightStructures\src\Riskeer.HeightStructures.Data\Riskeer.HeightStructures.Data.csproj">
       <Project>{1c0017d8-35b5-4ca0-8fc7-a83f46dbdc99}</Project>
       <Name>Riskeer.HeightStructures.Data</Name>
Index: Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/Integration/test/Riskeer.Integration.TestUtil/TestDataGenerator.cs	(.../TestDataGenerator.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -37,6 +37,7 @@
 using Riskeer.GrassCoverErosionInwards.Data;
 using Riskeer.GrassCoverErosionInwards.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Data;
+using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.HeightStructures.Data;
 using Riskeer.Integration.Data;
 using Riskeer.Integration.Service;
@@ -935,9 +936,9 @@
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 },
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
-            var calculationWithHydraulicBoundaryLocationAndhForeshoreProfile = new GrassCoverErosionOutwardsWaveConditionsCalculation
+            var calculationWithHydraulicBoundaryLocationAndForeshoreProfile = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 InputParameters =
                 {
@@ -952,7 +953,7 @@
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                     ForeshoreProfile = profile2
                 },
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var calculationWithHydraulicBoundaryLocation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
@@ -970,15 +971,15 @@
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation,
                     ForeshoreProfile = profile2
                 },
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var subCalculationWithOutputAndHydraulicBoundaryLocation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
                 InputParameters =
                 {
                     HydraulicBoundaryLocation = hydraulicBoundaryLocation
                 },
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(Enumerable.Empty<WaveConditionsOutput>(), null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create()
             };
             var subCalculationWithHydraulicBoundaryLocation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
@@ -998,7 +999,7 @@
 
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculation);
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocation);
-            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithHydraulicBoundaryLocationAndhForeshoreProfile);
+            failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithHydraulicBoundaryLocationAndForeshoreProfile);
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithOutputAndHydraulicBoundaryLocationAndForeshoreProfile);
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(calculationWithHydraulicBoundaryLocation);
             failureMechanism.WaveConditionsCalculationGroup.Children.Add(new CalculationGroup
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -105,7 +105,7 @@
                                                                      .OrderBy(e => e.Order)
                                                                      .Select(e => e.Read())
                                                                      .ToList();
-            calculation.Output = new GrassCoverErosionOutwardsWaveConditionsOutput(waveConditionsOutputs, null);
+            calculation.Output = GrassCoverErosionOutwardsWaveConditionsOutputFactory.CreateOutputWithWaveImpact(waveConditionsOutputs);
         }
 
         private static ForeshoreProfile GetDikeProfileValue(ForeshoreProfileEntity foreshoreProfileEntity,
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -27,6 +27,7 @@
 using Riskeer.Common.Data.Hydraulics;
 using Riskeer.Common.Data.TestUtil;
 using Riskeer.GrassCoverErosionOutwards.Data;
+using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.Revetment.Data;
 using Riskeer.Revetment.Data.TestUtil;
 using Riskeer.Storage.Core.Create;
@@ -222,10 +223,15 @@
             var registry = new PersistenceRegistry();
             var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
             {
-                Output = new GrassCoverErosionOutwardsWaveConditionsOutput(new[]
-                {
-                    new TestWaveConditionsOutput()
-                }, null)
+                Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create(
+                    new[]
+                    {
+                        new TestWaveConditionsOutput()
+                    },
+                    new[]
+                    {
+                        new TestWaveConditionsOutput()
+                    })
             };
 
             // Call
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Riskeer.Storage.Core.Test.csproj
===================================================================
diff -u -r76aa972dd3f20d52926f6f6fafdb9dc13ee0deb3 -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Riskeer.Storage.Core.Test.csproj	(.../Riskeer.Storage.Core.Test.csproj)	(revision 76aa972dd3f20d52926f6f6fafdb9dc13ee0deb3)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Riskeer.Storage.Core.Test.csproj	(.../Riskeer.Storage.Core.Test.csproj)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -362,6 +362,10 @@
       <Project>{1c0017d8-35b5-4ca0-8fc7-a83f46dbdc99}</Project>
       <Name>Riskeer.HeightStructures.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\test\Riskeer.GrassCoverErosionOutwards.Data.TestUtil\Riskeer.GrassCoverErosionOutwards.Data.TestUtil.csproj">
+      <Project>{D1234D03-76BC-437D-B941-DFF14A2A108D}</Project>
+      <Name>Riskeer.GrassCoverErosionOutwards.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Integration\src\Riskeer.Integration.Data\Riskeer.Integration.Data.csproj">
       <Project>{11f1f874-45af-43e4-8ae5-15a5c9593e28}</Project>
       <Name>Riskeer.Integration.Data</Name>
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs
===================================================================
diff -u -r68f02442e2e790aaa0bde531c328662819908f10 -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs	(.../RiskeerProjectTestHelperTest.cs)	(revision 68f02442e2e790aaa0bde531c328662819908f10)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil.Test/RiskeerProjectTestHelperTest.cs	(.../RiskeerProjectTestHelperTest.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -313,6 +313,9 @@
 
             var calculationWithOutput = (GrassCoverErosionOutwardsWaveConditionsCalculation) failureMechanism.WaveConditionsCalculationGroup.Children[2];
             Assert.IsTrue(calculationWithOutput.HasOutput);
+            GrassCoverErosionOutwardsWaveConditionsOutput calculationOutput = calculationWithOutput.Output;
+            Assert.AreEqual(2, calculationOutput.WaveRunUpOutput.Count());
+            Assert.AreEqual(2, calculationOutput.WaveImpactOutput.Count());
         }
 
         private static void AssertStabilityStoneCoverFailureMechanism(AssessmentSection assessmentSection)
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/Riskeer.Storage.Core.TestUtil.csproj
===================================================================
diff -u -r76aa972dd3f20d52926f6f6fafdb9dc13ee0deb3 -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/Riskeer.Storage.Core.TestUtil.csproj	(.../Riskeer.Storage.Core.TestUtil.csproj)	(revision 76aa972dd3f20d52926f6f6fafdb9dc13ee0deb3)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/Riskeer.Storage.Core.TestUtil.csproj	(.../Riskeer.Storage.Core.TestUtil.csproj)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -137,6 +137,10 @@
       <Project>{1C0017D8-35B5-4CA0-8FC7-A83F46DBDC99}</Project>
       <Name>Riskeer.HeightStructures.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\GrassCoverErosionOutwards\test\Riskeer.GrassCoverErosionOutwards.Data.TestUtil\Riskeer.GrassCoverErosionOutwards.Data.TestUtil.csproj">
+      <Project>{D1234D03-76BC-437D-B941-DFF14A2A108D}</Project>
+      <Name>Riskeer.GrassCoverErosionOutwards.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Integration\src\Riskeer.Integration.Data\Riskeer.Integration.Data.csproj">
       <Project>{11F1F874-45AF-43E4-8AE5-15A5C9593E28}</Project>
       <Name>Riskeer.Integration.Data</Name>
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r357d5a595e2a17e9554ada59806a463bfc67390e -r877f0d6830122b89d78bc3e27aa3c61736617276
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 357d5a595e2a17e9554ada59806a463bfc67390e)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs	(.../RiskeerProjectTestHelper.cs)	(revision 877f0d6830122b89d78bc3e27aa3c61736617276)
@@ -43,6 +43,7 @@
 using Riskeer.DuneErosion.Data;
 using Riskeer.GrassCoverErosionInwards.Data;
 using Riskeer.GrassCoverErosionOutwards.Data;
+using Riskeer.GrassCoverErosionOutwards.Data.TestUtil;
 using Riskeer.HeightStructures.Data;
 using Riskeer.HeightStructures.Data.TestUtil;
 using Riskeer.Integration.Data;
@@ -1929,11 +1930,17 @@
                         StepSize = WaveConditionsInputStepSize.One,
                         CategoryType = FailureMechanismCategoryType.LowerLimitNorm
                     },
-                    Output = new GrassCoverErosionOutwardsWaveConditionsOutput(new[]
-                    {
-                        new WaveConditionsOutput(1, 2, 3, 4, 5, 0.6, 0.7, 0.8, 0.9, CalculationConvergence.NotCalculated),
-                        new WaveConditionsOutput(0, 1, 2, 3, 4, 0.5, 0.6, 0.7, 0.8, CalculationConvergence.NotCalculated)
-                    }, null)
+                    Output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create(
+                        new[]
+                        {
+                            new WaveConditionsOutput(1, 2, 3, 4, 5, 0.6, 0.7, 0.8, 0.9, CalculationConvergence.NotCalculated),
+                            new WaveConditionsOutput(0, 1, 2, 3, 4, 0.5, 0.6, 0.7, 0.8, CalculationConvergence.NotCalculated)
+                        },
+                        new[]
+                        {
+                            new WaveConditionsOutput(10, 20, 30, 40, 50, 0.4, 0.5, 0.6, 0.7, CalculationConvergence.NotCalculated),
+                            new WaveConditionsOutput(0, 10, 20, 30, 40, 0.7, 0.6, 0.5, 0.4, CalculationConvergence.NotCalculated)
+                        })
                 });
         }