Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r385 -r454
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 385)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 454)
@@ -35,8 +35,8 @@
 
         #endregion
 
-        [TestCase(UserColumnFilters.MacrostabilityBasicModule, Mechanism.Stability)]
-        [TestCase(UserColumnFilters.PipingRingtoets, Mechanism.Piping)]
+        [TestCase(UserColumnFilters.MacrostabilityWti, Mechanism.Stability)]
+        [TestCase(UserColumnFilters.PipingWti, Mechanism.Piping)]
         public void SoilFiltering_UserColumnFilterForMechanism_HasMembersWithSameMechanism(UserColumnFilters filter, Mechanism mechanism)
         {
             var membersInFilterDefinition = GetFilterDefinition(filter);
@@ -119,24 +119,31 @@
             var visibleProperties = new List<string>
             {
                 StaticReflection.GetMemberName<Soil>(s => s.AbovePhreaticLevel),
+                StaticReflection.GetMemberName<Soil>(s => s.AbovePhreaticLevelStochast),
                 StaticReflection.GetMemberName<Soil>(s => s.BelowPhreaticLevel),
+                StaticReflection.GetMemberName<Soil>(s => s.BelowPhreaticLevelStochast),
                 StaticReflection.GetMemberName<Soil>(s => s.Cohesion),
+                StaticReflection.GetMemberName<Soil>(s => s.CohesionStochast),
                 StaticReflection.GetMemberName<Soil>(s => s.FrictionAngle),
+                StaticReflection.GetMemberName<Soil>(s => s.FrictionAngleStochast),
                 StaticReflection.GetMemberName<Soil>(s => s.RatioCuPc),
+                StaticReflection.GetMemberName<Soil>(s => s.RatioCuPcStochast),
                 StaticReflection.GetMemberName<Soil>(s => s.StrengthIncreaseExponent),
+                StaticReflection.GetMemberName<Soil>(s => s.StrengthIncreaseExponentStochast),
                 StaticReflection.GetMemberName<Soil>(s => s.POP),
+                StaticReflection.GetMemberName<Soil>(s => s.POPStochast),
                 StaticReflection.GetMemberName<Soil>(s => s.ShearStrengthModel),
                 StaticReflection.GetMemberName<Soil>(s => s.UsePop)
             };
             visibleProperties.AddRange(alwaysVisibleProperties);
 
-            AdhereToFilter(UserColumnFilters.MacrostabilityBasicModule, visibleProperties);
+            AdhereToFilter(UserColumnFilters.MacrostabilityWti, visibleProperties);
         }
 
         [Test]
-        public void DSoilModelContext_SoilMemberIsEnabled_AdhereToFilterMacrostabilityBasicModule()
+        public void DSoilModelContext_SoilMemberIsEnabled_AdhereToFilterMacrostabilityWti()
         {
-            var context = SetupDSoilModelContext(UserColumnFilters.MacrostabilityBasicModule);
+            var context = SetupDSoilModelContext(UserColumnFilters.MacrostabilityWti);
             var soil = new Soil
             {
                 ShearStrengthModel = ShearStrengthModel.CPhi,
@@ -165,21 +172,50 @@
         }
 
         [Test]
-        public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterPipingRingToets()
+        public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterPipingWti()
         {
             var visibleProperties = new List<string>
             {
+                StaticReflection.GetMemberName<Soil>(s => s.AbovePhreaticLevel),
+                StaticReflection.GetMemberName<Soil>(s => s.AbovePhreaticLevelStochast),
+                StaticReflection.GetMemberName<Soil>(s => s.BelowPhreaticLevel),
+                StaticReflection.GetMemberName<Soil>(s => s.BelowPhreaticLevelStochast),
+                StaticReflection.GetMemberName<Soil>(s => s.DiameterD70),
                 StaticReflection.GetMemberName<Soil>(s => s.DiameterD70Stochast),
+                StaticReflection.GetMemberName<Soil>(s => s.PermeabKx),
                 StaticReflection.GetMemberName<Soil>(s => s.PermeabKxStochast),
-                StaticReflection.GetMemberName<Soil>(s => s.AbovePhreaticLevelStochast),
-                StaticReflection.GetMemberName<Soil>(s => s.BelowPhreaticLevelStochast)
             };
             visibleProperties.AddRange(alwaysVisibleProperties);
 
-            AdhereToFilter(UserColumnFilters.PipingRingtoets, visibleProperties);
+            AdhereToFilter(UserColumnFilters.PipingWti, visibleProperties);
         }
 
         [Test]
+        public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterFlowslideWti()
+        {
+            var visibleProperties = new List<string>
+            {
+                StaticReflection.GetMemberName<Soil>(s => s.DiameterD15),
+                StaticReflection.GetMemberName<Soil>(s => s.DiameterD50),
+                StaticReflection.GetMemberName<Soil>(s => s.FrictionAngle),
+                StaticReflection.GetMemberName<Soil>(s => s.Porosity),
+                StaticReflection.GetMemberName<Soil>(s => s.MinPorosity),
+                StaticReflection.GetMemberName<Soil>(s => s.MaxPorosity),
+                StaticReflection.GetMemberName<Soil>(s => s.Evoldm),
+                StaticReflection.GetMemberName<Soil>(s => s.Ks0),
+                StaticReflection.GetMemberName<Soil>(s => s.GammaKorrel),
+                StaticReflection.GetMemberName<Soil>(s => s.ParM),
+                StaticReflection.GetMemberName<Soil>(s => s.ParU),
+                StaticReflection.GetMemberName<Soil>(s => s.ParV),
+                StaticReflection.GetMemberName<Soil>(s => s.ParR),
+            };
+            visibleProperties.AddRange(alwaysVisibleProperties);
+
+            AdhereToFilter(UserColumnFilters.FlowSlideWti, visibleProperties);
+        }
+
+
+        [Test]
         public void DSoilModelContext_ParameterViewForPreconsolidationStress_Visibility()
         {
             var dSoilModelContext = SetupDSoilModelContext(null);