diff --git a/packages/muelu/test/scaling/conchas_milestone_zoltan2.xml b/packages/muelu/test/scaling/conchas_milestone_zoltan2.xml
index 8e197a88ea0d0efd96282a9e81dbfb3bb86cf5d1..06b6de2b61d22ade19225477c97db4f2041103dd 100644
--- a/packages/muelu/test/scaling/conchas_milestone_zoltan2.xml
+++ b/packages/muelu/test/scaling/conchas_milestone_zoltan2.xml
@@ -38,6 +38,11 @@
       <Parameter name="aggregation: min agg size"           type="int"    value="2"/>
     </ParameterList>
 
+    <ParameterList name="myCoarseMapFact">
+      <Parameter name="factory"                             type="string" value="CoarseMapFactory"/>
+      <Parameter name="Aggregates"                          type="string" value="UncoupledAggregationFactory"/>
+    </ParameterList>
+
     <ParameterList name="myAggExportFact">
       <Parameter name="factory"                             type="string" value="AggregationExportFactory"/>
       <Parameter name="DofsPerNode"                         type="string" value="myCoalesceDropFact"/>
@@ -207,6 +212,7 @@
       <Parameter name="startLevel"                          type="int"      value="0"/>
       <Parameter name="Smoother"                            type="string"   value="Chebyshev"/>
       <Parameter name="Aggregates"                          type="string"   value="UncoupledAggregationFact"/>
+      <Parameter name="CoarseMap"                           type="string"   value="myCoarseMapFact"/>
       <Parameter name="Nullspace"                           type="string"   value="myRebalanceProlongatorFact"/>
       <Parameter name="Coordinates"                         type="string"   value="myRebalanceProlongatorFact"/>
       <Parameter name="Importer"                            type="string"   value="myRepartitionFact"/>
diff --git a/packages/muelu/test/scaling/conchas_milestone_zoltan2_complex.xml b/packages/muelu/test/scaling/conchas_milestone_zoltan2_complex.xml
index 6d3ac9005f19968e5ea26315f6ddc3eeff2f8ece..ca2ab718ba5e1f45355a18b358abddf8bbbc85ab 100644
--- a/packages/muelu/test/scaling/conchas_milestone_zoltan2_complex.xml
+++ b/packages/muelu/test/scaling/conchas_milestone_zoltan2_complex.xml
@@ -38,6 +38,11 @@
       <Parameter name="aggregation: min agg size"           type="int"    value="2"/>
     </ParameterList>
 
+    <ParameterList name="myCoarseMapFact">
+      <Parameter name="factory"                             type="string" value="CoarseMapFactory"/>
+      <Parameter name="Aggregates"                          type="string" value="UncoupledAggregationFact"/>
+    </ParameterList>
+
     <ParameterList name="myAggExportFact">
       <Parameter name="factory"                             type="string" value="AggregationExportFactory"/>
       <Parameter name="DofsPerNode"                         type="string" value="myCoalesceDropFact"/>
@@ -206,6 +211,7 @@
       <Parameter name="startLevel"                          type="int"      value="0"/>
       <Parameter name="Smoother"                            type="string"   value="SymGaussSeidel"/>
       <Parameter name="Aggregates"                          type="string"   value="UncoupledAggregationFact"/>
+      <Parameter name="CoarseMap"                           type="string"   value="myCoarseMapFact"/>
       <Parameter name="Nullspace"                           type="string"   value="myRebalanceProlongatorFact"/>
       <Parameter name="Coordinates"                         type="string"   value="myRebalanceProlongatorFact"/>
       <Parameter name="Importer"                            type="string"   value="myRepartitionFact"/>
diff --git a/packages/muelu/test/scaling/import.xml b/packages/muelu/test/scaling/import.xml
index f2d3427dbd32119a903fddce25f3b4b594430c98..6ec04980e15a8433dd5c0b3720affeaee73d6a8f 100644
--- a/packages/muelu/test/scaling/import.xml
+++ b/packages/muelu/test/scaling/import.xml
@@ -13,12 +13,10 @@
   <!-- <Parameter        name="aggregation: drop tol"                type="double"   value="0.1"/> -->
 
   <!-- ===========  SMOOTHING  =========== -->
-  <Parameter        name="smoother: type"                       type="string"   value="CHEBYSHEV"/>
+  <Parameter        name="smoother: type"                       type="string"   value="RELAXATION"/>
   <ParameterList    name="smoother: params">
-    <Parameter      name="chebyshev: degree"                    type="int"      value="2"/>>
-    <Parameter      name="chebyshev: ratio eigenvalue"          type="double"   value="7"/>
-    <Parameter      name="chebyshev: min eigenvalue"            type="double"   value="1.0"/>
-    <Parameter      name="chebyshev: zero starting solution"    type="bool"     value="true"/>
+    <Parameter      name="relaxation: type"                     type="string"   value="Symmetric Gauss-Seidel"/>
+    <Parameter      name="relaxation: sweeps"                   type="int"      value="2"/>
   </ParameterList>
 
   <!-- ===========  REPARTITIONING  =========== -->