Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs
===================================================================
diff -u -rcf60de33a75f1d729639a4ba7f30e3b319f9ed6d -re60dadeb730f975383e6c9febd0fd10f89ca1961
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs	(.../StructuresInputBase.cs)	(revision cf60de33a75f1d729639a4ba7f30e3b319f9ed6d)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs	(.../StructuresInputBase.cs)	(revision e60dadeb730f975383e6c9febd0fd10f89ca1961)
@@ -384,13 +384,12 @@
         {
             get
             {
-                return
-                    foreshoreProfile != null
-                    && UseForeshore == foreshoreProfile.Geometry.Count() > 1
-                    && UseBreakWater == foreshoreProfile.HasBreakWater
-                    && BreakWater.Equals(foreshoreProfile.HasBreakWater
-                                             ? foreshoreProfile.BreakWater
-                                             : GetDefaultBreakWater());
+                return foreshoreProfile != null
+                       && UseForeshore == foreshoreProfile.Geometry.Count() > 1
+                       && UseBreakWater == foreshoreProfile.HasBreakWater
+                       && BreakWater.Equals(foreshoreProfile.HasBreakWater
+                                                ? foreshoreProfile.BreakWater
+                                                : GetDefaultBreakWater());
             }
         }
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs
===================================================================
diff -u -re838130a1b78ff0c1e48b8d42357da4373b9ae77 -re60dadeb730f975383e6c9febd0fd10f89ca1961
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs	(.../GrassCoverErosionInwardsInputTest.cs)	(revision e838130a1b78ff0c1e48b8d42357da4373b9ae77)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsInputTest.cs	(.../GrassCoverErosionInwardsInputTest.cs)	(revision e60dadeb730f975383e6c9febd0fd10f89ca1961)
@@ -160,7 +160,7 @@
         public void DikeProfile_SetNullValue_InputSyncedToDefaults()
         {
             // Setup
-            var dikeProfile = CreateTestDikeProfile();
+            DikeProfile dikeProfile = CreateTestDikeProfile();
 
             var input = new GrassCoverErosionInwardsInput
             {
@@ -310,7 +310,7 @@
         public void IsDikeProfileInputSynchronized_InputParametersAndDikeProfileNotInSync_ReturnFalse(DikeProfile newDikeProfile)
         {
             // Setup
-            var dikeProfile = CreateTestDikeProfile();
+            DikeProfile dikeProfile = CreateTestDikeProfile();
 
             var input = new GrassCoverErosionInwardsInput
             {
@@ -344,7 +344,7 @@
         public void SynchronizeDikeProfileInput_ChangedDikeProfile_ExpectedValues(DikeProfile newDikeProfile)
         {
             // Setup
-            var dikeProfile = CreateTestDikeProfile();
+            DikeProfile dikeProfile = CreateTestDikeProfile();
 
             var input = new GrassCoverErosionInwardsInput
             {
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r41da80335e9db4b38a470de5b247f759ca497997 -re60dadeb730f975383e6c9febd0fd10f89ca1961
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision 41da80335e9db4b38a470de5b247f759ca497997)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs)	(revision e60dadeb730f975383e6c9febd0fd10f89ca1961)
@@ -1343,7 +1343,7 @@
                     contextMenuStrip.Items[contextMenuUpdateForeshoreProfileIndexRootGroup].PerformClick();
 
                     // Then
-                    Assert.IsTrue(calculation.InputParameters.UseBreakWater);
+                    Assert.IsTrue(calculation.InputParameters.IsForeshoreProfileInputSynchronized);
                 }
             }
         }
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs
===================================================================
diff -u -r9a63dd4cf6589ffe683d8e1eb3694afced6efc78 -re60dadeb730f975383e6c9febd0fd10f89ca1961
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs	(.../WaveConditionsInput.cs)	(revision 9a63dd4cf6589ffe683d8e1eb3694afced6efc78)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs	(.../WaveConditionsInput.cs)	(revision e60dadeb730f975383e6c9febd0fd10f89ca1961)
@@ -260,18 +260,13 @@
         {
             get
             {
-                if (foreshoreProfile == null)
-                {
-                    return false;
-                }
-
-                return
-                    Orientation == foreshoreProfile.Orientation
-                    && UseForeshore == foreshoreProfile.Geometry.Count() > 1
-                    && UseBreakWater == foreshoreProfile.HasBreakWater
-                    && BreakWater.Equals(foreshoreProfile.HasBreakWater
-                                             ? foreshoreProfile.BreakWater
-                                             : GetDefaultBreakWater());
+                return foreshoreProfile != null
+                       && Orientation == foreshoreProfile.Orientation
+                       && UseForeshore == foreshoreProfile.Geometry.Count() > 1
+                       && UseBreakWater == foreshoreProfile.HasBreakWater
+                       && BreakWater.Equals(foreshoreProfile.HasBreakWater
+                                                ? foreshoreProfile.BreakWater
+                                                : GetDefaultBreakWater());
             }
         }
 
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs
===================================================================
diff -u -rf6a095e83280cde917062103377069ce63eefbc2 -re60dadeb730f975383e6c9febd0fd10f89ca1961
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs	(.../StabilityPointStructurePermutationHelper.cs)	(revision f6a095e83280cde917062103377069ce63eefbc2)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil/StabilityPointStructurePermutationHelper.cs	(.../StabilityPointStructurePermutationHelper.cs)	(revision e60dadeb730f975383e6c9febd0fd10f89ca1961)
@@ -83,13 +83,13 @@
         /// </example>
         public static IEnumerable<TestCaseData> DifferentStabilityPointStructuresWithSameId(string targetName, string testResultDescription)
         {
-            var referenceStructure = new TestStabilityPointStructure();
+            string referenceStructureId = new TestStabilityPointStructure().Id;
 
             var testCaseData = new List<TestCaseData>
             {
-                new TestCaseData(new TestStabilityPointStructure("Different name", referenceStructure.Id))
+                new TestCaseData(new TestStabilityPointStructure("Different name", referenceStructureId))
                     .SetName($"{targetName}_DifferentName_{testResultDescription}"),
-                new TestCaseData(new TestStabilityPointStructure(new Point2D(1, 1), referenceStructure.Id))
+                new TestCaseData(new TestStabilityPointStructure(new Point2D(1, 1), referenceStructureId))
                     .SetName($"{targetName}_DifferentLocation_{testResultDescription}")
             };