diff --git a/packages/muelu/doc/Tutorial/src/CMakeLists.txt b/packages/muelu/doc/Tutorial/src/CMakeLists.txt
index aeb21de3b626..f1653d41f6d5 100644
--- a/packages/muelu/doc/Tutorial/src/CMakeLists.txt
+++ b/packages/muelu/doc/Tutorial/src/CMakeLists.txt
@@ -6,7 +6,6 @@ ASSERT_DEFINED(
   ${PACKAGE_NAME}_ENABLE_AztecOO
   ${PACKAGE_NAME}_ENABLE_Epetra
   ${PACKAGE_NAME}_ENABLE_EpetraExt
-  ${PACKAGE_NAME}_ENABLE_Galeri
   ${PACKAGE_NAME}_ENABLE_Ifpack
   )
 
@@ -14,7 +13,6 @@ IF (${PACKAGE_NAME}_ENABLE_Amesos       AND
     ${PACKAGE_NAME}_ENABLE_AztecOO      AND
     ${PACKAGE_NAME}_ENABLE_Epetra       AND
     ${PACKAGE_NAME}_ENABLE_EpetraExt    AND
-    ${PACKAGE_NAME}_ENABLE_Galeri       AND
     ${PACKAGE_NAME}_ENABLE_Ifpack
    )
   TRIBITS_ADD_EXECUTABLE(
diff --git a/packages/muelu/example/ParameterList/CMakeLists.txt b/packages/muelu/example/ParameterList/CMakeLists.txt
index 9e3248ce26c7..2430cbe89016 100644
--- a/packages/muelu/example/ParameterList/CMakeLists.txt
+++ b/packages/muelu/example/ParameterList/CMakeLists.txt
@@ -1,7 +1,7 @@
 INCLUDE(XpetraAddTest)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
+
 
 #
 #
@@ -31,7 +31,7 @@ ENDIF()
 #
 
 IF(${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
-#  XPETRA_ADD_TEST_TPETRA(MLParameterList 1-4)
+  #  XPETRA_ADD_TEST_TPETRA(MLParameterList 1-4)
 ENDIF()
 
 IF(${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PACKAGE_NAME}_ENABLE_Ifpack AND ${PACKAGE_NAME}_ENABLE_Amesos)
@@ -46,6 +46,5 @@ IF(${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PACK
     )
 ENDIF()
 
-ENDIF()
 
 # TODO: add a test with the --xml option
diff --git a/packages/muelu/example/advanced/blockcrs/CMakeLists.txt b/packages/muelu/example/advanced/blockcrs/CMakeLists.txt
index a8ff416f4fb2..d094c2d2f2d1 100644
--- a/packages/muelu/example/advanced/blockcrs/CMakeLists.txt
+++ b/packages/muelu/example/advanced/blockcrs/CMakeLists.txt
@@ -5,13 +5,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests)
 # Executables
 #
 
-IF(${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF(${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
 
-    TRIBITS_ADD_EXECUTABLE(
-      BlockCrs
-      SOURCES BlockCrs.cpp
-      COMM serial mpi
-      )
+  TRIBITS_ADD_EXECUTABLE(
+    BlockCrs
+    SOURCES BlockCrs.cpp
+    COMM serial mpi
+    )
 
 ENDIF()
 
@@ -20,7 +20,6 @@ ENDIF()
 #
 
 INCLUDE(XpetraAddTest)
-IF(${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF(${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
   XPETRA_ADD_TEST_TPETRA(BlockCrs 4)
 ENDIF()
-
diff --git a/packages/muelu/example/advanced/levelwrap/CMakeLists.txt b/packages/muelu/example/advanced/levelwrap/CMakeLists.txt
index 27fef1a27cc5..be4515d22c83 100644
--- a/packages/muelu/example/advanced/levelwrap/CMakeLists.txt
+++ b/packages/muelu/example/advanced/levelwrap/CMakeLists.txt
@@ -8,14 +8,13 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests)
 IF((${PACKAGE_NAME}_ENABLE_Tpetra  AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) OR
     (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos))
 
-  IF(${PACKAGE_NAME}_ENABLE_Galeri)
 
-    TRIBITS_ADD_EXECUTABLE(
-      LevelWrap
-      SOURCES LevelWrap.cpp
-      COMM serial mpi
-      )
-  ENDIF()
+
+  TRIBITS_ADD_EXECUTABLE(
+    LevelWrap
+    SOURCES LevelWrap.cpp
+    COMM serial mpi
+    )
 
 ENDIF()
 
@@ -25,9 +24,9 @@ ENDIF()
 
 INCLUDE(XpetraAddTest)
 
-IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
   XPETRA_ADD_TEST_TPETRA(LevelWrap 4)
 ENDIF()
-IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos)
   XPETRA_ADD_TEST_EPETRA(LevelWrap 4)
 ENDIF()
diff --git a/packages/muelu/example/advanced/memory/CMakeLists.txt b/packages/muelu/example/advanced/memory/CMakeLists.txt
index 491303535cb3..811a0019602a 100644
--- a/packages/muelu/example/advanced/memory/CMakeLists.txt
+++ b/packages/muelu/example/advanced/memory/CMakeLists.txt
@@ -1,21 +1,21 @@
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Tpetra)
   TRIBITS_ADD_EXECUTABLE_AND_TEST(
     MatrixDriver
     SOURCES MueLu_MatrixDriver.cpp
     )
 ENDIF()
 
-IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Epetra)
   TRIBITS_ADD_EXECUTABLE_AND_TEST(
     Epetra1DLaplace
     SOURCES Epetra1DLaplace.cpp MueLu_MemoryProfiler.cpp
     )
 ENDIF()
 
-IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Tpetra)
   TRIBITS_ADD_EXECUTABLE_AND_TEST(
     Tpetra1DLaplace
     SOURCES Tpetra1DLaplace.cpp MueLu_MemoryProfiler.cpp
diff --git a/packages/muelu/example/advanced/multiplesolve/CMakeLists.txt b/packages/muelu/example/advanced/multiplesolve/CMakeLists.txt
index 4740289259db..53765322391d 100644
--- a/packages/muelu/example/advanced/multiplesolve/CMakeLists.txt
+++ b/packages/muelu/example/advanced/multiplesolve/CMakeLists.txt
@@ -8,25 +8,24 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests)
 IF((${PACKAGE_NAME}_ENABLE_Tpetra  AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) OR
     (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos))
 
-  IF(${PACKAGE_NAME}_ENABLE_Galeri)
-    TRIBITS_ADD_EXECUTABLE(
-      FixedMatrixPattern
-      SOURCES FixedMatrixPattern.cpp
-      COMM serial mpi
-      )
 
-    TRIBITS_ADD_EXECUTABLE(
-      StandardReuse
-      SOURCES StandardReuse.cpp
-      COMM serial mpi
-      )
+  TRIBITS_ADD_EXECUTABLE(
+    FixedMatrixPattern
+    SOURCES FixedMatrixPattern.cpp
+    COMM serial mpi
+    )
+
+  TRIBITS_ADD_EXECUTABLE(
+    StandardReuse
+    SOURCES StandardReuse.cpp
+    COMM serial mpi
+    )
 
-    TRIBITS_ADD_EXECUTABLE(
-      ReuseSequence
-      SOURCES ReuseSequence.cpp
-      COMM serial mpi
-      )
-  ENDIF()
+  TRIBITS_ADD_EXECUTABLE(
+    ReuseSequence
+    SOURCES ReuseSequence.cpp
+    COMM serial mpi
+    )
 
 ENDIF()
 
@@ -41,7 +40,7 @@ TRIBITS_COPY_FILES_TO_BINARY_DIR(ReuseSequence_cp
 
 INCLUDE(XpetraAddTest)
 
-IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
   XPETRA_ADD_TEST_TPETRA(FixedMatrixPattern 4)
   XPETRA_ADD_TEST_TPETRA(StandardReuse 4)
   TRIBITS_ADD_TEST(
@@ -52,7 +51,7 @@ IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKA
     COMM serial mpi
     )
 ENDIF()
-IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos)
   XPETRA_ADD_TEST_EPETRA(FixedMatrixPattern 4)
   XPETRA_ADD_TEST_EPETRA(StandardReuse 4)
   TRIBITS_ADD_TEST(
diff --git a/packages/muelu/example/advanced/separatesetups/CMakeLists.txt b/packages/muelu/example/advanced/separatesetups/CMakeLists.txt
index 3c595988c184..0307b6987b52 100644
--- a/packages/muelu/example/advanced/separatesetups/CMakeLists.txt
+++ b/packages/muelu/example/advanced/separatesetups/CMakeLists.txt
@@ -1,10 +1,9 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests)
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
-  TRIBITS_ADD_EXECUTABLE(
-    SeparateSetups
-    SOURCES SeparateSetups.cpp
-    COMM serial mpi
-    )
-ENDIF()
+
+TRIBITS_ADD_EXECUTABLE(
+  SeparateSetups
+  SOURCES SeparateSetups.cpp
+  COMM serial mpi
+  )
diff --git a/packages/muelu/example/basic/CMakeLists.txt b/packages/muelu/example/basic/CMakeLists.txt
index 62af71bf86b8..2a24cd3a8de2 100644
--- a/packages/muelu/example/basic/CMakeLists.txt
+++ b/packages/muelu/example/basic/CMakeLists.txt
@@ -15,76 +15,75 @@ IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PAC
   SET(${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK YES)
 ENDIF()
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
 
-  IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK)
-    TRIBITS_ADD_EXECUTABLE(
-      Simple
-      SOURCES Simple.cpp
-      COMM serial mpi
-      )
 
-    TRIBITS_ADD_TEST(
-        Simple
-        NAME "SimpleTpetra"
-        ARGS "--linAlgebra=Tpetra --xml=simple.xml"
-        NUM_MPI_PROCS 4
-        COMM mpi # HAVE_MPI required
-        )
-
-      TRIBITS_ADD_TEST(
-        Simple
-        NAME "SimpleTpetraYaml"
-        ARGS "--linAlgebra=Tpetra --yaml=simple.yaml"
-        NUM_MPI_PROCS 4
-        COMM mpi # HAVE_MPI required
-        )
-
-    TRIBITS_COPY_FILES_TO_BINARY_DIR(Simple_cp
-      SOURCE_FILES simple.xml simple.yaml
-      )
+IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK)
+  TRIBITS_ADD_EXECUTABLE(
+    Simple
+    SOURCES Simple.cpp
+    COMM serial mpi
+    )
+
+  TRIBITS_ADD_TEST(
+    Simple
+    NAME "SimpleTpetra"
+    ARGS "--linAlgebra=Tpetra --xml=simple.xml"
+    NUM_MPI_PROCS 4
+    COMM mpi # HAVE_MPI required
+    )
+
+  TRIBITS_ADD_TEST(
+    Simple
+    NAME "SimpleTpetraYaml"
+    ARGS "--linAlgebra=Tpetra --yaml=simple.yaml"
+    NUM_MPI_PROCS 4
+    COMM mpi # HAVE_MPI required
+    )
+
+  TRIBITS_COPY_FILES_TO_BINARY_DIR(Simple_cp
+    SOURCE_FILES simple.xml simple.yaml
+    )
 
-  ENDIF()
+ENDIF()
 
-  #
-  # Stratimikos example
-  #
-  IF(${PACKAGE_NAME}_ENABLE_Stratimikos)
+#
+# Stratimikos example
+#
+IF(${PACKAGE_NAME}_ENABLE_Stratimikos)
 
-    # build executable
-    TRIBITS_ADD_EXECUTABLE(
-      Stratimikos
-      SOURCES Stratimikos.cpp
-      COMM serial mpi
-      )
+  # build executable
+  TRIBITS_ADD_EXECUTABLE(
+    Stratimikos
+    SOURCES Stratimikos.cpp
+    COMM serial mpi
+    )
 
-    TRIBITS_COPY_FILES_TO_BINARY_DIR(advanced_stratimikos_cp
-      SOURCE_FILES stratimikos_ParameterList.xml stratimikos_ParameterList.yaml stratimikos_ParameterList2.xml
-      )
+  TRIBITS_COPY_FILES_TO_BINARY_DIR(advanced_stratimikos_cp
+    SOURCE_FILES stratimikos_ParameterList.xml stratimikos_ParameterList.yaml stratimikos_ParameterList2.xml
+    )
 
-    IF (${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK)
+  IF (${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK)
 
-      TRIBITS_ADD_TEST(
-        Stratimikos
-        NAME Stratimikos
-        ARGS "--xml=stratimikos_ParameterList2.xml --linAlgebra=Epetra"
-        NUM_MPI_PROCS 4
-        COMM serial mpi
-        )
-
-    ENDIF()
+    TRIBITS_ADD_TEST(
+      Stratimikos
+      NAME Stratimikos
+      ARGS "--xml=stratimikos_ParameterList2.xml --linAlgebra=Epetra"
+      NUM_MPI_PROCS 4
+      COMM serial mpi
+      )
 
-    IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK)
+  ENDIF()
 
-      TRIBITS_ADD_TEST(
-        Stratimikos
-        NAME Stratimikos
-        ARGS "--xml=stratimikos_ParameterList2.xml --linAlgebra=Tpetra"
-        NUM_MPI_PROCS 4
-        COMM serial mpi
-        )
+  IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK)
 
-    ENDIF()
+    TRIBITS_ADD_TEST(
+      Stratimikos
+      NAME Stratimikos
+      ARGS "--xml=stratimikos_ParameterList2.xml --linAlgebra=Tpetra"
+      NUM_MPI_PROCS 4
+      COMM serial mpi
+      )
 
   ENDIF()
+
 ENDIF()
diff --git a/packages/muelu/research/tawiesn/aria/CMakeLists.txt b/packages/muelu/research/tawiesn/aria/CMakeLists.txt
index e25177a78e65..3fdff6e7ba36 100644
--- a/packages/muelu/research/tawiesn/aria/CMakeLists.txt
+++ b/packages/muelu/research/tawiesn/aria/CMakeLists.txt
@@ -1,7 +1,7 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
+
 
   IF ((${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) OR
       (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos))
@@ -17,5 +17,3 @@ IF (${PACKAGE_NAME}_ENABLE_Galeri)
     #   )
 
   ENDIF()
-
-ENDIF() # Galeri
diff --git a/packages/muelu/research/tawiesn/crada/CMakeLists.txt b/packages/muelu/research/tawiesn/crada/CMakeLists.txt
index e38cdc70ff1c..673ed34d321f 100644
--- a/packages/muelu/research/tawiesn/crada/CMakeLists.txt
+++ b/packages/muelu/research/tawiesn/crada/CMakeLists.txt
@@ -2,7 +2,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../test/unit_tests)
 
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
+
 
   IF ((${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) OR
       (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos))
@@ -18,5 +18,3 @@ IF (${PACKAGE_NAME}_ENABLE_Galeri)
     #   )
 
   ENDIF()
-
-ENDIF() # Galeri
diff --git a/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp b/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp
index 31c28386c8e7..da3fec8fdcad 100644
--- a/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp
+++ b/packages/muelu/src/Interface/MueLu_ParameterListInterpreter_def.hpp
@@ -2241,7 +2241,7 @@ namespace MueLu {
           groupList.remove("group");
 
           bool setKokkosRefactor = false;
-          bool kokkosRefactor;
+          bool kokkosRefactor = useKokkos_;
           if (groupList.isParameter("use kokkos refactor")) {
             kokkosRefactor = groupList.get<bool>("use kokkos refactor");
             groupList.remove("use kokkos refactor");
diff --git a/packages/muelu/test/blockedtransfer/CMakeLists.txt b/packages/muelu/test/blockedtransfer/CMakeLists.txt
index 5544909fb793..b1218a10155c 100644
--- a/packages/muelu/test/blockedtransfer/CMakeLists.txt
+++ b/packages/muelu/test/blockedtransfer/CMakeLists.txt
@@ -7,8 +7,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos)
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
-
 TRIBITS_ADD_EXECUTABLE(
     BlockedTransfer
     SOURCES BlockedTransfer.cpp
@@ -37,8 +35,6 @@ IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2)
 
 ENDIF()
 
-ENDIF() # Galeri
-
 # first ensure that these cmake boolean variables are defined
 #ASSERT_DEFINED(
 #  ${PACKAGE_NAME}_ENABLE_Epetra
diff --git a/packages/muelu/test/convergence/CMakeLists.txt b/packages/muelu/test/convergence/CMakeLists.txt
index 3e5d9d968e2f..2b68ac1af79a 100644
--- a/packages/muelu/test/convergence/CMakeLists.txt
+++ b/packages/muelu/test/convergence/CMakeLists.txt
@@ -20,21 +20,20 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests)
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
 
-  TRIBITS_ADD_EXECUTABLE(
-    Convergence
-    SOURCES Convergence.cpp ../unit_tests/MueLu_TestHelpers.cpp
-    COMM serial mpi
-    )
 
-ENDIF()
+TRIBITS_ADD_EXECUTABLE(
+  Convergence
+  SOURCES Convergence.cpp ../unit_tests/MueLu_TestHelpers.cpp
+  COMM serial mpi
+  )
+
 
 #
 # Tests
 #
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri AND ${PACKAGE_NAME}_ENABLE_Belos)
+IF (${PACKAGE_NAME}_ENABLE_Belos)
 
   IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND
       ${PACKAGE_NAME}_ENABLE_Ifpack AND ${PACKAGE_NAME}_ENABLE_Amesos)
diff --git a/packages/muelu/test/helmholtz/CMakeLists.txt b/packages/muelu/test/helmholtz/CMakeLists.txt
index dc907571a0d0..f904c472cef5 100644
--- a/packages/muelu/test/helmholtz/CMakeLists.txt
+++ b/packages/muelu/test/helmholtz/CMakeLists.txt
@@ -5,7 +5,7 @@ ASSERT_DEFINED(
   ${PACKAGE_NAME}_ENABLE_Belos
   ${PACKAGE_NAME}_ENABLE_Tpetra
   ${PACKAGE_NAME}_ENABLE_Epetra
-  ${PACKAGE_NAME}_ENABLE_Galeri
+
   ${PACKAGE_NAME}_ENABLE_Zoltan2
   )
 
@@ -18,7 +18,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests)
 
 # mfh 18 Aug 2015: All of the Helmholtz examples require complex arithmetic.
-IF (${PACKAGE_NAME}_ENABLE_Galeri AND ${PACKAGE_NAME}_ENABLE_Zoltan2 AND HAVE_MUELU_COMPLEX)
+IF (${PACKAGE_NAME}_ENABLE_Zoltan2 AND HAVE_MUELU_COMPLEX)
 
   TRIBITS_ADD_EXECUTABLE(
     Helmholtz1D
@@ -132,4 +132,3 @@ IF (${PACKAGE_NAME}_ENABLE_Galeri AND ${PACKAGE_NAME}_ENABLE_Zoltan2 AND HAVE_MU
     )
 
 ENDIF()
-
diff --git a/packages/muelu/test/interface/CMakeLists.txt b/packages/muelu/test/interface/CMakeLists.txt
index ed57937822ac..313d58ae262f 100644
--- a/packages/muelu/test/interface/CMakeLists.txt
+++ b/packages/muelu/test/interface/CMakeLists.txt
@@ -20,22 +20,21 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests)
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
 
-  TRIBITS_ADD_EXECUTABLE(
-    ParameterListInterpreter
-    SOURCES ParameterListInterpreter.cpp ../unit_tests/MueLu_TestHelpers.cpp
-    COMM serial mpi
-    )
 
-  TRIBITS_ADD_EXECUTABLE(
-     CreateOperator
-     SOURCES CreateOperator.cpp ../unit_tests/MueLu_TestHelpers.cpp
-     COMM serial mpi
-     )
+TRIBITS_ADD_EXECUTABLE(
+  ParameterListInterpreter
+  SOURCES ParameterListInterpreter.cpp ../unit_tests/MueLu_TestHelpers.cpp
+  COMM serial mpi
+  )
+
+TRIBITS_ADD_EXECUTABLE(
+  CreateOperator
+  SOURCES CreateOperator.cpp ../unit_tests/MueLu_TestHelpers.cpp
+  COMM serial mpi
+  )
 
 
-ENDIF()
 
 #
 # Tests
@@ -48,149 +47,148 @@ ELSE()
   SET(${PACKAGE_NAME}_PARAMETERLISTINTERPRETERTEST_SINGLETHREAD "")
 ENDIF()
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
-
-  # Test that demangling is enabled, otherwise the test would fail even is they are logically correct.
-  # NOTE:
-  # A the moment, the test environment for Trilinos on software is set incorrectly, and
-  # results in not setting the value correctly.
-  IF ( ( HAVE_GCC_ABI_DEMANGLE STREQUAL "1") OR ( HAVE_GCC_ABI_DEMANGLE STREQUAL "ON") )
-
-    IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND
-        ${PACKAGE_NAME}_ENABLE_Ifpack AND ${PACKAGE_NAME}_ENABLE_Amesos AND
-        HAVE_MUELU_INST_DOUBLE_INT_INT)
-
-      string(CONCAT TEST_ARGS "--linAlgebra=Epetra" "${${PACKAGE_NAME}_PARAMETERLISTINTERPRETERTEST_SINGLETHREAD}")
-
-      TRIBITS_ADD_TEST(
-        ParameterListInterpreter
-        NAME "ParameterListInterpreterEpetra"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 1
-        COMM mpi serial
-        )
-      TRIBITS_ADD_TEST(
-        ParameterListInterpreter
-        NAME "ParameterListInterpreterEpetra"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 4
-        COMM mpi
-        )
-
-      TRIBITS_ADD_TEST(
-        CreateOperator
-        NAME "CreateOperatorEpetra"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 1
-        COMM mpi serial
-        )
-      TRIBITS_ADD_TEST(
-        CreateOperator
-        NAME "CreateOperatorEpetra"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 4
-        COMM mpi
-        )
-
-      string(CONCAT TEST_ARGS "--linAlgebra=Epetra --heavytests" "${${PACKAGE_NAME}_PARAMETERLISTINTERPRETERTEST_SINGLETHREAD}")
-
-      # This test only runs on the dashboard, not at checkin.
-      TRIBITS_ADD_TEST(
-        ParameterListInterpreter
-        NAME "ParameterListInterpreterEpetraHeavy"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 1
-        COMM mpi serial
-        CATEGORIES CONTINUOUS
-        )
-
-      # This test only runs on the dashboard, not at checkin.
-      TRIBITS_ADD_TEST(
-        ParameterListInterpreter
-        NAME "ParameterListInterpreterEpetraHeavy"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 4
-        COMM mpi
-        CATEGORIES CONTINUOUS
-        )
-
-    ENDIF()
-
-    IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
-
-      string(CONCAT TEST_ARGS "--linAlgebra=Tpetra" "${${PACKAGE_NAME}_PARAMETERLISTINTERPRETERTEST_SINGLETHREAD}")
-
-      TRIBITS_ADD_TEST(
-        ParameterListInterpreter
-        NAME "ParameterListInterpreterTpetra"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 1
-        COMM mpi serial
-        )
-      TRIBITS_ADD_TEST(
-        ParameterListInterpreter
-        NAME "ParameterListInterpreterTpetra"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 4
-        COMM mpi
-        )
-
-      TRIBITS_ADD_TEST(
-        CreateOperator
-        NAME "CreateOperatorTpetra"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 1
-        COMM mpi serial
-        )
-      TRIBITS_ADD_TEST(
-        CreateOperator
-        NAME "CreateOperatorTpetra"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 4
-        COMM mpi
-        )
-
-      string(CONCAT TEST_ARGS "--linAlgebra=Tpetra --heavytests" "${${PACKAGE_NAME}_PARAMETERLISTINTERPRETERTEST_SINGLETHREAD}")
-
-      # This test only runs on the dashboard, not at checkin.
-      TRIBITS_ADD_TEST(
-        ParameterListInterpreter
-        NAME "ParameterListInterpreterTpetraHeavy"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 1
-        COMM mpi serial
-        CATEGORIES CONTINUOUS
-        )
-
-      # This test only runs on the dashboard, not at checkin.
-      TRIBITS_ADD_TEST(
-        ParameterListInterpreter
-        NAME "ParameterListInterpreterTpetraHeavy"
-        ARGS ${TEST_ARGS}
-        STANDARD_PASS_OUTPUT
-        NUM_MPI_PROCS 4
-        COMM mpi
-        CATEGORIES CONTINUOUS
-        )
-
-    ENDIF()
+
+
+# Test that demangling is enabled, otherwise the test would fail even is they are logically correct.
+# NOTE:
+# A the moment, the test environment for Trilinos on software is set incorrectly, and
+# results in not setting the value correctly.
+IF ( ( HAVE_GCC_ABI_DEMANGLE STREQUAL "1") OR ( HAVE_GCC_ABI_DEMANGLE STREQUAL "ON") )
+
+  IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND
+      ${PACKAGE_NAME}_ENABLE_Ifpack AND ${PACKAGE_NAME}_ENABLE_Amesos AND
+      HAVE_MUELU_INST_DOUBLE_INT_INT)
+
+    string(CONCAT TEST_ARGS "--linAlgebra=Epetra" "${${PACKAGE_NAME}_PARAMETERLISTINTERPRETERTEST_SINGLETHREAD}")
+
+    TRIBITS_ADD_TEST(
+      ParameterListInterpreter
+      NAME "ParameterListInterpreterEpetra"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 1
+      COMM mpi serial
+      )
+    TRIBITS_ADD_TEST(
+      ParameterListInterpreter
+      NAME "ParameterListInterpreterEpetra"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 4
+      COMM mpi
+      )
+
+    TRIBITS_ADD_TEST(
+      CreateOperator
+      NAME "CreateOperatorEpetra"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 1
+      COMM mpi serial
+      )
+    TRIBITS_ADD_TEST(
+      CreateOperator
+      NAME "CreateOperatorEpetra"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 4
+      COMM mpi
+      )
+
+    string(CONCAT TEST_ARGS "--linAlgebra=Epetra --heavytests" "${${PACKAGE_NAME}_PARAMETERLISTINTERPRETERTEST_SINGLETHREAD}")
+
+    # This test only runs on the dashboard, not at checkin.
+    TRIBITS_ADD_TEST(
+      ParameterListInterpreter
+      NAME "ParameterListInterpreterEpetraHeavy"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 1
+      COMM mpi serial
+      CATEGORIES CONTINUOUS
+      )
+
+    # This test only runs on the dashboard, not at checkin.
+    TRIBITS_ADD_TEST(
+      ParameterListInterpreter
+      NAME "ParameterListInterpreterEpetraHeavy"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 4
+      COMM mpi
+      CATEGORIES CONTINUOUS
+      )
+
+  ENDIF()
+
+  IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
+
+    string(CONCAT TEST_ARGS "--linAlgebra=Tpetra" "${${PACKAGE_NAME}_PARAMETERLISTINTERPRETERTEST_SINGLETHREAD}")
+
+    TRIBITS_ADD_TEST(
+      ParameterListInterpreter
+      NAME "ParameterListInterpreterTpetra"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 1
+      COMM mpi serial
+      )
+    TRIBITS_ADD_TEST(
+      ParameterListInterpreter
+      NAME "ParameterListInterpreterTpetra"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 4
+      COMM mpi
+      )
+
+    TRIBITS_ADD_TEST(
+      CreateOperator
+      NAME "CreateOperatorTpetra"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 1
+      COMM mpi serial
+      )
+    TRIBITS_ADD_TEST(
+      CreateOperator
+      NAME "CreateOperatorTpetra"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 4
+      COMM mpi
+      )
+
+    string(CONCAT TEST_ARGS "--linAlgebra=Tpetra --heavytests" "${${PACKAGE_NAME}_PARAMETERLISTINTERPRETERTEST_SINGLETHREAD}")
+
+    # This test only runs on the dashboard, not at checkin.
+    TRIBITS_ADD_TEST(
+      ParameterListInterpreter
+      NAME "ParameterListInterpreterTpetraHeavy"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 1
+      COMM mpi serial
+      CATEGORIES CONTINUOUS
+      )
+
+    # This test only runs on the dashboard, not at checkin.
+    TRIBITS_ADD_TEST(
+      ParameterListInterpreter
+      NAME "ParameterListInterpreterTpetraHeavy"
+      ARGS ${TEST_ARGS}
+      STANDARD_PASS_OUTPUT
+      NUM_MPI_PROCS 4
+      COMM mpi
+      CATEGORIES CONTINUOUS
+      )
 
   ENDIF()
 
 ENDIF()
 
 
+
 # Select appropriate set of input and gold files, add make target for rebase.
 file (REMOVE_RECURSE ${CMAKE_CURRENT_BINARY_DIR}/default)
 ADD_SUBDIRECTORY(default)
diff --git a/packages/muelu/test/interface/ParameterListInterpreter.cpp b/packages/muelu/test/interface/ParameterListInterpreter.cpp
index 4c9affb20e12..c0d759b5a173 100644
--- a/packages/muelu/test/interface/ParameterListInterpreter.cpp
+++ b/packages/muelu/test/interface/ParameterListInterpreter.cpp
@@ -158,14 +158,16 @@ int main_(Teuchos::CommandLineProcessor &clp, Xpetra::UnderlyingLib& lib, int ar
   std::vector<std::string> dirList;
   if (runHeavyTests) {
     dirList.push_back(prefix+"EasyParameterListInterpreter-heavy/");
-    if (!useKokkos)
+    if (!useKokkos) {
       // commented since extended xml interface does not support kokkos factories
       dirList.push_back(prefix+"FactoryParameterListInterpreter-heavy/");
+    }
   } else {
     dirList.push_back(prefix+"EasyParameterListInterpreter/");
-    if (!useKokkos)
+    if (!useKokkos) {
       // commented since extended xml interface does not support kokkos factories
       dirList.push_back(prefix+"FactoryParameterListInterpreter/");
+    }
   }
 #if defined(HAVE_MPI) && defined(HAVE_MUELU_ISORROPIA) && defined(HAVE_AMESOS2_KLU2)
   // The ML interpreter have internal ifdef, which means that the resulting
@@ -211,6 +213,7 @@ int main_(Teuchos::CommandLineProcessor &clp, Xpetra::UnderlyingLib& lib, int ar
         baseFile = outFile.substr(0, outFile.find_last_of('.'));
         found = baseFile.find("_np");
         jumpOut = true;
+        std::cout << "Test dir: " << dirList[k] << std::endl;
       }
 
       if (numProc == 1 && found != std::string::npos) {
@@ -260,25 +263,24 @@ int main_(Teuchos::CommandLineProcessor &clp, Xpetra::UnderlyingLib& lib, int ar
         // and the ML parameter list interpreter. Note that the ML paramter interpreter also
         // works with Tpetra matrices.
         if (dirList[k] == prefix+"EasyParameterListInterpreter/"         ||
-            dirList[k] == prefix+"EasyParameterListInterpreter-heavy/"   ||
-            dirList[k] == prefix+"FactoryParameterListInterpreter/"      ||
-            dirList[k] == prefix+"FactoryParameterListInterpreter-heavy/") {
+            dirList[k] == prefix+"EasyParameterListInterpreter-heavy/") {
           paramList.set("use kokkos refactor", useKokkos);
-          mueluFactory = Teuchos::rcp(new ParameterListInterpreter(paramList));
+          mueluFactory = Teuchos::rcp(new ParameterListInterpreter(paramList,comm));
+        } else if (dirList[k] == prefix+"FactoryParameterListInterpreter/"      ||
+                   dirList[k] == prefix+"FactoryParameterListInterpreter-heavy/") {
+          paramList.sublist("Hierarchy").set("use kokkos refactor", useKokkos);
+          mueluFactory = Teuchos::rcp(new ParameterListInterpreter(paramList,comm));
 
         } else if (dirList[k] == prefix+"MLParameterListInterpreter/") {
           paramList.set("use kokkos refactor", useKokkos);
           mueluFactory = Teuchos::rcp(new MLParameterListInterpreter(paramList));
 
         } else if (dirList[k] == prefix+"MLParameterListInterpreter2/") {
-          //std::cout << "ML ParameterList: " << std::endl;
-          //std::cout << paramList << std::endl;
           RCP<Teuchos::ParameterList> mueluParamList = Teuchos::getParametersFromXmlString(MueLu::ML2MueLuParameterTranslator::translate(paramList,"SA"));
-          //std::cout << "MueLu ParameterList: " << std::endl;
-          //std::cout << *mueluParamList << std::endl;
           mueluParamList->set("use kokkos refactor", useKokkos);
           mueluFactory = Teuchos::rcp(new ParameterListInterpreter(*mueluParamList));
-        }
+        } else
+          TEUCHOS_TEST_FOR_EXCEPTION(true, MueLu::Exceptions::RuntimeError, "Not a test directory");
 
         RCP<Hierarchy> H = mueluFactory->CreateHierarchy();
 
diff --git a/packages/muelu/test/interface/default/FactoryParameterListInterpreter/aggregatequalities.xml b/packages/muelu/test/interface/default/FactoryParameterListInterpreter/aggregatequalities.xml
index f0beec6a7030..b36abd859cdd 100644
--- a/packages/muelu/test/interface/default/FactoryParameterListInterpreter/aggregatequalities.xml
+++ b/packages/muelu/test/interface/default/FactoryParameterListInterpreter/aggregatequalities.xml
@@ -72,6 +72,3 @@
   </ParameterList>
 
 </ParameterList>
-
-
-
diff --git a/packages/muelu/test/interface/default/Output/MLaux_tpetra.gold b/packages/muelu/test/interface/default/Output/MLaux_tpetra.gold
index b6568c56d840..5f4f85fc59b0 100644
--- a/packages/muelu/test/interface/default/Output/MLaux_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLaux_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLcoarse1_tpetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse1_tpetra.gold
index 66fbc80ca391..0c179154712f 100644
--- a/packages/muelu/test/interface/default/Output/MLcoarse1_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLcoarse1_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -101,6 +103,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -196,6 +200,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLcoarse2_tpetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse2_tpetra.gold
index 656575daf185..d618ea3d75c7 100644
--- a/packages/muelu/test/interface/default/Output/MLcoarse2_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLcoarse2_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -101,6 +103,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -196,6 +200,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -291,6 +297,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -386,6 +394,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLcoarse3_tpetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse3_tpetra.gold
index bb168f72bc57..cc965330fc52 100644
--- a/packages/muelu/test/interface/default/Output/MLcoarse3_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLcoarse3_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -101,6 +103,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -196,6 +200,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -291,6 +297,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLcoarse4_tpetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse4_tpetra.gold
index 09fde192334e..2c4142be6e86 100644
--- a/packages/muelu/test/interface/default/Output/MLcoarse4_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLcoarse4_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -101,6 +103,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -196,6 +200,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -291,6 +297,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -387,6 +395,8 @@ smoother ->
  relaxation: sweeps = 25
  relaxation: damping factor = 0.6
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLcoarse5_tpetra.gold b/packages/muelu/test/interface/default/Output/MLcoarse5_tpetra.gold
index 024eb8e00fef..7fa51a986a5c 100644
--- a/packages/muelu/test/interface/default/Output/MLcoarse5_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLcoarse5_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -101,6 +103,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLpgamg1_tpetra.gold b/packages/muelu/test/interface/default/Output/MLpgamg1_tpetra.gold
index 69daf5a3bee4..e708a2431e29 100644
--- a/packages/muelu/test/interface/default/Output/MLpgamg1_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLpgamg1_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -103,6 +105,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -200,6 +204,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -297,6 +303,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLrepartitioning1_tpetra.gold b/packages/muelu/test/interface/default/Output/MLrepartitioning1_tpetra.gold
index 830c1f46cef4..b55a0b87d624 100644
--- a/packages/muelu/test/interface/default/Output/MLrepartitioning1_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLrepartitioning1_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -149,6 +151,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -289,6 +293,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -429,6 +435,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -569,6 +577,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLrepartitioning2_tpetra.gold b/packages/muelu/test/interface/default/Output/MLrepartitioning2_tpetra.gold
index 8e309e0cb76a..a5cf132d63fe 100644
--- a/packages/muelu/test/interface/default/Output/MLrepartitioning2_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLrepartitioning2_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -149,6 +151,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -289,6 +293,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -429,6 +435,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLrepartitioning3_tpetra.gold b/packages/muelu/test/interface/default/Output/MLrepartitioning3_tpetra.gold
index f667e74cfa06..cdb87ac07eb4 100644
--- a/packages/muelu/test/interface/default/Output/MLrepartitioning3_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLrepartitioning3_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -149,6 +151,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -289,6 +293,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -429,6 +435,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLsmoother1_tpetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother1_tpetra.gold
index bb168f72bc57..cc965330fc52 100644
--- a/packages/muelu/test/interface/default/Output/MLsmoother1_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLsmoother1_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -101,6 +103,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -196,6 +200,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -291,6 +297,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLsmoother2_tpetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother2_tpetra.gold
index 2bef7499cdff..c34bb486cc26 100644
--- a/packages/muelu/test/interface/default/Output/MLsmoother2_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLsmoother2_tpetra.gold
@@ -9,6 +9,8 @@ presmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -101,6 +103,8 @@ presmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -196,6 +200,8 @@ presmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -291,6 +297,8 @@ presmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLsmoother3_tpetra.gold b/packages/muelu/test/interface/default/Output/MLsmoother3_tpetra.gold
index c0bad92f5ed4..cdabb1468f29 100644
--- a/packages/muelu/test/interface/default/Output/MLsmoother3_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLsmoother3_tpetra.gold
@@ -9,6 +9,8 @@ postsmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -101,6 +103,8 @@ postsmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -196,6 +200,8 @@ postsmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -291,6 +297,8 @@ postsmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/MLunsmoothed1_tpetra.gold b/packages/muelu/test/interface/default/Output/MLunsmoothed1_tpetra.gold
index 61631d234dcb..48936c33c4da 100644
--- a/packages/muelu/test/interface/default/Output/MLunsmoothed1_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/MLunsmoothed1_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -94,6 +96,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -182,6 +186,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -270,6 +276,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/default/Output/aggregatequalities_tpetra.gold b/packages/muelu/test/interface/default/Output/aggregatequalities_tpetra.gold
index e554c077345f..e3b775affd48 100644
--- a/packages/muelu/test/interface/default/Output/aggregatequalities_tpetra.gold
+++ b/packages/muelu/test/interface/default/Output/aggregatequalities_tpetra.gold
@@ -8,6 +8,8 @@ smoother ->
  relaxation: type = Symmetric Gauss-Seidel
  relaxation: sweeps = 1
  relaxation: damping factor = 1
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -128,6 +130,8 @@ smoother ->
  relaxation: type = Symmetric Gauss-Seidel
  relaxation: sweeps = 1
  relaxation: damping factor = 1
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLaux_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLaux_tpetra.gold
index b5c77eb9064b..4f7a0e1674f2 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLaux_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLaux_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLcoarse1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLcoarse1_tpetra.gold
index 33ff68dc3725..46f54a2949a8 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLcoarse1_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLcoarse1_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -97,6 +99,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -188,6 +192,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLcoarse2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLcoarse2_tpetra.gold
index 2702712ad009..11df515a3c6c 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLcoarse2_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLcoarse2_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -97,6 +99,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -188,6 +192,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -279,6 +285,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -370,6 +378,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLcoarse3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLcoarse3_tpetra.gold
index 78ff4a682333..e6a111a8d783 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLcoarse3_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLcoarse3_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -97,6 +99,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -188,6 +192,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -279,6 +285,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLcoarse4_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLcoarse4_tpetra.gold
index 1ad11a5cb96d..cbfbeb6ccc47 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLcoarse4_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLcoarse4_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -97,6 +99,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -188,6 +192,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -279,6 +285,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -371,6 +379,8 @@ smoother ->
  relaxation: sweeps = 25
  relaxation: damping factor = 0.6
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLcoarse5_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLcoarse5_tpetra.gold
index 09af108e73f7..af0b89359f1d 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLcoarse5_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLcoarse5_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -97,6 +99,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLpgamg1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLpgamg1_tpetra.gold
index 7f627aec2c0b..796117883fed 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLpgamg1_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLpgamg1_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -99,6 +101,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -192,6 +196,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -285,6 +291,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning1_tpetra.gold
index 46f9d02a879a..ecf03f4ff219 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning1_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning1_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -145,6 +147,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -281,6 +285,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -417,6 +423,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -553,6 +561,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning2_tpetra.gold
index 7023c6c6d9a8..412a58e9089c 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning2_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning2_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -145,6 +147,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -281,6 +285,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -417,6 +423,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning3_tpetra.gold
index 12f6798000fa..fc9acfe73759 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLrepartitioning3_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLrepartitioning3_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -145,6 +147,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -281,6 +285,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -417,6 +423,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLsmoother1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLsmoother1_tpetra.gold
index 78ff4a682333..e6a111a8d783 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLsmoother1_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLsmoother1_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -97,6 +99,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -188,6 +192,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -279,6 +285,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLsmoother2_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLsmoother2_tpetra.gold
index 0c3f1ee3cc26..a72f44481fd8 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLsmoother2_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLsmoother2_tpetra.gold
@@ -9,6 +9,8 @@ presmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -97,6 +99,8 @@ presmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -188,6 +192,8 @@ presmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -279,6 +285,8 @@ presmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLsmoother3_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLsmoother3_tpetra.gold
index 05a1955cc051..53392af66033 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLsmoother3_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLsmoother3_tpetra.gold
@@ -9,6 +9,8 @@ postsmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -97,6 +99,8 @@ postsmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -188,6 +192,8 @@ postsmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -279,6 +285,8 @@ postsmoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/interface/kokkos/Output/MLunsmoothed1_tpetra.gold b/packages/muelu/test/interface/kokkos/Output/MLunsmoothed1_tpetra.gold
index c54b7daf04ee..c793b478e85a 100644
--- a/packages/muelu/test/interface/kokkos/Output/MLunsmoothed1_tpetra.gold
+++ b/packages/muelu/test/interface/kokkos/Output/MLunsmoothed1_tpetra.gold
@@ -9,6 +9,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -90,6 +92,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -174,6 +178,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
@@ -258,6 +264,8 @@ smoother ->
  relaxation: sweeps = 2
  relaxation: damping factor = 1
  A = Teuchos::RCP<MueLu::FactoryBase const>{ptr=0,node=0,strong_count=0,weak_count=0}
+ relaxation: inner sweeps = 1   [default]
+ relaxation: inner sparse-triangular solve = 0   [default]
  relaxation: zero starting solution = 1   [default]
  relaxation: backward mode = 0   [default]
  relaxation: use l1 = 0   [default]
diff --git a/packages/muelu/test/longlong/CMakeLists.txt b/packages/muelu/test/longlong/CMakeLists.txt
index a40186913f16..51be38a5b35d 100644
--- a/packages/muelu/test/longlong/CMakeLists.txt
+++ b/packages/muelu/test/longlong/CMakeLists.txt
@@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests)
 
 INCLUDE(XpetraAddTest)
 
-IF(${PACKAGE_NAME}_ENABLE_Galeri AND ${PACKAGE_NAME}_ENABLE_Tpetra AND
+IF(${PACKAGE_NAME}_ENABLE_Tpetra AND
    ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND
    ${PACKAGE_NAME}_ENABLE_Zoltan2 AND Zoltan2_ENABLE_Experimental AND
    TPL_ENABLE_MPI)
diff --git a/packages/muelu/test/perf_tests_kokkos/CMakeLists.txt b/packages/muelu/test/perf_tests_kokkos/CMakeLists.txt
index eb5559503af5..3372b15b9d4e 100644
--- a/packages/muelu/test/perf_tests_kokkos/CMakeLists.txt
+++ b/packages/muelu/test/perf_tests_kokkos/CMakeLists.txt
@@ -13,7 +13,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests)
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
+
   IF ((${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2) OR
       (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos))
 
@@ -25,7 +25,7 @@ IF (${PACKAGE_NAME}_ENABLE_Galeri)
 
   ENDIF()
 
-ENDIF() # Galeri
+
 
 IF (${PACKAGE_NAME}_ENABLE_Tpetra)
 
@@ -41,7 +41,7 @@ ENDIF()
 # Tests
 #
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
+
 
   IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
 
@@ -66,5 +66,3 @@ IF (${PACKAGE_NAME}_ENABLE_Galeri)
       )
 
   ENDIF()
-
-ENDIF() # Galeri
diff --git a/packages/muelu/test/profiling/CMakeLists.txt b/packages/muelu/test/profiling/CMakeLists.txt
index 4a7be8a7d9ff..ff51d98afc09 100644
--- a/packages/muelu/test/profiling/CMakeLists.txt
+++ b/packages/muelu/test/profiling/CMakeLists.txt
@@ -7,11 +7,10 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos)
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
-  TRIBITS_ADD_EXECUTABLE_AND_TEST(
-    Aggregation
-    SOURCES Aggregation.cpp
-    ARGS ""
-    COMM serial mpi
-    )
-ENDIF()
+
+TRIBITS_ADD_EXECUTABLE_AND_TEST(
+  Aggregation
+  SOURCES Aggregation.cpp
+  ARGS ""
+  COMM serial mpi
+  )
diff --git a/packages/muelu/test/scaling/CMakeLists.txt b/packages/muelu/test/scaling/CMakeLists.txt
index 3ad9e814a3e2..4f2ef560c85a 100644
--- a/packages/muelu/test/scaling/CMakeLists.txt
+++ b/packages/muelu/test/scaling/CMakeLists.txt
@@ -29,7 +29,7 @@ IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PAC
   SET(${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK YES)
 ENDIF()
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
+
 IF (${PACKAGE_NAME}_HAVE_TPETRA_SOLVER_STACK OR ${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK)
 
   TRIBITS_ADD_EXECUTABLE(
@@ -154,13 +154,13 @@ IF (${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK)
 
 ENDIF()
 
-ENDIF() # Galeri
+
 
 #
 # Tests
 #
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
+
 
 IF (${PACKAGE_NAME}_HAVE_EPETRA_SOLVER_STACK AND (NOT Xpetra_INT_LONG_LONG))
 
@@ -503,5 +503,3 @@ IF (${PACKAGE_NAME}_ENABLE_Tpetra)
     COMM serial mpi
     )
 ENDIF()
-
-ENDIF() # Galeri
diff --git a/packages/muelu/test/simple1D/CMakeLists.txt b/packages/muelu/test/simple1D/CMakeLists.txt
index 67b9d49aa488..760f1e94a4a9 100644
--- a/packages/muelu/test/simple1D/CMakeLists.txt
+++ b/packages/muelu/test/simple1D/CMakeLists.txt
@@ -17,7 +17,7 @@ ASSERT_DEFINED(
   ${PACKAGE_NAME}_ENABLE_Amesos2
   )
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri AND ${PACKAGE_NAME}_ENABLE_Epetra)
+IF (${PACKAGE_NAME}_ENABLE_Epetra)
 
   # TRIBITS_ADD_EXECUTABLE_AND_TEST(
   #     amesos2
@@ -43,7 +43,7 @@ IF (${PACKAGE_NAME}_ENABLE_Galeri AND ${PACKAGE_NAME}_ENABLE_Epetra)
     COMM serial mpi
     )
   ENDIF()
-  
+
   # TRIBITS_ADD_EXECUTABLE_AND_TEST(
   #   simple1D-Emin
   #   SOURCES Emin.cpp
@@ -55,7 +55,7 @@ IF (${PACKAGE_NAME}_ENABLE_Galeri AND ${PACKAGE_NAME}_ENABLE_Epetra)
     simple1D-UncoupledAggregation
     SOURCES simple1D-UncoupledAggregation.cpp
     )
-    
+
   IF( ${PACKAGE_NAME}_ENABLE_Tpetra )
     TRIBITS_ADD_TEST(
       simple1D-UncoupledAggregation
diff --git a/packages/muelu/test/structured/CMakeLists.txt b/packages/muelu/test/structured/CMakeLists.txt
index ba57c589c3a0..e441ed25f568 100644
--- a/packages/muelu/test/structured/CMakeLists.txt
+++ b/packages/muelu/test/structured/CMakeLists.txt
@@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests)
 
-IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Amesos2 AND ${PACKAGE_NAME}_ENABLE_Galeri)
+IF (${PACKAGE_NAME}_ENABLE_Belos AND ${PACKAGE_NAME}_ENABLE_Amesos2)
 
   TRIBITS_ADD_EXECUTABLE(
     Structured
diff --git a/packages/muelu/test/toggletransfer/CMakeLists.txt b/packages/muelu/test/toggletransfer/CMakeLists.txt
index a8e9d91a67b6..6de564e6fd7d 100644
--- a/packages/muelu/test/toggletransfer/CMakeLists.txt
+++ b/packages/muelu/test/toggletransfer/CMakeLists.txt
@@ -16,95 +16,94 @@ ASSERT_DEFINED(
   ${PACKAGE_NAME}_ENABLE_Amesos2
   )
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
 
-  TRIBITS_ADD_EXECUTABLE(
+
+TRIBITS_ADD_EXECUTABLE(
+  TogglePFactory_driver
+  SOURCES main.cpp
+  COMM serial mpi
+  )
+
+IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND
+    ${PACKAGE_NAME}_ENABLE_Ifpack AND ${PACKAGE_NAME}_ENABLE_Amesos)
+
+  TRIBITS_ADD_TEST(
+    TogglePFactory_driver
+    NAME "Driver_TogglePFactory_tent_tent_Epetra"
+    ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_tent_tent.xml --linAlgebra=Epetra"
+    NUM_MPI_PROCS 4
+    COMM serial mpi
+    )
+
+  TRIBITS_ADD_TEST(
+    TogglePFactory_driver
+    NAME "Driver_TogglePFactory_sa_tent_Epetra"
+    ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_sa_tent.xml --linAlgebra=Epetra"
+    NUM_MPI_PROCS 4
+    COMM serial mpi
+    )
+
+  TRIBITS_ADD_TEST(
+    TogglePFactory_driver
+    NAME "Driver_TogglePFactory_semi_tent_Epetra"
+    ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_semi_tent.xml --linAlgebra=Epetra"
+    NUM_MPI_PROCS 4
+    COMM serial mpi
+    )
+ENDIF()
+
+IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
+  TRIBITS_ADD_TEST(
+    TogglePFactory_driver
+    NAME "Driver_TogglePFactory_tent_tent_Tpetra"
+    ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_tent_tent.xml --linAlgebra=Tpetra"
+    NUM_MPI_PROCS 4
+    COMM serial mpi
+    )
+
+  TRIBITS_ADD_TEST(
+    TogglePFactory_driver
+    NAME "Driver_TogglePFactory_sa_tent_Tpetra"
+    ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_sa_tent.xml --linAlgebra=Tpetra"
+    NUM_MPI_PROCS 4
+    COMM serial mpi
+    )
+
+  TRIBITS_ADD_TEST(
+    TogglePFactory_driver
+    NAME "Driver_TogglePFactory_semi_tent_Tpetra"
+    ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_semi_tent.xml --linAlgebra=Tpetra"
+    NUM_MPI_PROCS 4
+    COMM serial mpi
+    )
+
+  TRIBITS_ADD_TEST(
+    TogglePFactory_driver
+    NAME "Driver_TogglePFactory_semi_tent_line_Tpetra"
+    ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_semi_tent_line.xml --linAlgebra=Tpetra"
+    NUM_MPI_PROCS 4
+    COMM serial mpi
+    )
+
+  TRIBITS_ADD_TEST(
+    TogglePFactory_driver
+    NAME "Driver_TogglePFactory_semi_sa_line_easy_Tpetra"
+    ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_semi_sa_easy.xml --linAlgebra=Tpetra"
+    NUM_MPI_PROCS 4
+    COMM serial mpi
+    )
+
+  TRIBITS_ADD_TEST(
     TogglePFactory_driver
-    SOURCES main.cpp
+    NAME "Driver_TogglePFactory_semi_sa_line_easy_Tpetra"
+    ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_semi_sa_easy.xml --linAlgebra=Tpetra"
+    NUM_MPI_PROCS 4
     COMM serial mpi
     )
 
-  IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND
-      ${PACKAGE_NAME}_ENABLE_Ifpack AND ${PACKAGE_NAME}_ENABLE_Amesos)
-
-    TRIBITS_ADD_TEST(
-      TogglePFactory_driver
-      NAME "Driver_TogglePFactory_tent_tent_Epetra"
-      ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_tent_tent.xml --linAlgebra=Epetra"
-      NUM_MPI_PROCS 4
-      COMM serial mpi
-      )
-
-    TRIBITS_ADD_TEST(
-      TogglePFactory_driver
-      NAME "Driver_TogglePFactory_sa_tent_Epetra"
-      ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_sa_tent.xml --linAlgebra=Epetra"
-      NUM_MPI_PROCS 4
-      COMM serial mpi
-      )
-
-    TRIBITS_ADD_TEST(
-      TogglePFactory_driver
-      NAME "Driver_TogglePFactory_semi_tent_Epetra"
-      ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_semi_tent.xml --linAlgebra=Epetra"
-      NUM_MPI_PROCS 4
-      COMM serial mpi
-      )
-  ENDIF()
-
-  IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
-    TRIBITS_ADD_TEST(
-      TogglePFactory_driver
-      NAME "Driver_TogglePFactory_tent_tent_Tpetra"
-      ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_tent_tent.xml --linAlgebra=Tpetra"
-      NUM_MPI_PROCS 4
-      COMM serial mpi
-      )
-
-    TRIBITS_ADD_TEST(
-      TogglePFactory_driver
-      NAME "Driver_TogglePFactory_sa_tent_Tpetra"
-      ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_sa_tent.xml --linAlgebra=Tpetra"
-      NUM_MPI_PROCS 4
-      COMM serial mpi
-      )
-
-    TRIBITS_ADD_TEST(
-      TogglePFactory_driver
-      NAME "Driver_TogglePFactory_semi_tent_Tpetra"
-      ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_semi_tent.xml --linAlgebra=Tpetra"
-      NUM_MPI_PROCS 4
-      COMM serial mpi
-      )
-
-    TRIBITS_ADD_TEST(
-      TogglePFactory_driver
-      NAME "Driver_TogglePFactory_semi_tent_line_Tpetra"
-      ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_semi_tent_line.xml --linAlgebra=Tpetra"
-      NUM_MPI_PROCS 4
-      COMM serial mpi
-      )
-
-    TRIBITS_ADD_TEST(
-      TogglePFactory_driver
-      NAME "Driver_TogglePFactory_semi_sa_line_easy_Tpetra"
-      ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_semi_sa_easy.xml --linAlgebra=Tpetra"
-      NUM_MPI_PROCS 4
-      COMM serial mpi
-      )
-
-    TRIBITS_ADD_TEST(
-      TogglePFactory_driver
-      NAME "Driver_TogglePFactory_semi_sa_line_easy_Tpetra"
-      ARGS "--matrixType=Laplace3D --nx=40 --ny=40 --nz=60 --mz=1 --xmlFile=parameters_semi_sa_easy.xml --linAlgebra=Tpetra"
-      NUM_MPI_PROCS 4
-      COMM serial mpi
-      )
-
-
-  ENDIF()
-
-  TRIBITS_COPY_FILES_TO_BINARY_DIR(ToggleDriver_cp
-    SOURCE_FILES parameters_sa_tent.xml parameters_semi_tent.xml parameters_semi_tent_line.xml parameters_tent_tent.xml parameters_semi_sa_easy.xml
-   )
+
 ENDIF()
