diff --git a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
index 8a927992fe..b981b69820 100755
--- a/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
+++ b/tutorials/combustion/PDRFoam/flamePropagationWithObstacles/system/fvSolution
@@ -22,6 +22,13 @@ solvers
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-05;
+        relTol          0.1;
+    };
+
+    rhoFinal
+    {
+        $rho;
+        tolerance       1e-05;
         relTol          0;
     };
 
@@ -30,10 +37,25 @@ solvers
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-6;
+        relTol          0.1;
+    };
+
+    pFinal
+    {
+        $p;
+        tolerance       1e-6;
         relTol          0;
     };
 
-    "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)"
+    "(b|Xi|ft|h|hu|k|epsilon)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    "(b|Xi|ft|h|hu|k|epsilon)Final"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -42,7 +64,7 @@ solvers
     }
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
diff --git a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
index a99a6a1eb9..e4df9498a8 100644
--- a/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
+++ b/tutorials/combustion/dieselFoam/aachenBomb/system/fvSolution
@@ -32,15 +32,7 @@ solvers
         relTol          0;
     }
 
-    "(Yi|k|epsilon)"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-   "(U|hs)"
+    "(k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -48,12 +40,32 @@ solvers
         relTol          0.1;
     }
 
-   "(U|hs)Final"
+    "(k|epsilon)Final"
+    {
+        $k;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    "(U|hs)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0.1;
+    }
+
+    "(U|hs)Final"
     {
         $U;
         tolerance       1e-06;
         relTol          0;
     }
+
+    Yi
+    {
+        $hsFinal;
+    }
 }
 
 PIMPLE
diff --git a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
index 7f7303e2fc..bf662ae7b7 100644
--- a/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
+++ b/tutorials/combustion/engineFoam/kivaTest/system/fvSolution
@@ -22,26 +22,47 @@ solvers
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-06;
+        relTol          0.1;
+    }
+
+    pFinal
+    {
+        $p;
+        tolerance       1e-06;
         relTol          0;
     }
 
     rho
     {
-        $p;
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    rhoFinal
+    {
+        $rho;
         tolerance       1e-05;
         relTol          0;
     }
 
-    "(U|ft|fu|b|Xi|Su|h|hu|R|k|epsilon)"
+    "(U|ft|h|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-05;
+        relTol          0.1;
+    }
+    "(U|ft|h|k|epsilon)Final"
+    {
+        $U;
+        tolerance       1e-05;
         relTol          0;
     }
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     2;
     nNonOrthogonalCorrectors 1;
diff --git a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
index 54fb2634d0..f2c453ff5c 100755
--- a/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
+++ b/tutorials/combustion/reactingFoam/ras/counterFlowFlame2D/system/fvSolution
@@ -47,7 +47,15 @@ solvers
         relTol           0.0;
     }
 
-    "(U|hs)"
+    "(U|hs||k|epsilon)"
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-06;
+        relTol          0.1;
+    }
+
+    "(U|hs||k|epsilon)Final"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -55,20 +63,9 @@ solvers
         relTol          0;
     }
 
-    "(U|hs)Final"
+    Yi
     {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    "(Yi|k|epsilon)"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
+        $hsFinal;
     }
 }
 
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
index 32e542337a..8eacc7bc9c 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSolution
@@ -17,11 +17,18 @@ FoamFile
 
 solvers
 {
-    "(rho|G)"
+    rho
     {
         solver          PCG;
         preconditioner  DIC;
         tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    rhoFinal
+    {
+        $rho;
+        tolerance       1e-05;
         relTol          0;
     }
 
@@ -29,7 +36,14 @@ solvers
     {
         solver          PBiCG;
         preconditioner  DILU;
-        tolerance       1e-05;
+        tolerance       1e-06;
+        relTol          0.1;
+    }
+
+    "(U|hs|k|epsilon)Final"
+    {
+        $U;
+        tolerance       1e-06;
         relTol          0;
     }
 
@@ -56,14 +70,11 @@ solvers
 
     "(Yi|O2|N2|H2O)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
+        $hsFinal;
     }
 }
 
