Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs
===================================================================
diff -u -r2c8c5eec330543aab5ece02da4159ce53cfde11b -r1b16d1bbb40c8246bd53a1dcfa7803cb92501915
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanTest.cs)	(revision 2c8c5eec330543aab5ece02da4159ce53cfde11b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsSlipPlaneUpliftVanTest.cs	(.../MacroStabilityInwardsSlipPlaneUpliftVanTest.cs)	(revision 1b16d1bbb40c8246bd53a1dcfa7803cb92501915)
@@ -22,7 +22,8 @@
 using System;
 using System.Linq;
 using NUnit.Framework;
-using Ringtoets.MacroStabilityInwards.Data.TestUtil;
+using Ringtoets.MacroStabilityInwards.Primitives;
+using Ringtoets.MacroStabilityInwards.Primitives.TestUtil;
 
 namespace Ringtoets.MacroStabilityInwards.Data.Test
 {
@@ -33,7 +34,7 @@
         public void Constructor_LeftGridNull_ThrowsArgumentNullException()
         {
             // Setup
-            MacroStabilityInwardsGridOutput grid = MacroStabilityInwardsGridOutputTestFactory.Create();
+            MacroStabilityInwardsGrid grid = MacroStabilityInwardsGridTestFactory.Create();
 
             // Call
             TestDelegate call = () => new MacroStabilityInwardsSlipPlaneUpliftVan(null, grid, Enumerable.Empty<double>());
@@ -47,7 +48,7 @@
         public void Constructor_RightGridNull_ThrowsArgumentNullException()
         {
             // Setup
-            MacroStabilityInwardsGridOutput grid = MacroStabilityInwardsGridOutputTestFactory.Create();
+            MacroStabilityInwardsGrid grid = MacroStabilityInwardsGridTestFactory.Create();
 
             // Call
             TestDelegate call = () => new MacroStabilityInwardsSlipPlaneUpliftVan(grid, null, Enumerable.Empty<double>());
@@ -61,8 +62,8 @@
         public void Constructor_TangentLinesNull_ThrowsArgumentNullException()
         {
             // Setup
-            MacroStabilityInwardsGridOutput leftGrid = MacroStabilityInwardsGridOutputTestFactory.Create();
-            MacroStabilityInwardsGridOutput rightGrid = MacroStabilityInwardsGridOutputTestFactory.Create();
+            MacroStabilityInwardsGrid leftGrid = MacroStabilityInwardsGridTestFactory.Create();
+            MacroStabilityInwardsGrid rightGrid = MacroStabilityInwardsGridTestFactory.Create();
 
             // Call
             TestDelegate call = () => new MacroStabilityInwardsSlipPlaneUpliftVan(leftGrid, rightGrid, null);
@@ -76,8 +77,8 @@
         public void Constructor_ExpectedValues()
         {
             // Setup
-            MacroStabilityInwardsGridOutput leftGrid = MacroStabilityInwardsGridOutputTestFactory.Create();
-            MacroStabilityInwardsGridOutput rightGrid = MacroStabilityInwardsGridOutputTestFactory.Create();
+            MacroStabilityInwardsGrid leftGrid = MacroStabilityInwardsGridTestFactory.Create();
+            MacroStabilityInwardsGrid rightGrid = MacroStabilityInwardsGridTestFactory.Create();
             var tangentLines = new[]
             {
                 0,