Index: Ringtoets.sln
===================================================================
diff -u -r999f55a8115ed9277efd65972d64a70d30669904 -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets.sln	(.../Ringtoets.sln)	(revision 999f55a8115ed9277efd65972d64a70d30669904)
+++ Ringtoets.sln	(.../Ringtoets.sln)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -1776,6 +1776,16 @@
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.MacroStabilityInwards.Primitives.TestUtil", "Ringtoets\MacroStabilityInwards\test\Ringtoets.MacroStabilityInwards.Primitives.TestUtil\Ringtoets.MacroStabilityInwards.Primitives.TestUtil.csproj", "{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test", "Ringtoets\MacroStabilityInwards\test\Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test\Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj", "{C80AD710-0F84-40CE-9567-10CBE332E589}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CreateInstaller|x86 = CreateInstaller|x86
@@ -4482,6 +4492,26 @@
 		{9FB4BF13-EB15-4676-A3D4-C30DFC33631E}.Release|x86.Build.0 = Release|x86
 		{9FB4BF13-EB15-4676-A3D4-C30DFC33631E}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{9FB4BF13-EB15-4676-A3D4-C30DFC33631E}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstaller|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstaller|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstallerWithDemoProject|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstallerWithDemoProject|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.Debug|x86.ActiveCfg = Debug|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.Debug|x86.Build.0 = Debug|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.Release|x86.ActiveCfg = Release|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.Release|x86.Build.0 = Release|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.CreateInstaller|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.CreateInstaller|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.CreateInstallerWithDemoProject|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.CreateInstallerWithDemoProject|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.Debug|x86.ActiveCfg = Debug|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.Debug|x86.Build.0 = Debug|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.Release|x86.ActiveCfg = Release|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.Release|x86.Build.0 = Release|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+		{C80AD710-0F84-40CE-9567-10CBE332E589}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -4862,6 +4892,8 @@
 		{F95B449C-02CC-409B-83EA-FF16D0D7CBDB} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
 		{D0887613-858E-4EED-9320-8C5A09170761} = {FDBC8F09-1273-4A3D-9A94-1619EDD811C4}
 		{9FB4BF13-EB15-4676-A3D4-C30DFC33631E} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
+		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
+		{C80AD710-0F84-40CE-9567-10CBE332E589} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
 	EndGlobalSection
 	GlobalSection(TextTemplating) = postSolution
 		TextTemplating = 1
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsInput.cs
===================================================================
diff -u -r7438751456088ede76933c01627857c4e11681c9 -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsInput.cs	(.../DerivedMacroStabilityInwardsInput.cs)	(revision 7438751456088ede76933c01627857c4e11681c9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsInput.cs	(.../DerivedMacroStabilityInwardsInput.cs)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -21,6 +21,7 @@
 
 using System;
 using System.Linq;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data
 {
Fisheye: Tag 14c118039f313ea66787d8065daad0aa783b731a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsPhreaticLine.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 14c118039f313ea66787d8065daad0aa783b731a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsWaternet.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 14c118039f313ea66787d8065daad0aa783b731a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsWaternetLine.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj
===================================================================
diff -u -r7438751456088ede76933c01627857c4e11681c9 -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj	(.../Ringtoets.MacroStabilityInwards.Data.csproj)	(revision 7438751456088ede76933c01627857c4e11681c9)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj	(.../Ringtoets.MacroStabilityInwards.Data.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -53,9 +53,6 @@
     <Compile Include="MacroStabilityInwardsLocationInputExtreme.cs" />
     <Compile Include="MacroStabilityInwardsLocationInputDaily.cs" />
     <Compile Include="MacroStabilityInwardsOutput.cs" />
-    <Compile Include="MacroStabilityInwardsWaternet.cs" />
-    <Compile Include="MacroStabilityInwardsWaternetLine.cs" />
-    <Compile Include="MacroStabilityInwardsPhreaticLine.cs" />
     <Compile Include="MacroStabilityInwardsSemiProbabilisticDesignVariableFactory.cs" />
     <Compile Include="MacroStabilityInwardsSemiProbabilisticOutput.cs" />
     <Compile Include="MacroStabilityInwardsSlice.cs" />
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsPhreaticLineProperties.cs
===================================================================
diff -u -r66af8add6f7cc445cbb5347af02ee69235ec63be -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsPhreaticLineProperties.cs	(.../MacroStabilityInwardsPhreaticLineProperties.cs)	(revision 66af8add6f7cc445cbb5347af02ee69235ec63be)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsPhreaticLineProperties.cs	(.../MacroStabilityInwardsPhreaticLineProperties.cs)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -27,8 +27,8 @@
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
-using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Forms.Properties;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses
 {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetLineProperties.cs
===================================================================
diff -u -r66af8add6f7cc445cbb5347af02ee69235ec63be -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetLineProperties.cs	(.../MacroStabilityInwardsWaternetLineProperties.cs)	(revision 66af8add6f7cc445cbb5347af02ee69235ec63be)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetLineProperties.cs	(.../MacroStabilityInwardsWaternetLineProperties.cs)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -27,8 +27,8 @@
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
-using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Forms.Properties;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses
 {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetProperties.cs
===================================================================
diff -u -r66af8add6f7cc445cbb5347af02ee69235ec63be -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetProperties.cs	(.../MacroStabilityInwardsWaternetProperties.cs)	(revision 66af8add6f7cc445cbb5347af02ee69235ec63be)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsWaternetProperties.cs	(.../MacroStabilityInwardsWaternetProperties.cs)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -26,8 +26,8 @@
 using Core.Common.Gui.Converters;
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
-using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Forms.Properties;
+using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.PropertyClasses
 {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsPhreaticLine.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsPhreaticLine.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsPhreaticLine.cs	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -0,0 +1,66 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Core.Common.Base.Geometry;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// The phreatic line created by the Waternet calculator in the derived
+    /// macro stability inwards calculation input.
+    /// </summary>
+    public class MacroStabilityInwardsPhreaticLine
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="MacroStabilityInwardsPhreaticLine"/>.
+        /// </summary>
+        /// <param name="name">The name of the phreatic line.</param>
+        /// <param name="geometry">The geometry points of the phreatic line.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any input argument
+        /// is <c>null</c>.</exception>
+        public MacroStabilityInwardsPhreaticLine(string name, IEnumerable<Point2D> geometry)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+            if (geometry == null)
+            {
+                throw new ArgumentNullException(nameof(geometry));
+            }
+
+            Name = name;
+            Geometry = geometry;
+        }
+
+        /// <summary>
+        /// Gets the name of the phreatic line.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets the geometry points of the phreatic line.
+        /// </summary>
+        public IEnumerable<Point2D> Geometry { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsWaternet.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsWaternet.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsWaternet.cs	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -0,0 +1,66 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// The waternet created by the Waternet calculator in the derived
+    /// macro stability inwards calculation input.
+    /// </summary>
+    public class MacroStabilityInwardsWaternet
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="MacroStabilityInwardsWaternet"/>.
+        /// </summary>
+        /// <param name="phreaticLines">The collection of <see cref="MacroStabilityInwardsPhreaticLine"/></param>
+        /// <param name="waternetLines">The collection of <see cref="MacroStabilityInwardsWaternetLine"/></param>
+        /// <exception cref="ArgumentNullException">Thrown when any input argument
+        /// is <c>null</c>.</exception>
+        public MacroStabilityInwardsWaternet(IEnumerable<MacroStabilityInwardsPhreaticLine> phreaticLines,
+                                             IEnumerable<MacroStabilityInwardsWaternetLine> waternetLines)
+        {
+            if (phreaticLines == null)
+            {
+                throw new ArgumentNullException(nameof(phreaticLines));
+            }
+            if (waternetLines == null)
+            {
+                throw new ArgumentNullException(nameof(waternetLines));
+            }
+
+            PhreaticLines = phreaticLines;
+            WaternetLines = waternetLines;
+        }
+
+        /// <summary>
+        /// Gets the collection of phreatic lines.
+        /// </summary>
+        public IEnumerable<MacroStabilityInwardsPhreaticLine> PhreaticLines { get; }
+
+        /// <summary>
+        /// Gets the collection of waternet lines.
+        /// </summary>
+        public IEnumerable<MacroStabilityInwardsWaternetLine> WaternetLines { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsWaternetLine.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsWaternetLine.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsWaternetLine.cs	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -0,0 +1,77 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Core.Common.Base.Geometry;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives
+{
+    /// <summary>
+    /// The waternet line created by the Waternet calculator in the derived
+    /// macro stability inwards calculation input.
+    /// </summary>
+    public class MacroStabilityInwardsWaternetLine
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="MacroStabilityInwardsWaternetLine"/>.
+        /// </summary>
+        /// <param name="name">The name of the waternet line.</param>
+        /// <param name="geometry">The geometry points of the waternet line.</param>
+        /// <param name="phreaticLine">The associated phreatic line.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any input argument
+        /// is <c>null</c>.</exception>
+        public MacroStabilityInwardsWaternetLine(string name, IEnumerable<Point2D> geometry, MacroStabilityInwardsPhreaticLine phreaticLine)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+            if (geometry == null)
+            {
+                throw new ArgumentNullException(nameof(geometry));
+            }
+            if (phreaticLine == null)
+            {
+                throw new ArgumentNullException(nameof(phreaticLine));
+            }
+
+            Name = name;
+            Geometry = geometry;
+            PhreaticLine = phreaticLine;
+        }
+
+        /// <summary>
+        /// Gets the name of the waternet line.
+        /// </summary>
+        public string Name { get; }
+
+        /// <summary>
+        /// Gets the geometry points of the waternet line.
+        /// </summary>
+        public IEnumerable<Point2D> Geometry { get; }
+
+        /// <summary>
+        /// Gets the associated phreatic line.
+        /// </summary>
+        public MacroStabilityInwardsPhreaticLine PhreaticLine { get; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -42,6 +42,9 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="MacroStabilityInwardsDikeSoilScenario.cs" />
+    <Compile Include="MacroStabilityInwardsPhreaticLine.cs" />
+    <Compile Include="MacroStabilityInwardsWaternet.cs" />
+    <Compile Include="MacroStabilityInwardsWaternetLine.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <DependentUpon>Resources.resx</DependentUpon>
Fisheye: Tag 14c118039f313ea66787d8065daad0aa783b731a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsPhreaticLineTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 14c118039f313ea66787d8065daad0aa783b731a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsWaternetLineTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 14c118039f313ea66787d8065daad0aa783b731a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsWaternetTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj
===================================================================
diff -u -r7438751456088ede76933c01627857c4e11681c9 -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.Test.csproj)	(revision 7438751456088ede76933c01627857c4e11681c9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.Test.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -66,9 +66,6 @@
     <Compile Include="MacroStabilityInwardsLocationInputDailyTest.cs" />
     <Compile Include="MacroStabilityInwardsLocationInputExtremeTest.cs" />
     <Compile Include="MacroStabilityInwardsLocationInputTest.cs" />
-    <Compile Include="MacroStabilityInwardsWaternetTest.cs" />
-    <Compile Include="MacroStabilityInwardsWaternetLineTest.cs" />
-    <Compile Include="MacroStabilityInwardsPhreaticLineTest.cs" />
     <Compile Include="MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs" />
     <Compile Include="MacroStabilityInwardsShearStrengthModelTest.cs" />
     <Compile Include="MacroStabilityInwardsSliceTest.cs" />
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj
===================================================================
diff -u -r7438751456088ede76933c01627857c4e11681c9 -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj)	(revision 7438751456088ede76933c01627857c4e11681c9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -64,8 +64,6 @@
     <Compile Include="Segment2DLoopCollectionHelperTest.cs" />
     <Compile Include="TestMacroStabilityInwardsFailureMechanismTest.cs" />
     <Compile Include="TestMacroStabilityInwardsOutputTest.cs" />
-    <Compile Include="TestMacroStabilityInwardsWaternetLineTest.cs" />
-    <Compile Include="TestMacroStabilityInwardsPhreaticLineTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Fisheye: Tag 14c118039f313ea66787d8065daad0aa783b731a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestMacroStabilityInwardsPhreaticLineTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 14c118039f313ea66787d8065daad0aa783b731a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestMacroStabilityInwardsWaternetLineTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj
===================================================================
diff -u -r7438751456088ede76933c01627857c4e11681c9 -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj)	(revision 7438751456088ede76933c01627857c4e11681c9)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -66,8 +66,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestMacroStabilityInwardsFailureMechanism.cs" />
     <Compile Include="TestMacroStabilityInwardsOutput.cs" />
-    <Compile Include="TestMacroStabilityInwardsWaternetLine.cs" />
-    <Compile Include="TestMacroStabilityInwardsPhreaticLine.cs" />
     <Compile Include="TestMacroStabilityInwardsSemiProbabilisticOutput.cs" />
   </ItemGroup>
   <ItemGroup>
Fisheye: Tag 14c118039f313ea66787d8065daad0aa783b731a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsPhreaticLine.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 14c118039f313ea66787d8065daad0aa783b731a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsWaternetLine.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsPhreaticLinePropertiesTest.cs
===================================================================
diff -u -r66af8add6f7cc445cbb5347af02ee69235ec63be -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsPhreaticLinePropertiesTest.cs	(.../MacroStabilityInwardsPhreaticLinePropertiesTest.cs)	(revision 66af8add6f7cc445cbb5347af02ee69235ec63be)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsPhreaticLinePropertiesTest.cs	(.../MacroStabilityInwardsPhreaticLinePropertiesTest.cs)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -27,9 +27,9 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.MacroStabilityInwards.Data;
-using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses;
+using Ringtoets.MacroStabilityInwards.Primitives;
+using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.Test.PropertyClasses
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs
===================================================================
diff -u -r66af8add6f7cc445cbb5347af02ee69235ec63be -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressLinesPropertiesTest.cs)	(revision 66af8add6f7cc445cbb5347af02ee69235ec63be)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaterStressLinesPropertiesTest.cs	(.../MacroStabilityInwardsWaterStressLinesPropertiesTest.cs)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -26,9 +26,9 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.MacroStabilityInwards.Data;
-using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses;
+using Ringtoets.MacroStabilityInwards.Primitives;
+using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.Test.PropertyClasses
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetLinePropertiesTest.cs
===================================================================
diff -u -r66af8add6f7cc445cbb5347af02ee69235ec63be -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetLinePropertiesTest.cs	(.../MacroStabilityInwardsWaternetLinePropertiesTest.cs)	(revision 66af8add6f7cc445cbb5347af02ee69235ec63be)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsWaternetLinePropertiesTest.cs	(.../MacroStabilityInwardsWaternetLinePropertiesTest.cs)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -27,9 +27,9 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.TestUtil;
 using NUnit.Framework;
-using Ringtoets.MacroStabilityInwards.Data;
-using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses;
+using Ringtoets.MacroStabilityInwards.Primitives;
+using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.Test.PropertyClasses
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj
===================================================================
diff -u -r66af8add6f7cc445cbb5347af02ee69235ec63be -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj)	(revision 66af8add6f7cc445cbb5347af02ee69235ec63be)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -199,6 +199,10 @@
       <Project>{2b78cf04-4785-4f27-a6e5-45bddbb7bf04}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Data.TestUtil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.Primitives.TestUtil\Ringtoets.MacroStabilityInwards.Primitives.TestUtil.csproj">
+      <Project>{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.Primitives.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPhreaticLineTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPhreaticLineTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsPhreaticLineTest.cs	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -0,0 +1,76 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using Core.Common.Base.Geometry;
+using NUnit.Framework;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives.Test
+{
+    public class MacroStabilityInwardsPhreaticLineTest
+    {
+        [Test]
+        public void Constructor_NameNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new MacroStabilityInwardsPhreaticLine(null, new List<Point2D>());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("name", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_GeometryNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new MacroStabilityInwardsPhreaticLine("name", null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("geometry", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            const string name = "<some name>";
+            var geometry = new List<Point2D>
+            {
+                new Point2D(0.0, 0.0),
+                new Point2D(15.0, 15.0)
+            };
+
+            // Call
+            var phreaticLine = new MacroStabilityInwardsPhreaticLine(name, geometry);
+
+            // Assert
+            Assert.AreEqual(name, phreaticLine.Name);
+            CollectionAssert.AreEqual(new List<Point2D>
+            {
+                new Point2D(0.0, 0.0),
+                new Point2D(15.0, 15.0)
+            }, phreaticLine.Geometry);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetLineTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetLineTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetLineTest.cs	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -0,0 +1,94 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Core.Common.Base.Geometry;
+using NUnit.Framework;
+using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives.Test
+{
+    public class MacroStabilityInwardsWaternetLineTest
+    {
+        [Test]
+        public void Constructor_NameNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new MacroStabilityInwardsWaternetLine(null, new List<Point2D>(), new TestMacroStabilityInwardsPhreaticLine());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("name", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_GeometryNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new MacroStabilityInwardsWaternetLine("name", null, new TestMacroStabilityInwardsPhreaticLine());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("geometry", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_PhreaticLineNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new MacroStabilityInwardsWaternetLine("name", new List<Point2D>(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("phreaticLine", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            const string waternetLineName = "<some name>";
+            const string phreaticLineName = "PL1";
+            var geometry = new List<Point2D>
+            {
+                new Point2D(0.0, 0.0),
+                new Point2D(15.0, 15.0)
+            };
+
+            // Call
+            var waternetLine = new MacroStabilityInwardsWaternetLine(waternetLineName,
+                                                                     geometry,
+                                                                     new MacroStabilityInwardsPhreaticLine(phreaticLineName, Enumerable.Empty<Point2D>()));
+
+            // Assert
+            Assert.AreEqual(waternetLineName, waternetLine.Name);
+            CollectionAssert.AreEqual(new List<Point2D>
+            {
+                new Point2D(0.0, 0.0),
+                new Point2D(15.0, 15.0)
+            }, waternetLine.Geometry);
+            Assert.AreEqual(phreaticLineName, waternetLine.PhreaticLine.Name);
+            CollectionAssert.IsEmpty(waternetLine.PhreaticLine.Geometry);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsWaternetTest.cs	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -0,0 +1,74 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Linq;
+using Core.Common.Base.Geometry;
+using NUnit.Framework;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives.Test
+{
+    public class MacroStabilityInwardsWaternetTest
+    {
+        [Test]
+        public void Constructor_PhreaticLinesNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new MacroStabilityInwardsWaternet(null, Enumerable.Empty<MacroStabilityInwardsWaternetLine>());
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("phreaticLines", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_WaternetLinesNull_ThrowsArgumentNullException()
+        {
+            // Call
+            TestDelegate call = () => new MacroStabilityInwardsWaternet(Enumerable.Empty<MacroStabilityInwardsPhreaticLine>(), null);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(call);
+            Assert.AreEqual("waternetLines", exception.ParamName);
+        }
+
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Setup
+            var phreaticLine = new MacroStabilityInwardsPhreaticLine("Phreatic Line", Enumerable.Empty<Point2D>());
+            var waternetLine = new MacroStabilityInwardsWaternetLine("Waternet Line", Enumerable.Empty<Point2D>(), phreaticLine);
+
+            // Call
+            var waternet = new MacroStabilityInwardsWaternet(new[]
+            {
+                phreaticLine
+            }, new[]
+            {
+                waternetLine
+            });
+
+            // Assert
+            Assert.AreSame(phreaticLine, waternet.PhreaticLines.Single());
+            Assert.AreSame(waternetLine, waternet.WaternetLines.Single());
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -53,6 +53,9 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="MacroStabilityInwardsDikeSoilScenarioTest.cs" />
+    <Compile Include="MacroStabilityInwardsPhreaticLineTest.cs" />
+    <Compile Include="MacroStabilityInwardsWaternetLineTest.cs" />
+    <Compile Include="MacroStabilityInwardsWaternetTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MacroStabilityInwardsSurfaceLineTest.cs" />
   </ItemGroup>
@@ -83,6 +86,10 @@
       <Project>{E9B39743-2DC9-4922-9E0F-6BA3E0E54189}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Primitives</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.Primitives.TestUtil\Ringtoets.MacroStabilityInwards.Primitives.TestUtil.csproj">
+      <Project>{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}</Project>
+      <Name>Ringtoets.MacroStabilityInwards.Primitives.TestUtil</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj
===================================================================
diff -u -r9f936b0b29f490a024df02345df182133b1c041a -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj)	(revision 9f936b0b29f490a024df02345df182133b1c041a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -50,8 +50,9 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="MacroStabilityInwardsGridTestFactoryTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestMacroStabilityInwardsPhreaticLineTest.cs" />
+    <Compile Include="TestMacroStabilityInwardsWaternetLineTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/TestMacroStabilityInwardsPhreaticLineTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/TestMacroStabilityInwardsPhreaticLineTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/TestMacroStabilityInwardsPhreaticLineTest.cs	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -0,0 +1,41 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test
+{
+    [TestFixture]
+    public class TestMacroStabilityInwardsPhreaticLineTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var phreaticLine = new TestMacroStabilityInwardsPhreaticLine();
+
+            // Assert
+            Assert.IsInstanceOf<MacroStabilityInwardsPhreaticLine>(phreaticLine);
+            Assert.AreEqual("Test Phreatic Line", phreaticLine.Name);
+            CollectionAssert.IsEmpty(phreaticLine.Geometry);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/TestMacroStabilityInwardsWaternetLineTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/TestMacroStabilityInwardsWaternetLineTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/TestMacroStabilityInwardsWaternetLineTest.cs	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -0,0 +1,43 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using NUnit.Framework;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test
+{
+    [TestFixture]
+    public class TestMacroStabilityInwardsWaternetLineTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var waternetLine = new TestMacroStabilityInwardsWaternetLine();
+
+            // Assert
+            Assert.IsInstanceOf<MacroStabilityInwardsWaternetLine>(waternetLine);
+            Assert.AreEqual("Test Waternet Line", waternetLine.Name);
+            CollectionAssert.IsEmpty(waternetLine.Geometry);
+            Assert.AreEqual("Test Phreatic Line", waternetLine.PhreaticLine.Name);
+            CollectionAssert.IsEmpty(waternetLine.PhreaticLine.Geometry);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.csproj
===================================================================
diff -u -r9f936b0b29f490a024df02345df182133b1c041a -r14c118039f313ea66787d8065daad0aa783b731a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.TestUtil.csproj)	(revision 9f936b0b29f490a024df02345df182133b1c041a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.TestUtil.csproj)	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -46,8 +46,9 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="MacroStabilityInwardsGridTestFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestMacroStabilityInwardsPhreaticLine.cs" />
+    <Compile Include="TestMacroStabilityInwardsWaternetLine.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil/TestMacroStabilityInwardsPhreaticLine.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil/TestMacroStabilityInwardsPhreaticLine.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil/TestMacroStabilityInwardsPhreaticLine.cs	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using Core.Common.Base.Geometry;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives.TestUtil
+{
+    /// <summary>
+    /// Simple <see cref="MacroStabilityInwardsPhreaticLine"/> that can be used in tests.
+    /// </summary>
+    public class TestMacroStabilityInwardsPhreaticLine : MacroStabilityInwardsPhreaticLine
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="TestMacroStabilityInwardsPhreaticLine"/>.
+        /// </summary>
+        public TestMacroStabilityInwardsPhreaticLine() : base("Test Phreatic Line", Enumerable.Empty<Point2D>()) {}
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil/TestMacroStabilityInwardsWaternetLine.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil/TestMacroStabilityInwardsWaternetLine.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil/TestMacroStabilityInwardsWaternetLine.cs	(revision 14c118039f313ea66787d8065daad0aa783b731a)
@@ -0,0 +1,37 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using Core.Common.Base.Geometry;
+
+namespace Ringtoets.MacroStabilityInwards.Primitives.TestUtil
+{
+    /// <summary>
+    /// Simple <see cref="MacroStabilityInwardsWaternetLine"/> that can be used in tests.
+    /// </summary>
+    public class TestMacroStabilityInwardsWaternetLine : MacroStabilityInwardsWaternetLine
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="TestMacroStabilityInwardsWaternetLine"/>.
+        /// </summary>
+        public TestMacroStabilityInwardsWaternetLine() : base("Test Waternet Line", Enumerable.Empty<Point2D>(), new TestMacroStabilityInwardsPhreaticLine()) {}
+    }
+}
\ No newline at end of file