Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresScenariosContext.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresScenariosContext.cs	(revision 0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PresentationObjects/ClosingStructuresScenariosContext.cs	(revision d02fb5898bd5e5964c1798f3926b458cd777aaf3)
@@ -0,0 +1,57 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Controls.PresentationObjects;
+using Ringtoets.ClosingStructures.Data;
+using Ringtoets.Common.Data.Calculation;
+
+namespace Ringtoets.ClosingStructures.Forms.PresentationObjects
+{
+    /// <summary>
+    /// Presentation object for configuration of scenarios for the closing structures
+    /// failure mechanism.
+    /// </summary>
+    public class ClosingStructuresScenariosContext : WrappedObjectContextBase<CalculationGroup>
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="ClosingStructuresScenariosContext"/>.
+        /// </summary>
+        /// <param name="wrappedData">The wrapped <see cref="CalculationGroup"/>.</param>
+        /// <param name="failureMechanism">A <see cref="ClosingStructuresFailureMechanism"/> forming the context.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        public ClosingStructuresScenariosContext(CalculationGroup wrappedData, ClosingStructuresFailureMechanism failureMechanism)
+            : base(wrappedData)
+        {
+            if (failureMechanism == null)
+            {
+                throw new ArgumentNullException("failureMechanism");
+            }
+
+            ParentFailureMechanism = failureMechanism;
+        }
+
+        /// <summary>
+        /// The parent failure mechanism of the calculation group.
+        /// </summary>
+        public ClosingStructuresFailureMechanism ParentFailureMechanism { get; private set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj
===================================================================
diff -u -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b -rd02fb5898bd5e5964c1798f3926b458cd777aaf3
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj	(.../Ringtoets.ClosingStructures.Forms.csproj)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Ringtoets.ClosingStructures.Forms.csproj	(.../Ringtoets.ClosingStructures.Forms.csproj)	(revision d02fb5898bd5e5964c1798f3926b458cd777aaf3)
@@ -40,6 +40,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="PresentationObjects\ClosingStructuresScenariosContext.cs" />
     <Compile Include="PropertyClasses\ClosingStructureProperties.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresCalculationContext.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresContext.cs" />
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresScenariosContextTest.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresScenariosContextTest.cs	(revision 0)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresScenariosContextTest.cs	(revision d02fb5898bd5e5964c1798f3926b458cd777aaf3)
@@ -0,0 +1,64 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Controls.PresentationObjects;
+using NUnit.Framework;
+using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Forms.PresentationObjects;
+using Ringtoets.Common.Data.Calculation;
+
+namespace Ringtoets.ClosingStructures.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class ClosingStructuresScenariosContextTest
+    {
+        [Test]
+        public void Constructor_FailureMechanismNull_ThrowArgumentNullException()
+        {
+            // Setup
+            var calculationGroup = new CalculationGroup();
+
+            // Call
+            TestDelegate test = () => new ClosingStructuresScenariosContext(calculationGroup, null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            var calculationGroup = new CalculationGroup();
+            var failureMechanism = new ClosingStructuresFailureMechanism();
+
+            // Call
+            var context = new ClosingStructuresScenariosContext(calculationGroup, failureMechanism);
+
+            // Assert
+            Assert.IsInstanceOf<WrappedObjectContextBase<CalculationGroup>>(context);
+            Assert.AreSame(calculationGroup, context.WrappedData);
+            Assert.AreSame(failureMechanism, context.ParentFailureMechanism);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj
===================================================================
diff -u -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b -rd02fb5898bd5e5964c1798f3926b458cd777aaf3
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj	(.../Ringtoets.ClosingStructures.Forms.Test.csproj)	(revision d02fb5898bd5e5964c1798f3926b458cd777aaf3)
@@ -67,6 +67,7 @@
     <Compile Include="PresentationObjects\ClosingStructuresContextBaseTest.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresFailureMechanismContextTest.cs" />
     <Compile Include="PresentationObjects\ClosingStructuresInputContextTest.cs" />
+    <Compile Include="PresentationObjects\ClosingStructuresScenariosContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyClasses\ClosingStructurePropertiesTest.cs" />
     <Compile Include="TreeNodeInfos\ClosingStructuresCalculationContextTreeNodeInfoTest.cs" />
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresScenariosContext.cs
===================================================================
diff -u -r2f94a4a9a4058aa718129ba8d399e5944a994070 -rd02fb5898bd5e5964c1798f3926b458cd777aaf3
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresScenariosContext.cs	(.../HeightStructuresScenariosContext.cs)	(revision 2f94a4a9a4058aa718129ba8d399e5944a994070)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PresentationObjects/HeightStructuresScenariosContext.cs	(.../HeightStructuresScenariosContext.cs)	(revision d02fb5898bd5e5964c1798f3926b458cd777aaf3)
@@ -19,14 +19,15 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Core.Common.Controls.PresentationObjects;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.HeightStructures.Data;
 
 namespace Ringtoets.HeightStructures.Forms.PresentationObjects
 {
     /// <summary>
-    /// Presentation object for configuration of scenarios for the Grass Cover Erosion Inwards
+    /// Presentation object for configuration of scenarios for the height structures
     /// failure mechanism.
     /// </summary>
     public class HeightStructuresScenariosContext : WrappedObjectContextBase<CalculationGroup>
@@ -36,12 +37,21 @@
         /// </summary>
         /// <param name="wrappedData">The wrapped <see cref="CalculationGroup"/>.</param>
         /// <param name="failureMechanism">A <see cref="HeightStructuresFailureMechanism"/> forming the context.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
         public HeightStructuresScenariosContext(CalculationGroup wrappedData, HeightStructuresFailureMechanism failureMechanism)
             : base(wrappedData)
         {
+            if (failureMechanism == null)
+            {
+                throw new ArgumentNullException("failureMechanism");
+            }
+
             ParentFailureMechanism = failureMechanism;
         }
 
+        /// <summary>
+        /// The parent failure mechanism of the calculation group.
+        /// </summary>
         public HeightStructuresFailureMechanism ParentFailureMechanism { get; private set; }
     }
 }
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresScenariosContextTest.cs
===================================================================
diff -u
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresScenariosContextTest.cs	(revision 0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresScenariosContextTest.cs	(revision d02fb5898bd5e5964c1798f3926b458cd777aaf3)
@@ -0,0 +1,64 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Controls.PresentationObjects;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.HeightStructures.Data;
+using Ringtoets.HeightStructures.Forms.PresentationObjects;
+
+namespace Ringtoets.HeightStructures.Forms.Test.PresentationObjects
+{
+    [TestFixture]
+    public class HeightStructuresScenariosContextTest
+    {
+        [Test]
+        public void Constructor_FailureMechanismNull_ThrowArgumentNullException()
+        {
+            // Setup
+            var calculationGroup = new CalculationGroup();
+
+            // Call
+            TestDelegate test = () => new HeightStructuresScenariosContext(calculationGroup, null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("failureMechanism", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            var calculationGroup = new CalculationGroup();
+            var failureMechanism = new HeightStructuresFailureMechanism();
+
+            // Call
+            var context = new HeightStructuresScenariosContext(calculationGroup, failureMechanism);
+
+            // Assert
+            Assert.IsInstanceOf<WrappedObjectContextBase<CalculationGroup>>(context);
+            Assert.AreSame(calculationGroup, context.WrappedData);
+            Assert.AreSame(failureMechanism, context.ParentFailureMechanism);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj
===================================================================
diff -u -r2f94a4a9a4058aa718129ba8d399e5944a994070 -rd02fb5898bd5e5964c1798f3926b458cd777aaf3
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj	(.../Ringtoets.HeightStructures.Forms.Test.csproj)	(revision 2f94a4a9a4058aa718129ba8d399e5944a994070)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Ringtoets.HeightStructures.Forms.Test.csproj	(.../Ringtoets.HeightStructures.Forms.Test.csproj)	(revision d02fb5898bd5e5964c1798f3926b458cd777aaf3)
@@ -66,6 +66,7 @@
     <Compile Include="PresentationObjects\HeightStructuresCalculationGroupContextTest.cs" />
     <Compile Include="PresentationObjects\HeightStructuresContextBaseTest.cs" />
     <Compile Include="PresentationObjects\HeightStructuresFailureMechanismContextTest.cs" />
+    <Compile Include="PresentationObjects\HeightStructuresScenariosContextTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyClasses\HeightStructurePropertiesTest.cs" />
     <Compile Include="PropertyClasses\HeightStructuresFailureMechanismContextPropertiesTest.cs" />