Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/SoilProfile2DHelperTests.cs
===================================================================
diff -u -r7059 -r7077
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/SoilProfile2DHelperTests.cs	(.../SoilProfile2DHelperTests.cs)	(revision 7059)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/SoilProfile2DHelperTests.cs	(.../SoilProfile2DHelperTests.cs)	(revision 7077)
@@ -1,4 +1,4 @@
-// Copyright (C) Stichting Deltares 2025. All rights reserved.
+// Copyright (C) Stichting Deltares 2026. All rights reserved.
 // 
 // This file is part of the Dam Engine.
 // 
@@ -96,31 +96,11 @@
         };
         SoilLayer2D soilUpperLayer = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(0, -10, leftCoordinate, rightCoordinate, soilProfile);
         SoilLayer2D soilLayerAquitard2 = FactoryForSoilProfiles.CreatePolygonSoilLayer2D([
-            ..new[]
-            {
-                new Point2D(leftCoordinate, -10),
-                new Point2D(rightCoordinate, -10),
-                new Point2D(rightCoordinate, -20),
-                pointD,
-                pointC,
-                pointB,
-                pointA,
-                new Point2D(leftCoordinate, -20)
-            }
+            new Point2D(leftCoordinate, -10), new Point2D(rightCoordinate, -10), new Point2D(rightCoordinate, -20), pointD, pointC, pointB, pointA, new Point2D(leftCoordinate, -20)
         ], null, soilProfile);
         SoilLayer2D soilLayerAquifer1 = FactoryForSoilProfiles.CreatePentagonSoilLayer2D(pointA, pointB, pointC, pointD, pointX, null, null, true);
         SoilLayer2D soilLayerAquifer2 = FactoryForSoilProfiles.CreatePolygonSoilLayer2D([
-            ..new[]
-            {
-                new Point2D(leftCoordinate, -20),
-                pointA,
-                pointX,
-                pointD,
-                new Point2D(rightCoordinate, -20),
-                new Point2D(rightCoordinate, -30),
-                pointY,
-                new Point2D(leftCoordinate, -30)
-            }
+            new Point2D(leftCoordinate, -20), pointA, pointX, pointD, new Point2D(rightCoordinate, -20), new Point2D(rightCoordinate, -30), pointY, new Point2D(leftCoordinate, -30)
         ], null, soilProfile, true);
 
         soilProfile.Surfaces.Add(soilUpperLayer);
@@ -416,15 +396,7 @@
         var bottomIntermediateLowerUpperLayer = new Point2D(middleXCoordinate, -10);
         var bottomLeftUpperLayer = new Point2D(leftCoordinate, -10);
         SoilLayer2D soilLayer = FactoryForSoilProfiles.CreatePolygonSoilLayer2D([
-            ..new[]
-            {
-                topLeftUpperLayer,
-                topRightUpperLayer,
-                bottomRightUpperLayer,
-                bottomIntermediateUpperUpperLayer,
-                bottomIntermediateLowerUpperLayer,
-                bottomLeftUpperLayer
-            }
+            topLeftUpperLayer, topRightUpperLayer, bottomRightUpperLayer, bottomIntermediateUpperUpperLayer, bottomIntermediateLowerUpperLayer, bottomLeftUpperLayer
         ], null, soilProfile);
 
         SoilLayer2D soilLayerAquiferInBetweenLeft = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(-10, -20, leftCoordinate, middleXCoordinate, soilProfile, null, true);
@@ -507,15 +479,7 @@
         var bottomIntermediateUpperUpperLayer = new Point2D(middleXCoordinate, -10);
         var bottomLeftUpperLayer = new Point2D(leftCoordinate, -10);
         SoilLayer2D soilLayer = FactoryForSoilProfiles.CreatePolygonSoilLayer2D([
-            ..new[]
-            {
-                topLeftUpperLayer,
-                topRightUpperLayer,
-                bottomRightUpperLayer,
-                bottomIntermediateLowerUpperLayer,
-                bottomIntermediateUpperUpperLayer,
-                bottomLeftUpperLayer
-            }
+            topLeftUpperLayer, topRightUpperLayer, bottomRightUpperLayer, bottomIntermediateLowerUpperLayer, bottomIntermediateUpperUpperLayer, bottomLeftUpperLayer
         ], null, soilProfile);
         SoilLayer2D soilLayerAquiferInBetweenLeft = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(-10, -20, leftCoordinate, middleXCoordinate, soilProfile, null, true);
         SoilLayer2D soilLayerAquiferInBetweenRight = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(-15, -17, middleXCoordinate, rightCoordinate, soilProfile, null, true);
