Index: Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil.Test/SoilLayer2DTestFactoryTest.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r4b462c0164715dfa53ba572b5f3b31432a17be1a
--- Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil.Test/SoilLayer2DTestFactoryTest.cs	(.../SoilLayer2DTestFactoryTest.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil.Test/SoilLayer2DTestFactoryTest.cs	(.../SoilLayer2DTestFactoryTest.cs)	(revision 4b462c0164715dfa53ba572b5f3b31432a17be1a)
@@ -32,7 +32,7 @@
     public class SoilLayer2DTestFactoryTest
     {
         [Test]
-        public void CreateSoilLayer2D_InnerLoopNull_ThrowsArgumentNullException()
+        public void CreateSoilLayer2D_InnerLoopsNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () => SoilLayer2DTestFactory.CreateSoilLayer2D(
@@ -129,12 +129,17 @@
                 });
 
             // Assert
-            Assert.AreEqual(new Segment2D(pointA, pointB), soilLayer.OuterLoop.Segments.ElementAt(0));
-            Assert.AreEqual(new Segment2D(pointB, pointA), soilLayer.OuterLoop.Segments.ElementAt(1));
-
+            Assert.AreEqual(new SoilLayer2DLoop(new[]
+            {
+                new Segment2D(pointA, pointB),
+                new Segment2D(pointB, pointA)
+            }), soilLayer.OuterLoop);
             Assert.AreEqual(1, soilLayer.InnerLoops.Count());
-            Assert.AreEqual(new Segment2D(pointC, pointD), soilLayer.InnerLoops.ElementAt(0).Segments[0]);
-            Assert.AreEqual(new Segment2D(pointD, pointC), soilLayer.InnerLoops.ElementAt(0).Segments[1]);
+            Assert.AreEqual(new SoilLayer2DLoop(new[]
+            {
+                new Segment2D(pointC, pointD),
+                new Segment2D(pointD, pointC)
+            }), soilLayer.InnerLoops.ElementAt(0));
         }
 
         [Test]
@@ -149,12 +154,17 @@
             var pointC = new Point2D(1.0, 1.0);
             var pointD = new Point2D(2.0, 1.0);
 
-            Assert.AreEqual(new Segment2D(pointA, pointB), soilLayer.OuterLoop.Segments.ElementAt(0));
-            Assert.AreEqual(new Segment2D(pointB, pointA), soilLayer.OuterLoop.Segments.ElementAt(1));
-
+            Assert.AreEqual(new SoilLayer2DLoop(new[]
+            {
+                new Segment2D(pointA, pointB),
+                new Segment2D(pointB, pointA)
+            }), soilLayer.OuterLoop);
             Assert.AreEqual(1, soilLayer.InnerLoops.Count());
-            Assert.AreEqual(new Segment2D(pointC, pointD), soilLayer.InnerLoops.ElementAt(0).Segments[0]);
-            Assert.AreEqual(new Segment2D(pointD, pointC), soilLayer.InnerLoops.ElementAt(0).Segments[1]);
+            Assert.AreEqual(new SoilLayer2DLoop(new[]
+            {
+                new Segment2D(pointC, pointD),
+                new Segment2D(pointD, pointC)
+            }), soilLayer.InnerLoops.ElementAt(0));
         }
 
         [Test]
@@ -170,16 +180,21 @@
             var pointD = new Point2D(2.0, 1.0);
 
             Assert.AreEqual(0.0, soilLayer.IsAquifer);
-            Assert.AreEqual(new Segment2D(pointA, pointB), soilLayer.OuterLoop.Segments.ElementAt(0));
-            Assert.AreEqual(new Segment2D(pointB, pointA), soilLayer.OuterLoop.Segments.ElementAt(1));
-
+            Assert.AreEqual(new SoilLayer2DLoop(new[]
+            {
+                new Segment2D(pointA, pointB),
+                new Segment2D(pointB, pointA)
+            }), soilLayer.OuterLoop);
             Assert.AreEqual(1, soilLayer.InnerLoops.Count());
-            Assert.AreEqual(new Segment2D(pointC, pointD), soilLayer.InnerLoops.ElementAt(0).Segments[0]);
-            Assert.AreEqual(new Segment2D(pointD, pointC), soilLayer.InnerLoops.ElementAt(0).Segments[1]);
+            Assert.AreEqual(new SoilLayer2DLoop(new[]
+            {
+                new Segment2D(pointC, pointD),
+                new Segment2D(pointD, pointC)
+            }), soilLayer.InnerLoops.ElementAt(0));
         }
 
         [Test]
-        public void CreateSoilLayer2DWithValidAquifer_InnerLoopNull_ThrowsArgumentNullException()
+        public void CreateSoilLayer2DWithValidAquifer_InnerLoopsNull_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate call = () => SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer(
@@ -276,12 +291,18 @@
                 });
 
             // Assert