+
+TRIBITS_COPY_FILES_TO_BINARY_DIR(ToggleDriver_cp
+  SOURCE_FILES parameters_sa_tent.xml parameters_semi_tent.xml parameters_semi_tent_line.xml parameters_tent_tent.xml parameters_semi_sa_easy.xml
+  )
diff --git a/packages/muelu/test/unit_tests/CMakeLists.txt b/packages/muelu/test/unit_tests/CMakeLists.txt
index 112ae0f8be99..178b56169be1 100644
--- a/packages/muelu/test/unit_tests/CMakeLists.txt
+++ b/packages/muelu/test/unit_tests/CMakeLists.txt
@@ -214,7 +214,7 @@ IF (${PACKAGE_NAME}_ENABLE_Experimental AND ${PACKAGE_NAME}_ENABLE_Tpetra AND ${
   APPEND_SET(SOURCES_REGION RegionMatrix.cpp RegionVector.cpp)
 ENDIF()
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri) #TMP
+
   APPEND_SET(SOURCES Galeri.cpp)
   APPEND_SET(SOURCES_INTREPID2 Galeri.cpp)
   APPEND_SET(SOURCES_BLOCKED Galeri.cpp)
@@ -411,7 +411,7 @@ IF (${PACKAGE_NAME}_ENABLE_Galeri) #TMP
 
   ENDIF() # Tpetra
 
-ENDIF() # Galeri TMP
+
 
 ADD_SUBDIRECTORY(ParameterList/FactoryFactory/)
 IF (${PACKAGE_NAME}_ENABLE_Epetra)
diff --git a/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt b/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt
index d1393a6563c4..c41b2df69059 100644
--- a/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt
+++ b/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt
@@ -40,7 +40,7 @@ ASSERT_DEFINED(
   ${PACKAGE_NAME}_ENABLE_Zoltan
   )
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri) #TMP
+
   TRIBITS_ADD_EXECUTABLE(
     UnitTests_kokkos
     SOURCES ${SOURCES}
@@ -68,5 +68,3 @@ IF (${PACKAGE_NAME}_ENABLE_Galeri) #TMP
       )
 
   ENDIF()