@@ -527,15 +491,7 @@
         var bottomRightInBetweenLayer = new Point2D(rightCoordinate, -25);
         var bottomLeftInBetweenLayer = new Point2D(leftCoordinate, -25);
         SoilLayer2D soilLayerInBetween = FactoryForSoilProfiles.CreatePolygonSoilLayer2D([
-            ..new[]
-            {
-                bottomLeftInBetweenAquiferLayerLeft,
-                bottomRightInBetweenAquiferLayerLeft,
-                bottomLeftInBetweenAquiferLayerRight,
-                bottomRightInBetweenAquiferLayerRight,
-                bottomRightInBetweenLayer,
-                bottomLeftInBetweenLayer
-            }
+            bottomLeftInBetweenAquiferLayerLeft, bottomRightInBetweenAquiferLayerLeft, bottomLeftInBetweenAquiferLayerRight, bottomRightInBetweenAquiferLayerRight, bottomRightInBetweenLayer, bottomLeftInBetweenLayer
         ], null, soilProfile);
 
         SoilLayer2D soilLayerAquiferBottom = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(-25, -30, leftCoordinate, rightCoordinate, soilProfile, null, true);
@@ -615,15 +571,7 @@
         var bottomIntermediateUpperUpperLayer = new Point2D(middleXCoordinate, -10);
         var bottomLeftUpperLayer = new Point2D(leftCoordinate, -10);
         SoilLayer2D soilLayer = FactoryForSoilProfiles.CreatePolygonSoilLayer2D([
-            ..new[]
-            {
-                topLeftUpperLayer,
-                topRightUpperLayer,
-                bottomRightUpperLayer,
-                bottomIntermediateLowerUpperLayer,
-                bottomIntermediateUpperUpperLayer,
-                bottomLeftUpperLayer
-            }
+            topLeftUpperLayer, topRightUpperLayer, bottomRightUpperLayer, bottomIntermediateLowerUpperLayer, bottomIntermediateUpperUpperLayer, bottomLeftUpperLayer
         ], null, soilProfile);
 
         SoilLayer2D soilLayerAquiferInBetweenLeft = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(-10, -20, leftCoordinate, middleXCoordinate, soilProfile, null, true);
@@ -636,15 +584,7 @@
         var bottomRightInBetweenLayer = new Point2D(rightCoordinate, -25);
         var bottomLeftInBetweenLayer = new Point2D(leftCoordinate, -25);
         SoilLayer2D soilLayerInBetween = FactoryForSoilProfiles.CreatePolygonSoilLayer2D([
-            ..new[]
-            {
-                bottomLeftInBetweenAquiferLayerLeft,
-                bottomRightInBetweenAquiferLayerLeft,
-                bottomLeftInBetweenAquiferLayerRight,
-                bottomRightInBetweenAquiferLayerRight,
-                bottomRightInBetweenLayer,
-                bottomLeftInBetweenLayer
-            }
+            bottomLeftInBetweenAquiferLayerLeft, bottomRightInBetweenAquiferLayerLeft, bottomLeftInBetweenAquiferLayerRight, bottomRightInBetweenAquiferLayerRight, bottomRightInBetweenLayer, bottomLeftInBetweenLayer
         ], null, soilProfile);
 
         SoilLayer2D soilLayerAquiferBottom = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(-25, -30, leftCoordinate, rightCoordinate, soilProfile, null, true);
@@ -723,17 +663,7 @@
         // Setup
         SoilLayer2D soilLayerTop = FactoryForSoilProfiles.CreateHexagonSoilLayer2D(new Point2D(leftCoordinate, 0), pointE, pointF, pointD, pointB, new Point2D(leftCoordinate, -10), soilProfile);
         SoilLayer2D soilLayerInBetweenAquifer = FactoryForSoilProfiles.CreatePolygonSoilLayer2D([
-            ..new[]
-            {
-                new Point2D(leftCoordinate, -10),
-                pointB,
-                pointD,
-                pointF,
-                pointG,
-                pointC,
-                pointA,
-                new Point2D(leftCoordinate, -13)
-            }
+            new Point2D(leftCoordinate, -10), pointB, pointD, pointF, pointG, pointC, pointA, new Point2D(leftCoordinate, -13)
         ], null, soilProfile, true);
         SoilLayer2D soilLayerAquitard = FactoryForSoilProfiles.CreateHexagonSoilLayer2D(new Point2D(leftCoordinate, -13), pointA, pointC, pointG, new Point2D(rightCoordinate, -15), new Point2D(leftCoordinate, -15), soilProfile);
         SoilLayer2D soilLayerAquiferBottom = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(-15, -20, leftCoordinate, rightCoordinate, soilProfile, null, true);