Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs
===================================================================
diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -rebbc4fd6d5025a84b00878cae2c45b5b0dbfef80
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs	(.../ClosingStructuresCalculationGroupContextTest.cs)	(revision a1abe798a3991d9fff01eae522ccae2a43d0a931)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PresentationObjects/ClosingStructuresCalculationGroupContextTest.cs	(.../ClosingStructuresCalculationGroupContextTest.cs)	(revision ebbc4fd6d5025a84b00878cae2c45b5b0dbfef80)
@@ -37,7 +37,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void ParameteredConstructor_ExpectedValues(bool withParent)
+        public void ParameteredConstructor_ExpectedValues(bool hasParent)
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -47,7 +47,7 @@
             var calculationGroup = new CalculationGroup();
             var failureMechanism = new ClosingStructuresFailureMechanism();
 
-            CalculationGroup parent = withParent ? new CalculationGroup() : null;
+            CalculationGroup parent = hasParent ? new CalculationGroup() : null;
 
             // Call
             var groupContext = new ClosingStructuresCalculationGroupContext(calculationGroup, parent, failureMechanism, assessmentSection);
@@ -64,7 +64,8 @@
             mockRepository.VerifyAll();
         }
 
-        [TestFixture]
+        [TestFixture(true)]
+        [TestFixture(false)]
         private class ClosingStructuresCalculationGroupContextEqualsTest
             : EqualsTestFixture<ClosingStructuresCalculationGroupContext,
                 DerivedClosingStructuresCalculationGroupContext>
@@ -73,9 +74,10 @@
 
             private static readonly IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
             private static readonly ClosingStructuresFailureMechanism failureMechanism = new ClosingStructuresFailureMechanism();
-            private static readonly CalculationGroup parent = new CalculationGroup();
             private static readonly CalculationGroup calculationGroup = new CalculationGroup();
 
+            private static CalculationGroup parent;
+
             [SetUp]
             public void SetUp()
             {
@@ -88,6 +90,11 @@
                 mocks.VerifyAll();
             }
 
+            public ClosingStructuresCalculationGroupContextEqualsTest(bool hasParent)
+            {
+                parent = hasParent ? new CalculationGroup() : null;
+            }
+
             protected override ClosingStructuresCalculationGroupContext CreateObject()
             {
                 return new ClosingStructuresCalculationGroupContext(calculationGroup,
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationGroupContextTest.cs
===================================================================
diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -rebbc4fd6d5025a84b00878cae2c45b5b0dbfef80
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationGroupContextTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTest.cs)	(revision a1abe798a3991d9fff01eae522ccae2a43d0a931)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PresentationObjects/GrassCoverErosionInwardsCalculationGroupContextTest.cs	(.../GrassCoverErosionInwardsCalculationGroupContextTest.cs)	(revision ebbc4fd6d5025a84b00878cae2c45b5b0dbfef80)
@@ -37,7 +37,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void ParameteredConstructor_ExpectedValues(bool withParent)
+        public void ParameteredConstructor_ExpectedValues(bool hasParent)
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -47,7 +47,7 @@
             var calculationGroup = new CalculationGroup();
             var failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
 
-            CalculationGroup parent = withParent ? new CalculationGroup() : null;
+            CalculationGroup parent = hasParent ? new CalculationGroup() : null;
 
             // Call
             var groupContext = new GrassCoverErosionInwardsCalculationGroupContext(calculationGroup, parent, failureMechanism, assessmentSection);
@@ -63,7 +63,8 @@
             mockRepository.VerifyAll();
         }
 
-        [TestFixture]
+        [TestFixture(true)]
+        [TestFixture(false)]
         private class GrassCoverErosionInwardsCalculationGroupContextEqualsTest
             : EqualsTestFixture<GrassCoverErosionInwardsCalculationGroupContext,
                 DerivedGrassCoverErosionInwardsCalculationGroupContext>
@@ -72,9 +73,10 @@
 
             private static readonly IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
             private static readonly GrassCoverErosionInwardsFailureMechanism failureMechanism = new GrassCoverErosionInwardsFailureMechanism();