-
-ENDIF() # Galeri TMP
diff --git a/packages/muelu/test/viz/CMakeLists.txt b/packages/muelu/test/viz/CMakeLists.txt
index 728309a1c473..8b1cbcd36486 100644
--- a/packages/muelu/test/viz/CMakeLists.txt
+++ b/packages/muelu/test/viz/CMakeLists.txt
@@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests)
 # Tests
 #
 
-IF (${PACKAGE_NAME}_ENABLE_Galeri)
+
 
 IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKAGE_NAME}_ENABLE_Amesos2)
 
@@ -51,7 +51,7 @@ IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKA
       NUM_MPI_PROCS 4
       COMM serial mpi
       )
-      
+
     # Test Epetra variant, too.
     IF (${PACKAGE_NAME}_ENABLE_Epetra AND ${PACKAGE_NAME}_ENABLE_EpetraExt AND ${PACKAGE_NAME}_ENABLE_Ifpack  AND ${PACKAGE_NAME}_ENABLE_Amesos AND (NOT Xpetra_INT_LONG_LONG))
 
@@ -62,7 +62,7 @@ IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKA
         NUM_MPI_PROCS 4
         COMM serial mpi
         )
-  
+
       TRIBITS_ADD_TEST(
         Viz
         NAME "Viz2DEpetra"
@@ -72,7 +72,7 @@ IF (${PACKAGE_NAME}_ENABLE_Tpetra AND ${PACKAGE_NAME}_ENABLE_Ifpack2 AND ${PACKA
         )
 
     ENDIF() #endif Epetra
-      
+
   ENDIF()
 
 ENDIF()
@@ -82,6 +82,3 @@ ENDIF()
 TRIBITS_COPY_FILES_TO_BINARY_DIR(Viz_cp
     SOURCE_FILES viztest.xml
     )
-
-
-ENDIF() # Galeri