Index: src/Deltares.DSoilModel.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r132 -r139
--- src/Deltares.DSoilModel.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 132)
+++ src/Deltares.DSoilModel.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 139)
@@ -132,6 +132,37 @@
         }
 
         [Test]
+        public void DSoilModelContext_SoilMemberIsEnabled_AdhereToFilterMacrostabilityBasicModule()
+        {
+            var context = SetupDSoilModelContext(UserColumnFilters.MacrostabilityBasicModule);
+            var soil = new Soil
+            {
+                ShearStrengthModel = ShearStrengthModel.CPhi,
+                UseDefaultShearStrengthModel = false, // or it will mess up this test !
+
+            };
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
+            
+            soil.ShearStrengthModel = ShearStrengthModel.CuCalculated;
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
+            soil.UsePop = true;
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
+            soil.UsePop = false;
+            Assert.AreEqual(false, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
+            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
+        }
+
+        [Test]
         public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterPipingRingToets()
         {
             var visibleProperties = new List<string>