-            Assert.AreEqual(new Segment2D(pointA, pointB), soilLayer.OuterLoop.Segments.ElementAt(0));
-            Assert.AreEqual(new Segment2D(pointB, pointA), soilLayer.OuterLoop.Segments.ElementAt(1));
-
+            Assert.AreEqual(0.0, soilLayer.IsAquifer);
+            Assert.AreEqual(new SoilLayer2DLoop(new[]
+            {
+                new Segment2D(pointA, pointB),
+                new Segment2D(pointB, pointA)
+            }), soilLayer.OuterLoop);
             Assert.AreEqual(1, soilLayer.InnerLoops.Count());
-            Assert.AreEqual(new Segment2D(pointC, pointD), soilLayer.InnerLoops.ElementAt(0).Segments[0]);
-            Assert.AreEqual(new Segment2D(pointD, pointC), soilLayer.InnerLoops.ElementAt(0).Segments[1]);
+            Assert.AreEqual(new SoilLayer2DLoop(new[]
+            {
+                new Segment2D(pointC, pointD),
+                new Segment2D(pointD, pointC)
+            }), soilLayer.InnerLoops.ElementAt(0));
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/SoilLayer2DTestFactory.cs
===================================================================
diff -u -r7585d2fd78627d94d55ffa16423af90a91e4efd4 -r4b462c0164715dfa53ba572b5f3b31432a17be1a
--- Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/SoilLayer2DTestFactory.cs	(.../SoilLayer2DTestFactory.cs)	(revision 7585d2fd78627d94d55ffa16423af90a91e4efd4)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/SoilLayer2DTestFactory.cs	(.../SoilLayer2DTestFactory.cs)	(revision 4b462c0164715dfa53ba572b5f3b31432a17be1a)
@@ -63,10 +63,8 @@
         /// <summary>
         /// Creates a new instance of <see cref="SoilLayer2D"/>.
         /// </summary>
-        /// <param name="innerLoops">The inner loops of the <see cref="SoilLayer2D"/>,
-        /// for which each of the segments are connected to the next.</param>
-        /// <param name="outerLoop">The outer loop of the <see cref="SoilLayer2D"/>,
-        /// for which each of the segments are connected to the next.</param>
+        /// <param name="innerLoops">The inner loops of the <see cref="SoilLayer2D"/>.</param>
+        /// <param name="outerLoop">The outer loop of the <see cref="SoilLayer2D"/>.</param>
         /// <returns>The created <see cref="SoilLayer2D"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when the <see cref="Segment2D"/> in <paramref name="innerLoops"/> 
@@ -90,26 +88,23 @@
         }
 
         /// <summary>
-        /// Creates a new instance of <see cref="SoilLayer2D"/> 
-        /// with a valid value for <see cref="SoilLayer2D.IsAquifer"/>.
+        /// Creates a new instance of <see cref="SoilLayer2D"/> with a valid value for <see cref="SoilLayer2D.IsAquifer"/>.
         /// </summary>
         /// <returns>The created <see cref="SoilLayer2D"/>.</returns>
         public static SoilLayer2D CreateSoilLayer2DWithValidAquifer()
         {
             SoilLayer2D layer = CreateSoilLayer2D();
+
             layer.IsAquifer = 0.0;
 
             return layer;
         }
 
         /// <summary>
-        /// Creates a new instance of <see cref="SoilLayer2D"/> with a valid value
-        /// for <see cref="SoilLayer2D.IsAquifer"/>.
+        /// Creates a new instance of <see cref="SoilLayer2D"/> with a valid value for <see cref="SoilLayer2D.IsAquifer"/>.
         /// </summary>
-        /// <param name="innerLoops">The inner loops of the <see cref="SoilLayer2D"/>,
-        /// for which each of the segments are connected to the next.</param>
-        /// <param name="outerLoop">The outer loop of the <see cref="SoilLayer2D"/>,
-        /// for which each of the segments are connected to the next.</param>
+        /// <param name="innerLoops">The inner loops of the <see cref="SoilLayer2D"/>.</param>
+        /// <param name="outerLoop">The outer loop of the <see cref="SoilLayer2D"/>.</param>
         /// <returns>The created <see cref="SoilLayer2D"/>.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         /// <exception cref="ArgumentException">Thrown when the <see cref="Segment2D"/> in <paramref name="innerLoops"/> 
@@ -118,6 +113,7 @@
                                                                     IEnumerable<Segment2D> outerLoop)
         {
             SoilLayer2D layer = CreateSoilLayer2D(innerLoops, outerLoop);
+
             layer.IsAquifer = 0.0;
 
             return layer;