Index: Ringtoets.sln
===================================================================
diff -u -radfc775e4b990fb99dcf901f70d8187a01fd4c59 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets.sln	(.../Ringtoets.sln)	(revision adfc775e4b990fb99dcf901f70d8187a01fd4c59)
+++ Ringtoets.sln	(.../Ringtoets.sln)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -1716,16 +1716,6 @@
 		{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
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Primitives.TestUtil", "Ringtoets\Piping\test\Ringtoets.Piping.Primitives.TestUtil\Ringtoets.Piping.Primitives.TestUtil.csproj", "{6F568E38-592A-4F99-A901-86B74C4F24D2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
@@ -4363,22 +4353,6 @@
 		{98B55901-9726-4172-A179-E2BF640FEDA8}.Release|x86.Build.0 = Release|x86
 		{98B55901-9726-4172-A179-E2BF640FEDA8}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{98B55901-9726-4172-A179-E2BF640FEDA8}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
-		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstaller|x86.ActiveCfg = Release|x86
-		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|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 = Release|x86
-		{C80AD710-0F84-40CE-9567-10CBE332E589}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|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
 		{6F568E38-592A-4F99-A901-86B74C4F24D2}.CreateInstaller|x86.ActiveCfg = Release|x86
 		{6F568E38-592A-4F99-A901-86B74C4F24D2}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
 		{6F568E38-592A-4F99-A901-86B74C4F24D2}.Debug|x86.ActiveCfg = Debug|x86
@@ -4803,8 +4777,6 @@
 		{AE665B65-7370-4DAE-9CAD-BBB8D1706C6B} = {0D9858E1-CF2D-4DE5-AC0E-64401900D531}
 		{0500CA45-1791-4C91-9243-EF95567068A3} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4}
 		{98B55901-9726-4172-A179-E2BF640FEDA8} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4}