-            private static readonly CalculationGroup parent = new CalculationGroup();
             private static readonly CalculationGroup calculationGroup = new CalculationGroup();
 
+            private static CalculationGroup parent;
+
             [SetUp]
             public void SetUp()
             {
@@ -87,6 +89,11 @@
                 mocks.VerifyAll();
             }
 
+            public GrassCoverErosionInwardsCalculationGroupContextEqualsTest(bool hasParent)
+            {
+                parent = hasParent ? new CalculationGroup() : null;
+            }
+
             protected override GrassCoverErosionInwardsCalculationGroupContext CreateObject()
             {
                 return new GrassCoverErosionInwardsCalculationGroupContext(calculationGroup,
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTest.cs
===================================================================
diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -rebbc4fd6d5025a84b00878cae2c45b5b0dbfef80
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTest.cs)	(revision a1abe798a3991d9fff01eae522ccae2a43d0a931)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PresentationObjects/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTest.cs)	(revision ebbc4fd6d5025a84b00878cae2c45b5b0dbfef80)
@@ -37,7 +37,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void ParameteredConstructor_ExpectedValues(bool withParent)
+        public void ParameteredConstructor_ExpectedValues(bool hasParent)
         {
             // Setup
             var mocks = new MockRepository();
@@ -47,7 +47,7 @@
             var calculationGroup = new CalculationGroup();
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
-            CalculationGroup parent = withParent ? new CalculationGroup() : null;
+            CalculationGroup parent = hasParent ? new CalculationGroup() : null;
 
             // Call
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup, parent, failureMechanism, assessmentSection);
@@ -62,7 +62,8 @@
             mocks.VerifyAll();
         }
 
-        [TestFixture]
+        [TestFixture(true)]
+        [TestFixture(false)]
         private class GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextEqualsTest
             : EqualsTestFixture<GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext,
                 DerivedGrassCoverErosionOutwardsWaveConditionsCalculationsGroupContext>
@@ -71,9 +72,10 @@
 
             private static readonly IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
             private static readonly GrassCoverErosionOutwardsFailureMechanism failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            private static readonly CalculationGroup parent = new CalculationGroup();
             private static readonly CalculationGroup calculationGroup = new CalculationGroup();
 
+            private static CalculationGroup parent;
+
             [SetUp]
             public void SetUp()
             {
@@ -86,6 +88,11 @@
                 mocks.VerifyAll();
             }
 