-PISO
+PIMPLE
 {
     transonic       no;
     nOuterCorrectors 1;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution
index af936fdba1..b913d158bf 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution
@@ -17,55 +17,64 @@ FoamFile
 
 solvers
 {
-    p
-    {
-        solver           GAMG;
-
-        tolerance        0;
-        relTol           0.01;
-
-        smoother         DICGaussSeidel;
-        nPreSweeps       0;
-        nPostSweeps      2;
-
-        cacheAgglomeration true;
-
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
-
-        maxIter          20;
-    };
-    pFinal
-    {
-        $p
-        tolerance        1e-6;
-        relTol           0;
-    };
-    "(rho|G)"
+    rho
     {
         solver          PCG;
         preconditioner  DIC;
-        tolerance       1e-06;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    rhoFinal
+    {
+        $rho;
+        tolerance       1e-05;
         relTol          0;
-    };
-    "(Yi|hs)"
+    }
+
+    "(U|hs|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0;
-    };
-    "(U|k|omega)"
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    "(U|hs|k|epsilon)Final"
     {
-        solver          smoothSolver;
+        $U;
+        tolerance       1e-05;
+        relTol          0;
+    }
+
+    p
+    {
+        solver          GAMG;
+        tolerance       0;
+        relTol          0.1;
         smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    pFinal
+    {
+        $p;
         tolerance       1e-06;
         relTol          0;
-    };
+    }
+
+    "(Yi|O2|N2|H2O)"
+    {
+        $hsFinal;
+    }
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
index a235f4ecbe..c008af3c1e 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSolution
@@ -17,57 +17,64 @@ FoamFile
 
 solvers
 {
-    p
-    {
-        solver           GAMG;
-        tolerance        0;
-        relTol           0.01;
-
-        smoother         DICGaussSeidel;
-        nPreSweeps       0;
-        nPostSweeps      2;
-
-        cacheAgglomeration true;
-
-        nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
-
-        maxIter          50;
-    };
-    pFinal
-    {
-        $p
-        tolerance        1e-6;
-        relTol           0;
-    };
-    "(rho|G)"
+    rho
     {
         solver          PCG;
         preconditioner  DIC;
-        maxIter         200;
-        tolerance       1e-06;
+        tolerance       1e-05;
+        relTol          0.1;
+    }
+
+    rhoFinal
+    {
+        $rho;
+        tolerance       1e-05;
         relTol          0;
-    };
-    "(Yi|hs)"
+    }
+
+    "(U|hs|k|omega)"
     {
         solver          PBiCG;
         preconditioner  DILU;
-        maxIter         200;
         tolerance       1e-06;
-        relTol          0;
-    };
-    "(U|k|omega)"
+        relTol          0.1;
+    }
+
+    "(U|hs|k|omega)Final"
     {
-        solver          smoothSolver;
-        smoother        GaussSeidel;
-        maxIter         200;
+        $U;
         tolerance       1e-06;
         relTol          0;
-    };
+    }
+
+    p
+    {
+        solver          GAMG;
+        tolerance       0;
+        relTol          0.1;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        cacheAgglomeration true;
+        nCellsInCoarsestLevel 10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    pFinal
+    {
+        $p;
+        tolerance       1e-06;
+        relTol          0;
+    }
+
+    "(Yi|O2|N2|H2O)"
+    {
+        $hsFinal;
+    }
 }
 
-PISO
+PIMPLE
 {
     nCorrectors     3;
     nNonOrthogonalCorrectors 0;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
index 72274eb02e..9f903209b0 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
@@ -32,7 +32,7 @@ solvers
         relTol          0;
     }
 
-    "(U|hs)"
+    "(U|hs|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -40,18 +40,13 @@ solvers
         relTol          0.1;
     }
 
-    "(U|hs)Final"
+    "(U|hs|k|epsilon)Final"
     {
         $U;
         relTol          0;
         tolerance       1e-05;
     }
 
-    "(k|epsilon)"
-    {
-        $UFinal;
-    }
-
     p_rgh
     {
         solver          GAMG;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
index 78eb84c984..e2298856f0 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution
@@ -55,15 +55,7 @@ solvers
         relTol          0;
     }
 
-    "(k|omega)"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    U
+    "(U|k|omega)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -71,7 +63,7 @@ solvers
         relTol          0.1;
     }
 
-    UFinal
+    "(U|k|omega)Final"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
index ec33c03abb..f326f43350 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution
@@ -53,7 +53,7 @@ solvers
         relTol          0;
     }
 
-    U
+    "(U|k|omega)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -61,20 +61,12 @@ solvers
         relTol          0.1;
     }
 
-    UFinal
+    "(U|k|omega)Final"
     {
         $U;
         tolerance       1e-08;
         relTol          0;
     }
-
-    "(k|omega)"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
 }
 
 PIMPLE
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
index 78eb84c984..e2298856f0 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution
@@ -55,15 +55,7 @@ solvers
         relTol          0;
     }
 
-    "(k|omega)"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-08;
-        relTol          0;
-    }
-
-    U
+    "(U|k|omega)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -71,7 +63,7 @@ solvers
         relTol          0.1;
     }
 
-    UFinal
+    "(U|k|omega)Final"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
index 36882c9e4f..359560da4e 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution
@@ -91,7 +91,16 @@ solvers
         maxIter         20;
     }
 
-    U
+    "(U|k|epsilon)"
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-6;
+        relTol          0.1;
+        nSweeps         1;
+    }
+
+    "(U|k|epsilon)Final"
     {
         solver          smoothSolver;
         smoother        GaussSeidel;
@@ -99,14 +108,6 @@ solvers
         relTol          0;
         nSweeps         1;
     }
-
-    "(k|epsilon|omega|R|nuTilda)"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-8;
-        relTol          0;
-    }
 }
 
 PIMPLE
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
index f088132683..0271dcc369 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution
@@ -77,16 +77,16 @@ solvers
         maxIter         20;
     }
 
-    U
+    "(U|k)"
     {
         solver          smoothSolver;
         smoother        GaussSeidel;
         tolerance       1e-06;
-        relTol          0;
+        relTol          0.1;
         nSweeps         1;
     }
 
-    "(k|B|nuTilda)"
+    "(U|k)Final"
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
index daffd13542..3b4404dafd 100644
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
@@ -41,7 +41,7 @@ solvers
         relTol          0;
     }
 
-    U
+    "(U|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
@@ -49,7 +49,7 @@ solvers
         relTol          0;
     }
 
-    "(k|epsilon|R|nuTilda)"
+    "(U|k|epsilon)Final"
     {
         solver          PBiCG;
         preconditioner  DILU;