Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs
===================================================================
diff -u -rc875fba42a23b742e55f8798f93fddf2f872e282 -rec201316303aa676976655dcdfd9285dcc3ec4f1
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs	(.../MacroStabilityInwardsSoilLayerTransformerTest.cs)	(revision c875fba42a23b742e55f8798f93fddf2f872e282)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsSoilLayerTransformerTest.cs	(.../MacroStabilityInwardsSoilLayerTransformerTest.cs)	(revision ec201316303aa676976655dcdfd9285dcc3ec4f1)
@@ -136,7 +136,7 @@
         public void SoilLayer1DTransform_ValidUsePopValue_ReturnMacroStabilityInwardSoilLayer1D(double? usePop, bool transformedUsePopValue)
         {
             // Setup
-            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DForTransforming();
+            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DWithValidAquifer();
             layer.UsePop = usePop;
 
             // Call
@@ -150,7 +150,7 @@
         public void SoilLayer1DTransform_InvalidUsePopValue_ThrowsImportedDataTransformationException()
         {
             // Setup
-            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DForTransforming();
+            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DWithValidAquifer();
             layer.UsePop = 1;
 
             // Call
@@ -170,7 +170,7 @@
                                                                                                             MacroStabilityInwardsShearStrengthModel transformedShearStrengthModel)
         {
             // Setup
-            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DForTransforming();
+            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DWithValidAquifer();
             layer.ShearStrengthModel = sheartStrengthModel;
 
             // Call
@@ -184,7 +184,7 @@
         public void SoilLayer1DTransform_InvalidShearStrengthModelValue_ThrowsImportedDataTransformException()
         {
             // Setup
-            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DForTransforming();
+            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DWithValidAquifer();
             layer.ShearStrengthModel = 2;
 
             // Call
@@ -201,7 +201,7 @@
         public void SoilLayer1DTransform_ValidIsAquifer_ReturnsMacroStabilityInwardsSoilLayer1D(double isAquifer, bool transformedIsAquifer)
         {
             // Setup
-            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DForTransforming();
+            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DWithValidAquifer();
             layer.IsAquifer = isAquifer;
 
             // Call
@@ -218,7 +218,7 @@
         public void SoilLayer1DTransform_InvalidIsAquifer_ThrowsImportedDataException(double? isAquifer)
         {
             // Setup
-            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DForTransforming();
+            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DWithValidAquifer();
             layer.IsAquifer = isAquifer;
 
             // Call
@@ -234,7 +234,7 @@
         public void SoilLayer1DTransform_ValidColors_ReturnsMacroStabilityInwardsSoilLayer1D(double? color, Color transformedColor)
         {
             // Setup
-            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DForTransforming();
+            SoilLayer1D layer = SoilLayer1DTestFactory.CreateSoilLayer1DWithValidAquifer();
             layer.Color = color;
 
             // Call
@@ -365,7 +365,7 @@
         public void SoilLayer2DTransform_ValidUsePopValue_ReturnMacroStabilityInwardSoilLayer2D(double? usePop, bool transformedUsePopValue)
         {
             // Setup
-            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DForTransforming();
+            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer();
             layer.UsePop = usePop;
 
             // Call
@@ -379,7 +379,7 @@
         public void SoilLayer2DTransform_InvalidUsePopValue_ReturnMacroStabilityInwardSoilLayer2D()
         {
             // Setup
-            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DForTransforming();
+            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer();
             layer.UsePop = 1;
 
             // Call
@@ -399,7 +399,7 @@
                                                                                                             MacroStabilityInwardsShearStrengthModel transformedShearStrengthModel)
         {
             // Setup
-            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DForTransforming();
+            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer();
             layer.ShearStrengthModel = sheartStrengthModel;
 
             // Call
@@ -430,7 +430,7 @@
         public void SoilLayer2DTransform_ValidIsAquifer_ReturnsMacroStabilityInwardsSoilLayer2D(double isAquifer, bool transformedIsAquifer)
         {
             // Setup
-            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DForTransforming();
+            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer();
             layer.IsAquifer = isAquifer;
 
             // Call
@@ -447,7 +447,7 @@
         public void SoilLayer2DTransform_InvalidIsAquifer_ThrowsImportedDataException(double? isAquifer)
         {
             // Setup
-            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DForTransforming();
+            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer();
             layer.IsAquifer = isAquifer;
 
             // Call
@@ -463,7 +463,7 @@
         public void SoilLayer2DTransform_ValidColors_ReturnsMacroStabilityInwardsSoilLayer2D(double? color, Color transformedColor)
         {
             // Setup
-            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DForTransforming();
+            SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2DWithValidAquifer();
             layer.Color = color;
 
             // Call