+            public GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextEqualsTest(bool hasParent)
+            {
+                parent = hasParent ? new CalculationGroup() : null;
+            }
+
             protected override GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext CreateObject()
             {
                 return new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(calculationGroup,
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationGroupContextTest.cs
===================================================================
diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -rebbc4fd6d5025a84b00878cae2c45b5b0dbfef80
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationGroupContextTest.cs	(.../HeightStructuresCalculationGroupContextTest.cs)	(revision a1abe798a3991d9fff01eae522ccae2a43d0a931)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/PresentationObjects/HeightStructuresCalculationGroupContextTest.cs	(.../HeightStructuresCalculationGroupContextTest.cs)	(revision ebbc4fd6d5025a84b00878cae2c45b5b0dbfef80)
@@ -37,7 +37,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void ParameteredConstructor_ExpectedValues(bool withParent)
+        public void ParameteredConstructor_ExpectedValues(bool hasParent)
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -47,7 +47,7 @@
             var calculationGroup = new CalculationGroup();
             var failureMechanism = new HeightStructuresFailureMechanism();
 
-            CalculationGroup parent = withParent ? new CalculationGroup() : null;
+            CalculationGroup parent = hasParent ? new CalculationGroup() : null;
 
             // Call
             var groupContext = new HeightStructuresCalculationGroupContext(calculationGroup, parent, failureMechanism, assessmentSection);
@@ -64,7 +64,8 @@
             mockRepository.VerifyAll();
         }
 
-        [TestFixture]
+        [TestFixture(true)]
+        [TestFixture(false)]
         private class HeightStructuresCalculationGroupContextEqualsTest
             : EqualsTestFixture<HeightStructuresCalculationGroupContext,
                 DerivedHeightStructuresCalculationGroupContext>
@@ -73,9 +74,10 @@
 
             private static readonly IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
             private static readonly HeightStructuresFailureMechanism failureMechanism = new HeightStructuresFailureMechanism();
-            private static readonly CalculationGroup parent = new CalculationGroup();
             private static readonly CalculationGroup calculationGroup = new CalculationGroup();
 
+            private static CalculationGroup parent;
+
             [SetUp]
             public void SetUp()
             {
@@ -88,6 +90,11 @@
                 mocks.VerifyAll();
             }
 
+            public HeightStructuresCalculationGroupContextEqualsTest(bool hasParent)
+            {
+                parent = hasParent ? new CalculationGroup() : null;
+            }
+
             protected override HeightStructuresCalculationGroupContext CreateObject()
             {
                 return new HeightStructuresCalculationGroupContext(calculationGroup,
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs
===================================================================
diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -rebbc4fd6d5025a84b00878cae2c45b5b0dbfef80
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs	(.../StabilityPointStructuresCalculationGroupContextTest.cs)	(revision a1abe798a3991d9fff01eae522ccae2a43d0a931)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PresentationObjects/StabilityPointStructuresCalculationGroupContextTest.cs	(.../StabilityPointStructuresCalculationGroupContextTest.cs)	(revision ebbc4fd6d5025a84b00878cae2c45b5b0dbfef80)
@@ -37,7 +37,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void ParameteredConstructor_ExpectedValues(bool withParent)
+        public void ParameteredConstructor_ExpectedValues(bool hasParent)
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -47,7 +47,7 @@
             var calculationGroup = new CalculationGroup();
             var failureMechanism = new StabilityPointStructuresFailureMechanism();
 
-            CalculationGroup parent = withParent ? new CalculationGroup() : null;
+            CalculationGroup parent = hasParent ? new CalculationGroup() : null;
 
             // Call
             var groupContext = new StabilityPointStructuresCalculationGroupContext(calculationGroup, parent, failureMechanism, assessmentSection);
@@ -64,7 +64,8 @@
             mockRepository.VerifyAll();
         }
 
-        [TestFixture]
+        [TestFixture(true)]
+        [TestFixture(false)]
         private class StabilityPointStructuresCalculationGroupContextEqualsTest
             : EqualsTestFixture<StabilityPointStructuresCalculationGroupContext,
                 DerivedStabilityPointStructuresCalculationGroupContext>
@@ -73,9 +74,10 @@
 
             private static readonly IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
             private static readonly StabilityPointStructuresFailureMechanism failureMechanism = new StabilityPointStructuresFailureMechanism();
-            private static readonly CalculationGroup parent = new CalculationGroup();
             private static readonly CalculationGroup calculationGroup = new CalculationGroup();
 
+            private static CalculationGroup parent;
+
             [SetUp]
             public void SetUp()
             {
@@ -88,6 +90,11 @@
                 mocks.VerifyAll();
             }
 
+            public StabilityPointStructuresCalculationGroupContextEqualsTest(bool hasParent)
+            {
+                parent = hasParent ? new CalculationGroup() : null;
+            }
+
             protected override StabilityPointStructuresCalculationGroupContext CreateObject()
             {
                 return new StabilityPointStructuresCalculationGroupContext(calculationGroup,
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContextTest.cs
===================================================================
diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -rebbc4fd6d5025a84b00878cae2c45b5b0dbfef80
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContextTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTest.cs)	(revision a1abe798a3991d9fff01eae522ccae2a43d0a931)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PresentationObjects/StabilityStoneCoverWaveConditionsCalculationGroupContextTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationGroupContextTest.cs)	(revision ebbc4fd6d5025a84b00878cae2c45b5b0dbfef80)
@@ -37,7 +37,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void ParameteredConstructor_ExpectedValues(bool withParent)
+        public void ParameteredConstructor_ExpectedValues(bool hasParent)
         {
             // Setup
             var mocks = new MockRepository();
@@ -47,7 +47,7 @@
             var failureMechanism = new StabilityStoneCoverFailureMechanism();
             var calculationGroup = new CalculationGroup();
 
-            CalculationGroup parent = withParent ? new CalculationGroup() : null;
+            CalculationGroup parent = hasParent ? new CalculationGroup() : null;
 
             // Call
             var context = new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup, parent, failureMechanism, assessmentSection);
@@ -62,7 +62,8 @@
             mocks.VerifyAll();
         }
 
-        [TestFixture]
+        [TestFixture(true)]
+        [TestFixture(false)]
         private class StabilityStoneCoverWaveConditionsCalculationGroupContextEqualsTest
             : EqualsTestFixture<StabilityStoneCoverWaveConditionsCalculationGroupContext,
                 DerivedStabilityStoneCoverWaveConditionsCalculationGroupContext>
@@ -71,9 +72,10 @@
 
             private static readonly IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
             private static readonly StabilityStoneCoverFailureMechanism failureMechanism = new StabilityStoneCoverFailureMechanism();
-            private static readonly CalculationGroup parent = new CalculationGroup();
             private static readonly CalculationGroup calculationGroup = new CalculationGroup();
 
+            private static CalculationGroup parent;
+
             [SetUp]
             public void SetUp()
             {
@@ -86,6 +88,11 @@
                 mocks.VerifyAll();
             }
 
+            public StabilityStoneCoverWaveConditionsCalculationGroupContextEqualsTest(bool hasParent)
+            {
+                parent = hasParent ? new CalculationGroup() : null;
+            }
+
             protected override StabilityStoneCoverWaveConditionsCalculationGroupContext CreateObject()
             {
                 return new StabilityStoneCoverWaveConditionsCalculationGroupContext(calculationGroup,
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContextTest.cs
===================================================================
diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -rebbc4fd6d5025a84b00878cae2c45b5b0dbfef80
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContextTest.cs	(.../WaveImpactAsphaltCoverCalculationGroupContextTest.cs)	(revision a1abe798a3991d9fff01eae522ccae2a43d0a931)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PresentationObjects/WaveImpactAsphaltCoverCalculationGroupContextTest.cs	(.../WaveImpactAsphaltCoverCalculationGroupContextTest.cs)	(revision ebbc4fd6d5025a84b00878cae2c45b5b0dbfef80)
@@ -37,7 +37,7 @@
         [Test]
         [TestCase(true)]
         [TestCase(false)]
-        public void ParameteredConstructor_ExpectedValues(bool withParent)
+        public void ParameteredConstructor_ExpectedValues(bool hasParent)
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -47,7 +47,7 @@
             var calculationGroup = new CalculationGroup();
             var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
 
-            CalculationGroup parent = withParent ? new CalculationGroup() : null;
+            CalculationGroup parent = hasParent ? new CalculationGroup() : null;
 
             // Call
             var groupContext = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(calculationGroup, parent, failureMechanism, assessmentSection);
@@ -63,7 +63,8 @@
             mockRepository.VerifyAll();
         }
 
-        [TestFixture]
+        [TestFixture(true)]
+        [TestFixture(false)]
         private class WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextEqualsTest
             : EqualsTestFixture<WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext,
                 DerivedWaveImpactAsphaltCoverWaveConditionsCalculationGroupContext>
@@ -72,9 +73,10 @@
 
             private static readonly IAssessmentSection assessmentSection = mocks.Stub<IAssessmentSection>();
             private static readonly WaveImpactAsphaltCoverFailureMechanism failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
-            private static readonly CalculationGroup parent = new CalculationGroup();
             private static readonly CalculationGroup calculationGroup = new CalculationGroup();
 
+            private static CalculationGroup parent;
+
             [SetUp]
             public void SetUp()
             {
@@ -87,6 +89,11 @@
                 mocks.VerifyAll();
             }
 
+            public WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextEqualsTest(bool hasParent)
+            {
+                parent = hasParent ? new CalculationGroup() : null;
+            }
+
             protected override WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext CreateObject()
             {
                 return new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(calculationGroup,
@@ -105,7 +112,7 @@
 
             private static IEnumerable<TestCaseData> GetUnequalTestCases()
             {
-                yield return new TestCaseData(new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(new CalculationGroup(), 
+                yield return new TestCaseData(new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(new CalculationGroup(),
                                                                                                               parent,
                                                                                                               failureMechanism,
                                                                                                               assessmentSection))