Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs
===================================================================
diff -u -r09a1fa2c8f52e762264a4679a83beb856b3c8162 -r5169b12fc5f885c17e1c6eb6ae459c5d46adfb68
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs	(.../HydraulicBoundaryLocationTest.cs)	(revision 09a1fa2c8f52e762264a4679a83beb856b3c8162)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs	(.../HydraulicBoundaryLocationTest.cs)	(revision 5169b12fc5f885c17e1c6eb6ae459c5d46adfb68)
@@ -87,11 +87,11 @@
             Assert.AreEqual(testName, result);
         }
 
-        private static void AssertHydraulicBoundaryLocationCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+        private static void AssertHydraulicBoundaryLocationCalculation(HydraulicBoundaryLocation expectedHydraulicBoundaryLocation,
                                                                        HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
         {
             Assert.IsNotNull(hydraulicBoundaryLocationCalculation);
-            Assert.AreSame(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation.HydraulicBoundaryLocation);
+            Assert.AreSame(expectedHydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation.HydraulicBoundaryLocation);
             Assert.IsNull(hydraulicBoundaryLocationCalculation.Output);
         }
     }
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs
===================================================================
diff -u -re6d0e5ed5ca5c7ae5ad2ad1f54e868fcf7a0fd76 -r5169b12fc5f885c17e1c6eb6ae459c5d46adfb68
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision e6d0e5ed5ca5c7ae5ad2ad1f54e868fcf7a0fd76)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs	(.../DesignWaterLevelCalculationActivityTest.cs)	(revision 5169b12fc5f885c17e1c6eb6ae459c5d46adfb68)
@@ -102,14 +102,11 @@
         public void ParameteredConstructor_CalculationServiceMessageProviderNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () =>
-            {
-                new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
-                                                        validFilePath,
-                                                        validPreprocessorDirectory,
-                                                        1,
-                                                        null);
-            };
+            TestDelegate call = () => new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
+                                                                              validFilePath,
+                                                                              validPreprocessorDirectory,
+                                                                              1,
+                                                                              null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u -rdc63bd719e4df9534b154598033f9dd459268879 -r5169b12fc5f885c17e1c6eb6ae459c5d46adfb68
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision dc63bd719e4df9534b154598033f9dd459268879)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs	(.../DesignWaterLevelCalculationServiceTest.cs)	(revision 5169b12fc5f885c17e1c6eb6ae459c5d46adfb68)
@@ -159,14 +159,11 @@
         public void Calculate_MessageProviderNull_ThrowArgumentNullException()
         {
             // Call
-            TestDelegate test = () =>
-            {
-                new DesignWaterLevelCalculationService().Calculate(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
-                                                                   string.Empty,
-                                                                   string.Empty,
-                                                                   1,
-                                                                   null);
-            };
+            TestDelegate test = () => new DesignWaterLevelCalculationService().Calculate(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
+                                                                                         string.Empty,
+                                                                                         string.Empty,
+                                                                                         1,
+                                                                                         null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs
===================================================================
diff -u -re6d0e5ed5ca5c7ae5ad2ad1f54e868fcf7a0fd76 -r5169b12fc5f885c17e1c6eb6ae459c5d46adfb68
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision e6d0e5ed5ca5c7ae5ad2ad1f54e868fcf7a0fd76)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs	(.../WaveHeightCalculationActivityTest.cs)	(revision 5169b12fc5f885c17e1c6eb6ae459c5d46adfb68)
@@ -101,14 +101,11 @@
         public void ParameteredConstructor_CalculationServiceMessageProviderNull_ThrowsArgumentNullException()
         {
             // Call
-            TestDelegate call = () =>
-            {
-                new WaveHeightCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
-                                                  validFilePath,
-                                                  validPreprocessorDirectory,
-                                                  1,
-                                                  null);
-            };
+            TestDelegate call = () => new WaveHeightCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()),
+                                                                        validFilePath,
+                                                                        validPreprocessorDirectory,
+                                                                        1,
+                                                                        null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -rf8f82b94a5b6a3a47b2b32fc1a8ab704b33f356b -r5169b12fc5f885c17e1c6eb6ae459c5d46adfb68
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision f8f82b94a5b6a3a47b2b32fc1a8ab704b33f356b)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 5169b12fc5f885c17e1c6eb6ae459c5d46adfb68)
@@ -499,22 +499,22 @@
 
             string currentFilePath = assessmentSection.HydraulicBoundaryDatabase.FilePath;
             string currentVersion = assessmentSection.HydraulicBoundaryDatabase.Version;
-            IEnumerable<HydraulicBoundaryLocation> currentHydraulicBoundaryLocations = assessmentSection.HydraulicBoundaryDatabase.Locations.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForFactorizedSignalingNorm = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForSignalingNorm = assessmentSection.WaterLevelCalculationsForSignalingNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForLowerLimitNorm = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForFactorizedLowerLimitNorm = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForFactorizedSignalingNorm = assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForSignalingNorm = assessmentSection.WaveHeightCalculationsForSignalingNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForLowerLimitNorm = assessmentSection.WaveHeightCalculationsForLowerLimitNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForFactorizedLowerLimitNorm = assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocation> currentGrassCoverErosionOutwardsLocations = grassCoverErosionOutwardsFailureMechanism.HydraulicBoundaryLocations.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm = grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForMechanismSpecificSignalingNorm = grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForMechanismSpecificLowerLimitNorm = grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm = grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForMechanismSpecificSignalingNorm = grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.ToList();
-            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForMechanismSpecificLowerLimitNorm = grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.ToList();
+            IEnumerable<HydraulicBoundaryLocation> currentHydraulicBoundaryLocations = assessmentSection.HydraulicBoundaryDatabase.Locations.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForFactorizedSignalingNorm = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForSignalingNorm = assessmentSection.WaterLevelCalculationsForSignalingNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForLowerLimitNorm = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForFactorizedLowerLimitNorm = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForFactorizedSignalingNorm = assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForSignalingNorm = assessmentSection.WaveHeightCalculationsForSignalingNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForLowerLimitNorm = assessmentSection.WaveHeightCalculationsForLowerLimitNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForFactorizedLowerLimitNorm = assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocation> currentGrassCoverErosionOutwardsLocations = grassCoverErosionOutwardsFailureMechanism.HydraulicBoundaryLocations.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm = grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificFactorizedSignalingNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForMechanismSpecificSignalingNorm = grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificSignalingNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaterLevelCalculationsForMechanismSpecificLowerLimitNorm = grassCoverErosionOutwardsFailureMechanism.WaterLevelCalculationsForMechanismSpecificLowerLimitNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm = grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificFactorizedSignalingNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForMechanismSpecificSignalingNorm = grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificSignalingNorm.ToArray();
+            IEnumerable<HydraulicBoundaryLocationCalculation> currentWaveHeightCalculationsForMechanismSpecificLowerLimitNorm = grassCoverErosionOutwardsFailureMechanism.WaveHeightCalculationsForMechanismSpecificLowerLimitNorm.ToArray();
 
             using (var treeViewControl = new TreeViewControl())
             using (var plugin = new RingtoetsPlugin())