-		{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
-		{C80AD710-0F84-40CE-9567-10CBE332E589} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
 		{6F568E38-592A-4F99-A901-86B74C4F24D2} = {1F0D20C2-7F04-431D-AF22-95A31FD53733}
 		{AF88C45B-6C4B-40E3-9B12-83F0FDCAB623} = {1F0D20C2-7F04-431D-AF22-95A31FD53733}
 		{B727E93A-74B2-467A-AE46-9A4E39ED4B5F} = {41023317-95BB-4147-8154-87B45837E752}
Fisheye: Tag 378756fb27984abc7c2fdf13650b5b1700f94917 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsGrid.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlipPlaneUpliftVan.cs
===================================================================
diff -u -r01bd90d4fab9699280c5619754fc55b4f03be08a -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlipPlaneUpliftVan.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVan.cs)	(revision 01bd90d4fab9699280c5619754fc55b4f03be08a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsSlipPlaneUpliftVan.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVan.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Collections.Generic;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Data
 {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj	(.../Ringtoets.MacroStabilityInwards.Data.csproj)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/Ringtoets.MacroStabilityInwards.Data.csproj	(.../Ringtoets.MacroStabilityInwards.Data.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -40,6 +40,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="MacroStabilityInwardsGrid.cs" />
     <Compile Include="MacroStabilityInwardsGridDeterminationType.cs" />
     <Compile Include="MacroStabilityInwardsCalculation.cs" />
     <Compile Include="MacroStabilityInwardsCalculationScenario.cs" />
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsGridProperties.cs
===================================================================
diff -u -r117159f3212f0207fb5e2389cea1d5eda12f5eef -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsGridProperties.cs	(.../MacroStabilityInwardsGridProperties.cs)	(revision 117159f3212f0207fb5e2389cea1d5eda12f5eef)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsGridProperties.cs	(.../MacroStabilityInwardsGridProperties.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -26,8 +26,8 @@
 using Core.Common.Utils.Attributes;
 using Ringtoets.Common.Forms.ChangeHandlers;
 using Ringtoets.Common.Forms.PropertyClasses;
+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/MacroStabilityInwardsStochasticSoilProfileProperties.cs
===================================================================
diff -u -r3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsStochasticSoilProfileProperties.cs	(.../MacroStabilityInwardsStochasticSoilProfileProperties.cs)	(revision 3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsStochasticSoilProfileProperties.cs	(.../MacroStabilityInwardsStochasticSoilProfileProperties.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -30,7 +30,6 @@
 using Core.Common.Gui.PropertyBag;
 using Core.Common.Utils.Attributes;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
-using Ringtoets.MacroStabilityInwards.Primitives;
 using Ringtoets.MacroStabilityInwards.Forms.Properties;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
@@ -156,10 +155,11 @@
         [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_General))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.PreconsolidationStresses_DisplayName))]
         [ResourcesDescription(typeof(Resources), nameof(Resources.PreconsolidationStresses_Description))]
-        public MacroStabilityInwardsPreconsolidationStressProperties[] PreconsolidationStresses {
+        public MacroStabilityInwardsPreconsolidationStressProperties[] PreconsolidationStresses
+        {
             get
             {
-                IEnumerable<MacroStabilityInwardsPreconsolidationStress> preconsolidationStresses = 
+                IEnumerable<MacroStabilityInwardsPreconsolidationStress> preconsolidationStresses =
                     (data.SoilProfile as MacroStabilityInwardsSoilProfile2D)?.PreconsolidationStresses;
                 return preconsolidationStresses?.Select(stress => new MacroStabilityInwardsPreconsolidationStressProperties(stress)).ToArray() ??
                        new MacroStabilityInwardsPreconsolidationStressProperties[0];
@@ -169,13 +169,13 @@
         [DynamicVisibleValidationMethod]
         public bool DynamicVisibleValidationMethod(string propertyName)
         {
-            if (propertyName.Equals(nameof(Bottom)) 
+            if (propertyName.Equals(nameof(Bottom))
                 || propertyName.Equals(nameof(Layers1D)))
             {
                 return data.SoilProfile is MacroStabilityInwardsSoilProfile1D;
             }
 
-            if (propertyName.Equals(nameof(Layers2D)) 
+            if (propertyName.Equals(nameof(Layers2D))
                 || propertyName.Equals(nameof(PreconsolidationStresses)))
             {
                 return data.SoilProfile is MacroStabilityInwardsSoilProfile2D;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor.cs
===================================================================
diff -u -r78382ec129ddc7537096860680cef36f3796700d -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor.cs	(.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor.cs)	(revision 78382ec129ddc7537096860680cef36f3796700d)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor.cs	(.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditor.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -24,7 +24,6 @@
 using Core.Common.Gui.UITypeEditors;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.UITypeEditors
 {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculatorException.cs
===================================================================
diff -u -r98893373912f751309ca68fa432e3b9abd9ec2ce -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculatorException.cs	(.../UpliftVanCalculatorException.cs)	(revision 98893373912f751309ca68fa432e3b9abd9ec2ce)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculatorException.cs	(.../UpliftVanCalculatorException.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.Serialization;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SlipPlaneUpliftVanCreator.cs
===================================================================
diff -u -r197f5481b023a6f8609cf81bb5f7b6a205ea3439 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SlipPlaneUpliftVanCreator.cs	(.../SlipPlaneUpliftVanCreator.cs)	(revision 197f5481b023a6f8609cf81bb5f7b6a205ea3439)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Creators/Input/SlipPlaneUpliftVanCreator.cs	(.../SlipPlaneUpliftVanCreator.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -24,7 +24,6 @@
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input
 {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapperException.cs
===================================================================
diff -u -r98893373912f751309ca68fa432e3b9abd9ec2ce -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapperException.cs	(.../UpliftVanKernelWrapperException.cs)	(revision 98893373912f751309ca68fa432e3b9abd9ec2ce)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapperException.cs	(.../UpliftVanKernelWrapperException.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -20,7 +20,6 @@
 // All rights reserved.
 
 using System;
-using System.Collections.Generic;
 using System.Runtime.Serialization;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Kernels.UpliftVan
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategy.cs
===================================================================
diff -u -r86e6c6985b6841357f600bff63c169a92b528640 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategy.cs	(.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategy.cs)	(revision 86e6c6985b6841357f600bff63c169a92b528640)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategy.cs	(.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategy.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -28,7 +28,6 @@
 using Ringtoets.Common.IO.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
-using Ringtoets.MacroStabilityInwards.Primitives;
 using Ringtoets.MacroStabilityInwards.Service;
 
 namespace Ringtoets.MacroStabilityInwards.Plugin.FileImporter
Fisheye: Tag 59adecfc7f82ab8277440ecae147453f5cbddbbf refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/MacroStabilityInwardsGrid.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj
===================================================================
diff -u -r9f936b0b29f490a024df02345df182133b1c041a -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.csproj)	(revision 9f936b0b29f490a024df02345df182133b1c041a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -42,7 +42,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="MacroStabilityInwardsDikeSoilScenario.cs" />
-    <Compile Include="MacroStabilityInwardsGrid.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <DependentUpon>Resources.resx</DependentUpon>
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs
===================================================================
diff -u -r19150f985431c9805d687eebb4505e440784acb6 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs)	(revision 19150f985431c9805d687eebb4505e440784acb6)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanConverter.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -24,7 +24,6 @@
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Converters
 {
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSlipPlaneConverter.cs
===================================================================
diff -u -r72b7678303020aa97e09ff82e8e5f0d9d0232538 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSlipPlaneConverter.cs	(.../UpliftVanSlipPlaneConverter.cs)	(revision 72b7678303020aa97e09ff82e8e5f0d9d0232538)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Converters/UpliftVanSlipPlaneConverter.cs	(.../UpliftVanSlipPlaneConverter.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -23,7 +23,6 @@
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Converters
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs
===================================================================
diff -u -rf2ba7f68f5de2fc3c8dec8baf7326808120cee52 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs	(.../MacroStabilityInwardsCalculationTest.cs)	(revision f2ba7f68f5de2fc3c8dec8baf7326808120cee52)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs	(.../MacroStabilityInwardsCalculationTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using Core.Common.Base;
 using NUnit.Framework;
 using Rhino.Mocks;
Fisheye: Tag 378756fb27984abc7c2fdf13650b5b1700f94917 refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsGridTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs
===================================================================
diff -u -r9f936b0b29f490a024df02345df182133b1c041a -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs	(.../MacroStabilityInwardsInputTest.cs)	(revision 9f936b0b29f490a024df02345df182133b1c041a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsInputTest.cs	(.../MacroStabilityInwardsInputTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -28,10 +28,8 @@
 using Ringtoets.Common.Data.Hydraulics;
 using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
-using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Primitives;
-using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs
===================================================================
diff -u -r0e809897e28ca8673b98ec8abb68b42939a3a647 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs	(.../MacroStabilityInwardsOutputTest.cs)	(revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs	(.../MacroStabilityInwardsOutputTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -24,7 +24,6 @@
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil;
-using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs
===================================================================
diff -u -r1b16d1bbb40c8246bd53a1dcfa7803cb92501915 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanTest.cs)	(revision 1b16d1bbb40c8246bd53a1dcfa7803cb92501915)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -22,8 +22,7 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
-using Ringtoets.MacroStabilityInwards.Primitives;
-using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
+using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.Test.csproj)	(revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/Ringtoets.MacroStabilityInwards.Data.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.Test.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -62,6 +62,7 @@
     <Compile Include="MacroStabilityInwardsCalculationScenarioTest.cs" />
     <Compile Include="MacroStabilityInwardsCalculationTest.cs" />
     <Compile Include="MacroStabilityInwardsGridDeterminationTypeTest.cs" />
+    <Compile Include="MacroStabilityInwardsGridTest.cs" />
     <Compile Include="MacroStabilityInwardsSemiProbabilisticDesignVariableFactoryTest.cs" />
     <Compile Include="MacroStabilityInwardsSliceTest.cs" />
     <Compile Include="MacroStabilityInwardsSlidingCircleTest.cs" />
@@ -126,10 +127,6 @@
       <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.Data.TestUtil.Test/MacroStabilityInwardsGridTestFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsGridTestFactoryTest.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsGridTestFactoryTest.cs	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -0,0 +1,44 @@
+// 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.Data.TestUtil.Test
+{
+    [TestFixture]
+    public class MacroStabilityInwardsGridTestFactoryTest
+    {
+        [Test]
+        public void Create_Always_ReturnGridWithDefaultValues()
+        {
+            // Call
+            MacroStabilityInwardsGrid grid = MacroStabilityInwardsGridTestFactory.Create();
+
+            // Assert
+            Assert.AreEqual(0.1, grid.XLeft);
+            Assert.AreEqual(0.2, grid.XRight);
+            Assert.AreEqual(0.3, grid.ZTop);
+            Assert.AreEqual(0.4, grid.ZBottom);
+            Assert.AreEqual(1, grid.NumberOfHorizontalPoints);
+            Assert.AreEqual(2, grid.NumberOfVerticalPoints);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj
===================================================================
diff -u -rbdd9821cff5b4f895ff9607d7137c4dbe2712191 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj)	(revision bdd9821cff5b4f895ff9607d7137c4dbe2712191)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -50,6 +50,7 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="MacroStabilityInwardsCalculationScenarioFactoryTest.cs" />
+    <Compile Include="MacroStabilityInwardsGridTestFactoryTest.cs" />
     <Compile Include="MacroStabilityInwardsInputFactoryTest.cs" />
     <Compile Include="MacroStabilityInwardsStochasticSoilModelTestFactoryTest.cs" />
     <Compile Include="SoilProfile\MacroStabilityInwardsPreconsolidationStressTestFactoryTest.cs" />
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsGridTestFactory.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsGridTestFactory.cs	(revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsGridTestFactory.cs	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -0,0 +1,49 @@
+// 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 Core.Common.Base.Data;
+
+namespace Ringtoets.MacroStabilityInwards.Data.TestUtil
+{
+    /// <summary>
+    /// Factory to create simple <see cref="MacroStabilityInwardsGrid"/>
+    /// instances that can be used for testing.
+    /// </summary>
+    public static class MacroStabilityInwardsGridTestFactory
+    {
+        /// <summary>
+        /// Creates a new <see cref="MacroStabilityInwardsGrid"/>.
+        /// </summary>
+        /// <returns>The created <see cref="MacroStabilityInwardsGrid"/>.</returns>
+        public static MacroStabilityInwardsGrid Create()
+        {
+            return new MacroStabilityInwardsGrid
+            {
+                XLeft = (RoundedDouble) 0.1,
+                XRight = (RoundedDouble) 0.2,
+                ZTop = (RoundedDouble) 0.3,
+                ZBottom = (RoundedDouble) 0.4,
+                NumberOfHorizontalPoints = 1,
+                NumberOfVerticalPoints = 2
+            };
+        }
+    }
+}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj
===================================================================
diff -u -r3c535420f957462c1d525a532dad033434bf2ab7 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj)	(revision 3c535420f957462c1d525a532dad033434bf2ab7)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj	(.../Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -50,6 +50,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="MacroStabilityInwardsGridTestFactory.cs" />
     <Compile Include="MacroStabilityInwardsInputFactory.cs" />
     <Compile Include="MacroStabilityInwardsCalculationScenarioFactory.cs" />
     <Compile Include="MacroStabilityInwardsStochasticSoilModelTestFactory.cs" />
@@ -88,10 +89,6 @@
       <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>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsOutput.cs
===================================================================
diff -u -r1b16d1bbb40c8246bd53a1dcfa7803cb92501915 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsOutput.cs	(.../TestMacroStabilityInwardsOutput.cs)	(revision 1b16d1bbb40c8246bd53a1dcfa7803cb92501915)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsOutput.cs	(.../TestMacroStabilityInwardsOutput.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -19,8 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
-
 namespace Ringtoets.MacroStabilityInwards.Data.TestUtil
 {
     /// <summary>
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridPropertiesTest.cs
===================================================================
diff -u -r378756fb27984abc7c2fdf13650b5b1700f94917 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridPropertiesTest.cs	(.../MacroStabilityInwardsGridPropertiesTest.cs)	(revision 378756fb27984abc7c2fdf13650b5b1700f94917)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsGridPropertiesTest.cs	(.../MacroStabilityInwardsGridPropertiesTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -32,7 +32,6 @@
 using Ringtoets.Common.Forms.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Forms.Test.PropertyClasses
 {
@@ -313,7 +312,7 @@
             mocks.ReplayAll();
 
             var properties = new MacroStabilityInwardsGridProperties(new MacroStabilityInwardsGrid(), changeHandler, isReadOnly);
-            
+
             // Call
             bool result = properties.DynamicReadOnlyValidationMethod(string.Empty);
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj
===================================================================
diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj)	(revision a1fa1538918813373bcc864f0bce092bf28fd0ce)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Ringtoets.MacroStabilityInwards.Forms.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Forms.Test.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -192,10 +192,6 @@
       <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.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj
===================================================================
diff -u -ra20f5008f39cfa4fd6f94572fd07a011f76609f4 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj	(.../Ringtoets.MacroStabilityInwards.IO.Test.csproj)	(revision a20f5008f39cfa4fd6f94572fd07a011f76609f4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Ringtoets.MacroStabilityInwards.IO.Test.csproj	(.../Ringtoets.MacroStabilityInwards.IO.Test.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -119,10 +119,6 @@
       <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.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs
===================================================================
diff -u -rd619624819b7200ac55b357b0a0c54d198fc20e4 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs)	(revision d619624819b7200ac55b357b0a0c54d198fc20e4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs	(.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -32,7 +32,6 @@
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Forms.Views;
-using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil;
 using Ringtoets.MacroStabilityInwards.Service;
 
 namespace Ringtoets.MacroStabilityInwards.Integration.Test
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneUpliftVanCreatorTest.cs
===================================================================
diff -u -r197f5481b023a6f8609cf81bb5f7b6a205ea3439 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneUpliftVanCreatorTest.cs	(.../SlipPlaneUpliftVanCreatorTest.cs)	(revision 197f5481b023a6f8609cf81bb5f7b6a205ea3439)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/SlipPlaneUpliftVanCreatorTest.cs	(.../SlipPlaneUpliftVanCreatorTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -21,14 +21,11 @@
 
 using System;
 using Core.Common.Base.Data;
-using Core.Common.TestUtil;
 using Deltares.WTIStability;
 using NUnit.Framework;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Creators.Input;
-using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators.UpliftVan.Input;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.KernelWrapper.Test.Creators.Input
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs
===================================================================
diff -u -r0ca80ea0128c50442c9ab707f715125d65cf7fa0 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs)	(revision 0ca80ea0128c50442c9ab707f715125d65cf7fa0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilProfilePropertyInfoTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -26,8 +26,6 @@
 using Rhino.Mocks;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses;
-using Ringtoets.MacroStabilityInwards.Primitives;
-using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Plugin.Test.PropertyInfos
 {
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/Ringtoets.MacroStabilityInwards.Plugin.Test.csproj
===================================================================
diff -u -r966dc7335defa901104fd4168d57c08315db2de0 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/Ringtoets.MacroStabilityInwards.Plugin.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Plugin.Test.csproj)	(revision 966dc7335defa901104fd4168d57c08315db2de0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/Ringtoets.MacroStabilityInwards.Plugin.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Plugin.Test.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -194,10 +194,6 @@
       <Project>{3810D738-6412-47D1-8BC0-729D55BC951F}</Project>
       <Name>Ringtoets.MacroStabilityInwards.KernelWrapper.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.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest.cs
===================================================================
diff -u -ra20f5008f39cfa4fd6f94572fd07a011f76609f4 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest.cs)	(revision a20f5008f39cfa4fd6f94572fd07a011f76609f4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelCollectionContextTreeNodeInfoTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -34,7 +34,6 @@
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil;
 using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects;
-using Ringtoets.MacroStabilityInwards.Primitives;
 using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
 
 namespace Ringtoets.MacroStabilityInwards.Plugin.Test.TreeNodeInfos
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilModelTreeNodeInfoTest.cs
===================================================================
diff -u -ra20f5008f39cfa4fd6f94572fd07a011f76609f4 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilModelTreeNodeInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelTreeNodeInfoTest.cs)	(revision a20f5008f39cfa4fd6f94572fd07a011f76609f4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilModelTreeNodeInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilModelTreeNodeInfoTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -30,7 +30,6 @@
 using Rhino.Mocks;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil;
-using Ringtoets.MacroStabilityInwards.Primitives;
 using FormsResources = Ringtoets.MacroStabilityInwards.Forms.Properties.Resources;
 
 namespace Ringtoets.MacroStabilityInwards.Plugin.Test.TreeNodeInfos
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilProfileTreeNodeInfoTest.cs
===================================================================
diff -u -r42357a100d1a75baca233aa44b866a5009f48e00 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilProfileTreeNodeInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileTreeNodeInfoTest.cs)	(revision 42357a100d1a75baca233aa44b866a5009f48e00)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsStochasticSoilProfileTreeNodeInfoTest.cs	(.../MacroStabilityInwardsStochasticSoilProfileTreeNodeInfoTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -29,7 +29,6 @@
 using Rhino.Mocks;
 using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
 using Ringtoets.MacroStabilityInwards.Forms.Properties;
-using Ringtoets.MacroStabilityInwards.Primitives;
 
 namespace Ringtoets.MacroStabilityInwards.Plugin.Test.TreeNodeInfos
 {
Fisheye: Tag 59adecfc7f82ab8277440ecae147453f5cbddbbf refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/MacroStabilityInwardsGridTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj
===================================================================
diff -u -r9f936b0b29f490a024df02345df182133b1c041a -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj)	(revision 9f936b0b29f490a024df02345df182133b1c041a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.Test/Ringtoets.MacroStabilityInwards.Primitives.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Primitives.Test.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -53,7 +53,6 @@
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
     <Compile Include="MacroStabilityInwardsDikeSoilScenarioTest.cs" />
-    <Compile Include="MacroStabilityInwardsGridTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MacroStabilityInwardsSurfaceLineTest.cs" />
   </ItemGroup>
Fisheye: Tag 59adecfc7f82ab8277440ecae147453f5cbddbbf refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test/MacroStabilityInwardsGridTestFactoryTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 59adecfc7f82ab8277440ecae147453f5cbddbbf refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Primitives.TestUtil/MacroStabilityInwardsGridTestFactory.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs
===================================================================
diff -u -r19150f985431c9805d687eebb4505e440784acb6 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs)	(revision 19150f985431c9805d687eebb4505e440784acb6)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanConverterTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -25,7 +25,6 @@
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators.UpliftVan;
-using Ringtoets.MacroStabilityInwards.Primitives;
 using Ringtoets.MacroStabilityInwards.Service.Converters;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Test.Converters
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConverterTest.cs
===================================================================
diff -u -r197f5481b023a6f8609cf81bb5f7b6a205ea3439 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConverterTest.cs	(.../UpliftVanSlipPlaneConverterTest.cs)	(revision 197f5481b023a6f8609cf81bb5f7b6a205ea3439)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Converters/UpliftVanSlipPlaneConverterTest.cs	(.../UpliftVanSlipPlaneConverterTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -26,7 +26,6 @@
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
-using Ringtoets.MacroStabilityInwards.Primitives;
 using Ringtoets.MacroStabilityInwards.Service.Converters;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Test.Converters
@@ -112,7 +111,7 @@
             // Assert
             Assert.IsFalse(slipPlane.GridAutomaticDetermined);
             AssertGrid(input.LeftGrid, slipPlane.LeftGrid);
-            AssertGrid(input.RightGrid, slipPlane.RightGrid);            
+            AssertGrid(input.RightGrid, slipPlane.RightGrid);
             Assert.IsTrue(slipPlane.TangentLinesAutomaticAtBoundaries);
             Assert.IsNaN(slipPlane.TangentZTop);
             Assert.IsNaN(slipPlane.TangentZBottom);
@@ -157,12 +156,12 @@
             // Assert
             Assert.IsFalse(slipPlane.GridAutomaticDetermined);
             AssertGrid(input.LeftGrid, slipPlane.LeftGrid);
-            AssertGrid(input.RightGrid, slipPlane.RightGrid);            
+            AssertGrid(input.RightGrid, slipPlane.RightGrid);
             Assert.IsFalse(slipPlane.TangentLinesAutomaticAtBoundaries);
-            Assert.AreEqual(input.TangentLineZTop ,slipPlane.TangentZTop);
-            Assert.AreEqual(input.TangentLineZBottom ,slipPlane.TangentZBottom);
-            Assert.AreEqual(1 ,slipPlane.TangentLineNumber);
-            Assert.AreEqual(10 ,slipPlane.MaxSpacingBetweenBoundaries);
+            Assert.AreEqual(input.TangentLineZTop, slipPlane.TangentZTop);
+            Assert.AreEqual(input.TangentLineZBottom, slipPlane.TangentZBottom);
+            Assert.AreEqual(1, slipPlane.TangentLineNumber);
+            Assert.AreEqual(10, slipPlane.MaxSpacingBetweenBoundaries);
         }
 
         private void AssertGrid(MacroStabilityInwardsGrid expectedGrid, UpliftVanGrid actualGrid)
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs
===================================================================
diff -u -r8cf507b4db04c91cd5bc5ed243616f093a3016da -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs	(.../MacroStabilityInwardsCalculationActivityTest.cs)	(revision 8cf507b4db04c91cd5bc5ed243616f093a3016da)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs	(.../MacroStabilityInwardsCalculationActivityTest.cs)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -29,7 +29,6 @@
 using Ringtoets.Common.Service.TestUtil;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Data.TestUtil;
-using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil;
 using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators;
 
 namespace Ringtoets.MacroStabilityInwards.Service.Test
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj
===================================================================
diff -u -r72b7678303020aa97e09ff82e8e5f0d9d0232538 -r59adecfc7f82ab8277440ecae147453f5cbddbbf
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Service.Test.csproj)	(revision 72b7678303020aa97e09ff82e8e5f0d9d0232538)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/Ringtoets.MacroStabilityInwards.Service.Test.csproj	(.../Ringtoets.MacroStabilityInwards.Service.Test.csproj)	(revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
@@ -123,10 +123,6 @@
       <Project>{3810D738-6412-47D1-8BC0-729D55BC951F}</Project>
       <Name>Ringtoets.MacroStabilityInwards.KernelWrapper.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>
     <ProjectReference Include="..\Ringtoets.MacroStabilityInwards.Service.TestUtil\Ringtoets.MacroStabilityInwards.Service.TestUtil.csproj">
       <Project>{F966AE28-DE6B-497A-8449-37EC607E9F69}</Project>
       <Name>Ringtoets.MacroStabilityInwards.Service.TestUtil</Name>