diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air1
index 9fc0bf9aae..f650822453 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air1
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air2
index 3f1a11948d..640a8280ab 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air2
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air3
index f9395a7dda..05808a1637 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.air3
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.water b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.water
index c678eb451c..b4ea29a60f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/T.water
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air1
index 3fc39e1bdc..84f0747ec1 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air1
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air2
index 8ac15fa83d..d1715da9b4 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air2
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air3
index 99241ce7b8..ec585e1d04 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.air3
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.water b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.water
index 85a2905d1c..326e870bd2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/U.water
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air1
index 9253947911..6005f7a187 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air1
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air2
index 4cef1edfe4..079497e274 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air2
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air3
index 3561b91e29..ee3adba9a5 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.air3
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.05;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.water b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.water
index a2927b04ae..cd3aafd822 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/alpha.water
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.95;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1
index 394faa960a..c3f52c76e2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air1
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2
index 3e7e3883b3..27b0f27a7b 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air2
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3
index a7ee501541..14454f3da9 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/f.air3
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p
index 75814dc0cb..9a9f4b636f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p_rgh b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p_rgh
index fb9f37adc5..8744509a62 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p_rgh
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/0/p_rgh
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allclean b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allclean
index a237612342..126f1dccce 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allclean
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allclean
@@ -1,7 +1,11 @@
 #!/bin/sh
 
-cd ${0%/*} || exit 1
+# Run from this directory
+cd "${0%/*}" || exit 1
 
+# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f numberDensity.eps
+
+#------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allrun b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allrun
index 10a9274540..e3a4c6207e 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allrun
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/Allrun
@@ -1,14 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
 
-# Source tutorial run functions
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
 
 ( cd validation && ./createGraphs )
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/g b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/g
index 24a8dfba51..716851f8f2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/g
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/g
@@ -18,5 +18,4 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 0);
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1
index 50b70cf8dc..c16ea15668 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air1
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2
index e74d22dc5d..b23344d0e8 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air2
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3
index 3d725c0680..26bd163c0e 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.air3
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water
index 38a3615fad..397951e07c 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/constant/thermophysicalProperties.water
@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
@@ -39,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          4195;
+        Cp          4195;
         Hf          0;
     }
     transport
@@ -49,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/blockMeshDict b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/blockMeshDict
index 4e1960a31c..cc61afbb73 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/blockMeshDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/blockMeshDict
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes
index 656615a05a..c015424a5a 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSchemes
@@ -29,7 +29,7 @@ divSchemes
 {
     default                         none;
 
-    "div\(phi,alpha.*)"             Gauss vanLeer;
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSolution b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSolution
index 5c251621b0..904ef978ce 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSolution
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/system/fvSolution
@@ -63,12 +63,6 @@ PIMPLE
 }
 
 relaxationFactors
-{
-    equations
-    {
-        "f.*"              1.0;
-    }
-}
-
+{}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs
index 726eefb621..6f24463e18 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/binaryBreakup/validation/createGraphs
@@ -29,11 +29,11 @@ gnuplot<<EOF
 
     numberDensity = '../postProcessing/numberDensity/10/numberDensity.dat'
 
-    plot '<printf "1 0.05\n1 0\n"' w l t 'Init. Cond.',\
-    n(x,10.0) ls 2 lc rgb 'black' t '[Ziff and McGrady, J. Phys. A: Math. Gen., 18: 3027-3037, 1985]',\
-    numberDensity every ::0::19 u 1:4 w p pt 1 t 'air1',\
-    numberDensity every ::20::24 u 1:4 w p pt 5 t 'air2',\
-    numberDensity every ::25::28 u 1:4 w p pt 9 t 'air3'
+    plot '<printf "1 0.05\n1 0\n"' w l lc rgb 'black' t 'Init. Cond.',\
+    n(x,10.0) dt 2 lc rgb 'black' t 'Ziff and McGrady (1985)',\
+    numberDensity every ::0::19 u 1:4 w p pt 1 lc rgb 'black' t 'air1',\
+    numberDensity every ::20::24 u 1:4 w p pt 5 lc rgb 'black' t 'air2',\
+    numberDensity every ::25::28 u 1:4 w p pt 9 lc rgb 'black' t 'air3'
 EOF
 
 #------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air1
index 9fc0bf9aae..f650822453 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air1
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air2
index 3f1a11948d..640a8280ab 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air2
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air3
index f9395a7dda..05808a1637 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.air3
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.water b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.water
index c678eb451c..b4ea29a60f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/T.water
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air1
index 3fc39e1bdc..84f0747ec1 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air1
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air2
index 8ac15fa83d..d1715da9b4 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air2
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air3
index 99241ce7b8..ec585e1d04 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.air3
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.water b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.water
index 85a2905d1c..326e870bd2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/U.water
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air1
index 9253947911..6005f7a187 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air1
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air2
index 4cef1edfe4..079497e274 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air2
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air3
index 3561b91e29..ee3adba9a5 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.air3
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.05;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.water b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.water
index a2927b04ae..cd3aafd822 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/alpha.water
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0.95;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air1
index 394faa960a..c3f52c76e2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air1
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air2
index 3e7e3883b3..27b0f27a7b 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air2
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air3
index a7ee501541..14454f3da9 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/f.air3
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/p b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/p
index 75814dc0cb..9a9f4b636f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/p
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/p
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/p_rgh b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/p_rgh
index fb9f37adc5..8744509a62 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/p_rgh
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/0/p_rgh
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/Allclean b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/Allclean
index a237612342..126f1dccce 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/Allclean
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/Allclean
@@ -1,7 +1,11 @@
 #!/bin/sh
 
-cd ${0%/*} || exit 1
+# Run from this directory
+cd "${0%/*}" || exit 1
 
+# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f numberDensity.eps
+
+#------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/Allrun b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/Allrun
index 10a9274540..e3a4c6207e 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/Allrun
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/Allrun
@@ -1,14 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
 
-# Source tutorial run functions
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
 
 ( cd validation && ./createGraphs )
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/g b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/g
index 24a8dfba51..716851f8f2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/g
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/g
@@ -18,5 +18,4 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 0);
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air1
index 50b70cf8dc..c16ea15668 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air1
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air2
index e74d22dc5d..b23344d0e8 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air2
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air3
index 3d725c0680..26bd163c0e 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.air3
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.water
index 38a3615fad..397951e07c 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/constant/thermophysicalProperties.water
@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
@@ -39,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          4195;
+        Cp          4195;
         Hf          0;
     }
     transport
@@ -49,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/blockMeshDict b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/blockMeshDict
index 4e1960a31c..cc61afbb73 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/blockMeshDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/blockMeshDict
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSchemes
index 656615a05a..c015424a5a 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSchemes
@@ -29,7 +29,7 @@ divSchemes
 {
     default                         none;
 
-    "div\(phi,alpha.*)"             Gauss vanLeer;
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSolution b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSolution
index 5c251621b0..904ef978ce 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSolution
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/system/fvSolution
@@ -63,12 +63,6 @@ PIMPLE
 }
 
 relaxationFactors
-{
-    equations
-    {
-        "f.*"              1.0;
-    }
-}
-
+{}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/validation/createGraphs
index 726eefb621..6f24463e18 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/breakup/validation/createGraphs
@@ -29,11 +29,11 @@ gnuplot<<EOF
 
     numberDensity = '../postProcessing/numberDensity/10/numberDensity.dat'
 
-    plot '<printf "1 0.05\n1 0\n"' w l t 'Init. Cond.',\
-    n(x,10.0) ls 2 lc rgb 'black' t '[Ziff and McGrady, J. Phys. A: Math. Gen., 18: 3027-3037, 1985]',\
-    numberDensity every ::0::19 u 1:4 w p pt 1 t 'air1',\
-    numberDensity every ::20::24 u 1:4 w p pt 5 t 'air2',\
-    numberDensity every ::25::28 u 1:4 w p pt 9 t 'air3'
+    plot '<printf "1 0.05\n1 0\n"' w l lc rgb 'black' t 'Init. Cond.',\
+    n(x,10.0) dt 2 lc rgb 'black' t 'Ziff and McGrady (1985)',\
+    numberDensity every ::0::19 u 1:4 w p pt 1 lc rgb 'black' t 'air1',\
+    numberDensity every ::20::24 u 1:4 w p pt 5 lc rgb 'black' t 'air2',\
+    numberDensity every ::25::28 u 1:4 w p pt 9 lc rgb 'black' t 'air3'
 EOF
 
 #------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air1
index 9fc0bf9aae..f650822453 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air1
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air2
index 3f1a11948d..640a8280ab 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air2
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air3
index f9395a7dda..05808a1637 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.air3
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.water b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.water
index c678eb451c..b4ea29a60f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/T.water
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air1
index 3fc39e1bdc..84f0747ec1 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air1
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air2
index 8ac15fa83d..d1715da9b4 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air2
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air3
index 99241ce7b8..ec585e1d04 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.air3
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.water b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.water
index 85a2905d1c..326e870bd2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/U.water
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air1
index d56b0372d3..4a1ccbb908 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air1
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 5.408481e-02;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air2
index 4cef1edfe4..079497e274 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air2
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air3
index d72f523ec8..6aaf9012d1 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.air3
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.water b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.water
index 50fe9c64fb..c3e5fc167d 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/alpha.water
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 9.459152e-01;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air1
index 394faa960a..c3f52c76e2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air1
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air2
index 3e7e3883b3..27b0f27a7b 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air2
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air3
index a7ee501541..14454f3da9 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/f.air3
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/p b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/p
index 75814dc0cb..9a9f4b636f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/p
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/p
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/p_rgh b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/p_rgh
index fb9f37adc5..8744509a62 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/p_rgh
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/0/p_rgh
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/Allclean b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/Allclean
index a237612342..126f1dccce 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/Allclean
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/Allclean
@@ -1,7 +1,11 @@
 #!/bin/sh
 
-cd ${0%/*} || exit 1
+# Run from this directory
+cd "${0%/*}" || exit 1
 
+# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f numberDensity.eps
+
+#------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/Allrun b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/Allrun
index 10a9274540..e3a4c6207e 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/Allrun
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/Allrun
@@ -1,14 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
 
-# Source tutorial run functions
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
 
 ( cd validation && ./createGraphs )
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/g b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/g
index 24a8dfba51..716851f8f2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/g
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/g
@@ -18,5 +18,4 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 0);
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air1
index 50b70cf8dc..c16ea15668 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air1
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air2
index e74d22dc5d..b23344d0e8 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air2
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air3
index 3d725c0680..26bd163c0e 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.air3
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.water
index 38a3615fad..397951e07c 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/constant/thermophysicalProperties.water
@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
@@ -39,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          4195;
+        Cp          4195;
         Hf          0;
     }
     transport
@@ -49,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/blockMeshDict b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/blockMeshDict
index 4e1960a31c..cc61afbb73 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/blockMeshDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/blockMeshDict
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSchemes
index 656615a05a..c015424a5a 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSchemes
@@ -29,7 +29,7 @@ divSchemes
 {
     default                         none;
 
-    "div\(phi,alpha.*)"             Gauss vanLeer;
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSolution b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSolution
index b8e0303c51..851ce0ade1 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSolution
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/system/fvSolution
@@ -63,12 +63,6 @@ PIMPLE
 }
 
 relaxationFactors
-{
-    equations
-    {
-        "f.*"              1.0;
-    }
-}
-
+{}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/validation/createGraphs
index 9eb0c9e7c6..3c0b0b2b1f 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/coalescence/validation/createGraphs
@@ -50,10 +50,10 @@ gnuplot<<EOF
     numberDensity = '../postProcessing/numberDensity/10/numberDensity.dat'
 
     plot n0(x) ls -1 t 'Initial Condition',\
-    n(x,10.0) ls 2 lc rgb 'black' t '[Scott, J. Atmos. Sci., 25: 54-65, 1968]',\
-    numberDensity every ::0::46 u 1:4 w p pt 1 t 'air1',\
-    numberDensity every ::47::55 u 1:4 w p pt 5 t 'air2',\
-    numberDensity every ::56::70 u 1:4 w p pt 9 t 'air3'
+    n(x,10.0) dt 2 lc rgb 'black' t 'Scott (1968)',\
+    numberDensity every ::0::46 u 1:4 w p pt 1 lc rgb 'black' t 'air1',\
+    numberDensity every ::47::55 u 1:4 w p pt 5 lc rgb 'black' t 'air2',\
+    numberDensity every ::56::70 u 1:4 w p pt 9 lc rgb 'black' t 'air3'
 EOF
 
 #------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/T.air b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/T.air
index 14af98a1d3..7964fc2a4b 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/T.air
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/T.air
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/T.water b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/T.water
index c678eb451c..b4ea29a60f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/T.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/T.water
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/U.air b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/U.air
index 0356c6f14b..3e935c1845 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/U.air
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/U.air
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/U.water b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/U.water
index 85a2905d1c..326e870bd2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/U.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/U.water
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/alpha.air b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/alpha.air
index a0a1f9128a..30be0e2ca5 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/alpha.air
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/alpha.air
@@ -17,10 +17,8 @@ FoamFile
 
 dimensions      [0 0 0 0 0 0 0];
 
-internalField   uniform 0.0751237;
+internalField   uniform 0.066553351;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/f.air b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/f.air
index 8a68320714..50af0a6b0e 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/f.air
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/f.air
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/p b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/p
index 75814dc0cb..9a9f4b636f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/p
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/p
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/p_rgh b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/p_rgh
index fb9f37adc5..8744509a62 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/p_rgh
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/0/p_rgh
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/Allclean b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/Allclean
index 60691a4c65..fa9dc48dcc 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/Allclean
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/Allclean
@@ -1,7 +1,11 @@
 #!/bin/sh
 
-cd ${0%/*} || exit 1
+# Run from this directory
+cd "${0%/*}" || exit 1
 
+# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f moments.eps numberDensity.eps
+
+#------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/Allrun b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/Allrun
index 10a9274540..e3a4c6207e 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/Allrun
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/Allrun
@@ -1,14 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
 
-# Source tutorial run functions
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
 
 ( cd validation && ./createGraphs )
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels
index 4d55f968e7..e86f107d9f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels
@@ -21,7 +21,7 @@ airSource
 
     selectionMode   all;
 
-    massFlowRate    24.535;
+    massFlowRate    0.02186682;
 
     phase           air;
     rho             thermo:rho.air;
@@ -57,8 +57,6 @@ airSource
         f26.air     0;
         f27.air     0;
         f28.air     0;
-        f29.air     0;
-        f30.air     0;
     }
 }
 
@@ -68,7 +66,7 @@ waterSink
 
     selectionMode   all;
 
-    massFlowRate    -24535;
+    massFlowRate    -21.86682;
 
     phase           water;
     rho             thermo:rho.water;
@@ -77,5 +75,4 @@ waterSink
     {}
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/g b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/g
index 24a8dfba51..716851f8f2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/g
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/g
@@ -18,5 +18,4 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 0);
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties
index f71784affa..3c2b639708 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/phaseProperties
@@ -35,37 +35,35 @@ air
 
         sizeGroups
         (
-            f0 {dSph 1.240700982; value 0;}
-            f1 {dSph 1.302736031; value 0;}
-            f2 {dSph 1.364771080; value 0;}
-            f3 {dSph 1.426806129; value 0;}
-            f4 {dSph 1.488841178; value 0;}
-            f5 {dSph 1.550876227; value 0.0609671;}
-            f6 {dSph 1.612911276; value 0.0741729;}
-            f7 {dSph 1.674946325; value 0.0895739;}
-            f8 {dSph 1.736981375; value 0.1074333;}
-            f9 {dSph 1.799016424; value 0.1280343;}
-            f10{dSph 1.861051473; value 0.151681;}
-            f11{dSph 1.923086522; value 0.1786995;}
-            f12{dSph 1.985121571; value 0.209438;}
-            f13{dSph 2.047156620; value 0;}
-            f14{dSph 2.109191669; value 0;}
-            f15{dSph 2.171226718; value 0;}
-            f16{dSph 2.233261767; value 0;}
-            f17{dSph 2.295296816; value 0;}
-            f18{dSph 2.357331865; value 0;}
-            f19{dSph 2.419366915; value 0;}
-            f20{dSph 2.481401964; value 0;}
-            f21{dSph 2.543437013; value 0;}
-            f22{dSph 2.605472062; value 0;}
-            f23{dSph 2.667507111; value 0;}
-            f24{dSph 2.729542160; value 0;}
-            f25{dSph 2.791577209; value 0;}
-            f26{dSph 2.853612258; value 0;}
-            f27{dSph 2.915647307; value 0;}
-            f28{dSph 2.977682356; value 0;}
-            f29{dSph 3.039717405; value 0;}
-            f30{dSph 3.101752454; value 0;}
+            f0 {dSph 1.000; value 0.0000;}
+            f1 {dSph 1.074; value 0.0000;}
+            f2 {dSph 1.147; value 0.0000;}
+            f3 {dSph 1.221; value 0.0000;}
+            f4 {dSph 1.294; value 0.0000;}
+            f5 {dSph 1.368; value 0.0000;}
+            f6 {dSph 1.441; value 0.0000;}
+            f7 {dSph 1.515; value 0.0000;}
+            f8 {dSph 1.588; value 0.0918;}
+            f9 {dSph 1.662; value 0.1151;}
+            f10{dSph 1.735; value 0.1429;}
+            f11{dSph 1.809; value 0.1758;}
+            f12{dSph 1.882; value 0.2146;}
+            f13{dSph 1.956; value 0.2599;}
+            f14{dSph 2.029; value 0.0000;}
+            f15{dSph 2.103; value 0.0000;}
+            f16{dSph 2.176; value 0.0000;}
+            f17{dSph 2.250; value 0.0000;}
+            f18{dSph 2.323; value 0.0000;}
+            f19{dSph 2.397; value 0.0000;}
+            f20{dSph 2.470; value 0.0000;}
+            f21{dSph 2.544; value 0.0000;}
+            f22{dSph 2.617; value 0.0000;}
+            f23{dSph 2.691; value 0.0000;}
+            f24{dSph 2.764; value 0.0000;}
+            f25{dSph 2.838; value 0.0000;}
+            f26{dSph 2.911; value 0.0000;}
+            f27{dSph 2.985; value 0.0000;}
+            f28{dSph 3.058; value 0.0000;}
         );
     }
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.air b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.air
index 0a82e2af6b..95d197886c 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.air
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.air
@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -38,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          1007;
+        Cp          1007;
         Hf          0;
     }
     transport
@@ -48,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.water
index 47a8599387..714959d133 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/thermophysicalProperties.water
@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -38,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          4195;
+        Cp          4195;
         Hf          0;
     }
     transport
@@ -48,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/blockMeshDict b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/blockMeshDict
index 013fa5230c..cc61afbb73 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/blockMeshDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/blockMeshDict
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,14 +19,14 @@ convertToMeters 1;
 
 vertices
 (
-    (0  0  0 )
-    (10 0  0 )
-    (10 10 0 )
-    (0  10 0 )
-    (0  0  10)
-    (10 0  10)
-    (10 10 10)
-    (0  10 10)
+    (0 0 0)
+    (1 0 0)
+    (1 1 0)
+    (0 1 0)
+    (0 0 1)
+    (1 0 1)
+    (1 1 1)
+    (0 1 1)
 );
 
 blocks
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSchemes
index 656615a05a..c015424a5a 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSchemes
@@ -29,7 +29,7 @@ divSchemes
 {
     default                         none;
 
-    "div\(phi,alpha.*)"             Gauss vanLeer;
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSolution b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSolution
index 3c4168e624..c3bb75a29a 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSolution
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/system/fvSolution
@@ -69,5 +69,4 @@ PIMPLE
 relaxationFactors
 {}
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/validation/createGraphs
index 57d77f2823..b59308de8c 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/validation/createGraphs
@@ -21,9 +21,9 @@ gnuplot<<EOF
     set yrange [0:1.5e-2]
     set key top right
 
-    plot '<printf "2 0\n2 0.01\n4 0.01\n4 0\n"' w l t 'Initial Condition',\
-    '<printf "8 0\n8 0.01\n10 0.01\n10 0\n"' w l t '[Kumar J., PhD thesis, Magdeburg, 2006]',\
-    '../postProcessing/numberDensity/6/numberDensity.dat' u 1:4 w lp t 'air'
+    plot '<printf "1.876749927 0\n1.876749927 0.01\n4.144510443 0.01\n4.144510443 0\n"' w l dt 2 lc rgb 'black' t 'Initial condition',\
+    '<printf "7.957828406 0\n7.957828406 0.01\n10.14451044 0.01\n10.14451044 0\n"' w l lc rgb 'black' t 'Exact',\
+    '../postProcessing/numberDensity/6/numberDensity.dat' u 1:4 w lp ls 4 lc rgb 'black' t 'Numerical'
 
     set output '../moments.eps'
 
@@ -36,10 +36,10 @@ gnuplot<<EOF
     set yrange [0.5:3.5]
     set key top left
 
-    plot '../postProcessing/moments/0/moments.dat' u 1:(\$2/0.024535) w p pt 5 t 'j=0 (Numbers), air',\
-    '<printf "0 1\n6 1\n"' w l t 'j=0 (Numbers), [Kumar J., PhD thesis, Magdeburg, 2006]',\
-    '../postProcessing/moments/0/moments.dat' u 1:(\$3/0.0751237) w p pt 6 t 'j=1 (Volume), air',\
-    '<printf "0 1\n6 3\n"' w l t 'j=1 (Volume), [Kumar J., PhD thesis, Magdeburg, 2006]'
+    plot '../postProcessing/moments/0/moments.dat' every 2 u 1:(\$2/0.02186682) w p pt 5 lc rgb 'black' t 'j=0 (Numbers), numerical',\
+    '<printf "0 1\n6 1\n"' w l lc rgb 'black' t 'j=0 (Numbers), exact',\
+    '../postProcessing/moments/0/moments.dat' u 1:(\$3/0.066553351) every 2 w p pt 6 lc rgb 'black' t 'j=1 (Volume), numerical',\
+    '<printf "0 1\n6 3\n"' w l dt 2 lc rgb 'black' t 'j=1 (Volume), exact'
 EOF
 
 #------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/T.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/T.air1
index c5cfc30844..cd2948d7e8 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/T.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/T.air1
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/T.water b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/T.water
index a7540f1e93..0cea5e3ed9 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/T.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/T.water
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/U.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/U.air1
index 9e19f276d1..171c88a97b 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/U.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/U.air1
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/U.water b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/U.water
index 4b0d722484..b47c61857b 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/U.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/U.water
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air1
index 8196081d71..dbfb868a72 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air1
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air2
index 469981d4d6..ea7e6d6c9c 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air2
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air3
index 48279d446b..016cb67daa 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.air3
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.water b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.water
index 807a059136..a71ee91371 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/alpha.water
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air1
index 45fb304d95..e84e10271e 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air1
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      f.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air2
index 9d0e53b783..084f713523 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air2
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      f.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air3
index db8a2fa83f..c2eb3d1e02 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/f.air3
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      f.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/p b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/p
index 30cb4cb736..5f553d2902 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/p
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/p
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/p_rgh b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/p_rgh
index 60e63d751e..5abb16b67e 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/p_rgh
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/0/p_rgh
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvModels b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvModels
index 9e8d363731..66666ce99a 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvModels
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/fvModels
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      fvModels;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -38,5 +39,4 @@ massSource
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/g b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/g
index e82985fe6b..db69fb9add 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/g
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/g
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
+    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/hRef b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/hRef
index 1c3ea35ab4..f0ccb4b084 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/hRef
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/hRef
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedScalarField;
+    location    "constant";
     object      hRef;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air1
index 3bafec10ec..3c3b2564e9 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air1
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      momentumTransport.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air2
index 3172370612..5eefee8c9c 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air2
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      momentumTransport.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air3
index c54b6abef0..c15ccf07ae 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.air3
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      momentumTransport.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.water b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.water
index fb66caad17..8f42ef3c8a 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/momentumTransport.water
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      momentumTransport.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air1
index 9d0a92e152..c16ea15668 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air1
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      thermophysicalProperties.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air2
index e12a79c6e9..4a53258cf8 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air2
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      thermophysicalProperties.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air3
index 0fc0a2ba27..2840f5ffaa 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.air3
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      thermophysicalProperties.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.water
index 499c2e9cee..1e0ddc5d09 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/constant/thermophysicalProperties.water
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/blockMeshDict b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/blockMeshDict
index a7f444d5bf..aa256977b7 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/blockMeshDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/blockMeshDict
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/controlDict b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/controlDict
index ba7e04d607..8fc448327d 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/controlDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/controlDict
@@ -10,45 +10,46 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-application         multiphaseEulerFoam;
+application     multiphaseEulerFoam;
 
-startFrom           startTime;
+startFrom       startTime;
 
-startTime           0;
+startTime       0;
 
-stopAt              endTime;
+stopAt          endTime;
 
-endTime             30;
+endTime         30;
 
-deltaT              1e-3;
+deltaT          1e-3;
 
-writeControl        adjustableRunTime;
+writeControl    adjustableRunTime;
 
-writeInterval       1;
+writeInterval   1;
 
-purgeWrite          1;
+purgeWrite      1;
 
-writeFormat         ascii;
+writeFormat     ascii;
 
-writePrecision      9;
+writePrecision  9;
 
-writeCompression    uncompressed;
+writeCompression uncompressed;
 
-timeFormat          general;
+timeFormat      general;
 
-timePrecision       6;
+timePrecision   6;
 
-runTimeModifiable   yes;
+runTimeModifiable yes;
 
-adjustTimeStep      yes;
+adjustTimeStep  yes;
 
-maxCo               0.5;
+maxCo           0.5;
 
-maxDeltaT           1;
+maxDeltaT       1;
 
 functions
 {
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSchemes
index 852b309387..ec59d2a397 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSchemes
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -29,14 +30,13 @@ divSchemes
 {
     default                         none;
 
-    "div\(phi,alpha.*)"             Gauss vanLeer;
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
     "div\(phir,alpha.*,alpha.*)"    Gauss vanLeer;
 
     "div\(phi.*,U.*\)"              Gauss linearUpwind limited;
     "div\(alphaRhoPhi.*,U.*\)"      Gauss linearUpwind limited;
 
     "div\(alphaPhi.*,f.*\)"         Gauss upwind;
-    "div\(alphaRhoPhi.*,f.*\)"      Gauss upwind;
 
     "div\(\(\(\(alpha.*\*thermo:rho.*\)\*nuEff.*\)\*dev2\(T\(grad\(U.*\)\)\)\)\)" Gauss linear;
 }
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSolution b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSolution
index 61dfcad50a..7c18f87225 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSolution
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/fvSolution
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,7 +58,6 @@ PIMPLE
 {
     nOuterCorrectors 3;
     nCorrectors      2;
-
     faceMomentum     true;
 }
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict
index 43b4caad8c..4fc7a264f2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/system/topoSetDict
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/validation/createGraphs
index 5b014c7308..913ace8d77 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/isothermalGrowth/validation/createGraphs
@@ -16,22 +16,20 @@ gnuplot<<EOF
     set key bottom center
 
     latestTime = system("foamListTimes -case .. -latestTime")
-
+    p0 = $(tail -n1 ../postProcessing/cellZoneAverage/0/volFieldValue.dat | awk '{print $2}')
     file = '../postProcessing/singleGraph/'.latestTime.'/line_d.bubbles_p_alpha.air1_alpha.air2_alpha.air3_alpha.bubbles.xy'
 
-    p0 = $(tail -n1 ../postProcessing/cellZoneAverage/0/volFieldValue.dat | awk '{print $2}')
-
-    plot ''.file.'' u (\$2*1000):1 w l t 'prediction',\
-    ''.file.'' u (0.003*(p0/\$3)**(1./3.)*1000):1 w l t 'exact result'
+    plot ''.file.'' u (\$2*1000):1 w l lc rgb 'black' t 'prediction',\
+    ''.file.'' u (0.003*(p0/\$3)**(1./3.)*1000):1 w l dt 2 lc rgb 'black' t 'exact result'
 
     set output '../alpha.air_y.eps'
 
     set xlabel '{/Symbol a} (-)'
 
-    plot ''.file.'' u 4:1 w l t 'air1',\
-    ''.file.'' u 5:1 w l t 'air2',\
-    ''.file.'' u 6:1 w l t 'air3',\
-    ''.file.'' u 7:1 w lp t 'air total'
+    plot ''.file.'' u 4:1 w l dt 2 lc rgb 'black' t 'air1',\
+    ''.file.'' u 5:1 w l dt 3 lc rgb 'black' t 'air2',\
+    ''.file.'' u 6:1 w l dt 4 lc rgb 'black' t 'air3',\
+    ''.file.'' u 7:1 w l lc rgb 'black' t 'air total'
 EOF
 
 #------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/T.air b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/T.air
index 14af98a1d3..7964fc2a4b 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/T.air
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/T.air
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/T.water b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/T.water
index c678eb451c..b4ea29a60f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/T.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/T.water
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/U.air b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/U.air
index 0356c6f14b..3e935c1845 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/U.air
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/U.air
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/U.water b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/U.water
index 85a2905d1c..326e870bd2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/U.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/U.water
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/alpha.air b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/alpha.air
index bcebfd68e1..1935d1eec8 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/alpha.air
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/alpha.air
@@ -17,10 +17,8 @@ FoamFile
 
 dimensions      [0 0 0 0 0 0 0];
 
-internalField   uniform 0.2325241;
+internalField   uniform 0.279433081;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/f.air b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/f.air
index 8a68320714..50af0a6b0e 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/f.air
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/f.air
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/p b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/p
index 75814dc0cb..9a9f4b636f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/p
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/p
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/p_rgh b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/p_rgh
index fb9f37adc5..8744509a62 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/p_rgh
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/0/p_rgh
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/Allclean b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/Allclean
index 60691a4c65..fa9dc48dcc 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/Allclean
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/Allclean
@@ -1,7 +1,11 @@
 #!/bin/sh
 
-cd ${0%/*} || exit 1
+# Run from this directory
+cd "${0%/*}" || exit 1
 
+# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f moments.eps numberDensity.eps
+
+#------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/Allrun b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/Allrun
index 10a9274540..e3a4c6207e 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/Allrun
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/Allrun
@@ -1,14 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
 
-# Source tutorial run functions
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
 
 ( cd validation && ./createGraphs )
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels
index efb4a01cf0..eed836d7a4 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels
@@ -21,7 +21,7 @@ airSource
 
     selectionMode   all;
 
-    massFlowRate    -25.8575;
+    massFlowRate    -0.030785654;
 
     phase           air;
     rho             thermo:rho.air;
@@ -53,6 +53,10 @@ airSource
         f22.air     0;
         f23.air     0;
         f24.air     0;
+        f25.air     0;
+        f26.air     0;
+        f27.air     0;
+        f28.air     0;
     }
 }
 
@@ -62,7 +66,7 @@ waterSink
 
     selectionMode   all;
 
-    massFlowRate    25857.5;
+    massFlowRate    30.785654;
 
     phase           water;
     rho             thermo:rho.water;
@@ -71,5 +75,4 @@ waterSink
     {}
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/g b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/g
index 24a8dfba51..716851f8f2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/g
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/g
@@ -18,5 +18,4 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 0);
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties
index 04e808a635..64265a361f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/phaseProperties
@@ -35,31 +35,35 @@ air
 
         sizeGroups
         (
-            f0 {dSph 1.240700982; value 0;}
-            f1 {dSph 1.302736031; value 0;}
-            f2 {dSph 1.364771080; value 0;}
-            f3 {dSph 1.426806129; value 0;}
-            f4 {dSph 1.488841178; value 0;}
-            f5 {dSph 1.550876227; value 0;}
-            f6 {dSph 1.612911276; value 0;}
-            f7 {dSph 1.674946325; value 0;}
-            f8 {dSph 1.736981375; value 0;}
-            f9 {dSph 1.799016424; value 0;}
-            f10{dSph 1.861051473; value 0;}
-            f11{dSph 1.923086522; value 0;}
-            f12{dSph 1.985121571; value 0;}
-            f13{dSph 2.047156620; value 0;}
-            f14{dSph 2.109191669; value 0;}
-            f15{dSph 2.171226718; value 0;}
-            f16{dSph 2.233261767; value 0;}
-            f17{dSph 2.295296816; value 0;}
-            f18{dSph 2.357331865; value 0;}
-            f19{dSph 2.419366915; value 0;}
-            f20{dSph 2.481401964; value 0.2064732;}
-            f21{dSph 2.543437013; value 0.2336032;}
-            f22{dSph 2.605472062; value 0.2635129;}
-            f23{dSph 2.667507111; value 0.2964107;}
-            f24{dSph 2.729542160; value 0;}
+            f0 {dSph 1.000; value 0.0000;}
+            f1 {dSph 1.074; value 0.0000;}
+            f2 {dSph 1.147; value 0.0000;}
+            f3 {dSph 1.221; value 0.0000;}
+            f4 {dSph 1.294; value 0.0000;}
+            f5 {dSph 1.368; value 0.0000;}
+            f6 {dSph 1.441; value 0.0000;}
+            f7 {dSph 1.515; value 0.0000;}
+            f8 {dSph 1.588; value 0.0000;}
+            f9 {dSph 1.662; value 0.0000;}
+            f10{dSph 1.735; value 0.0000;}
+            f11{dSph 1.809; value 0.0000;}
+            f12{dSph 1.882; value 0.0000;}
+            f13{dSph 1.956; value 0.0000;}
+            f14{dSph 2.029; value 0.0000;}
+            f15{dSph 2.103; value 0.0000;}
+            f16{dSph 2.176; value 0.0000;}
+            f17{dSph 2.250; value 0.0000;}
+            f18{dSph 2.323; value 0.0000;}
+            f19{dSph 2.397; value 0.0000;}
+            f20{dSph 2.470; value 0.1989;}
+            f21{dSph 2.544; value 0.2304;}
+            f22{dSph 2.617; value 0.2656;}
+            f23{dSph 2.691; value 0.3051;}
+            f24{dSph 2.764; value 0.0000;}
+            f25{dSph 2.838; value 0.0000;}
+            f26{dSph 2.911; value 0.0000;}
+            f27{dSph 2.985; value 0.0000;}
+            f28{dSph 3.058; value 0.0000;}
         );
     }
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.air b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.air
index 0a82e2af6b..95d197886c 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.air
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.air
@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -38,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          1007;
+        Cp          1007;
         Hf          0;
     }
     transport
@@ -48,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.water
index 47a8599387..714959d133 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/thermophysicalProperties.water
@@ -20,7 +20,7 @@ thermoType
     type            heRhoThermo;
     mixture         pureMixture;
     transport       const;
-    thermo          eConst;
+    thermo          hConst;
     equationOfState rhoConst;
     specie          specie;
     energy          sensibleInternalEnergy;
@@ -38,7 +38,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          4195;
+        Cp          4195;
         Hf          0;
     }
     transport
@@ -48,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/blockMeshDict b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/blockMeshDict
index 013fa5230c..cc61afbb73 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/blockMeshDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/blockMeshDict
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,14 +19,14 @@ convertToMeters 1;
 
 vertices
 (
-    (0  0  0 )
-    (10 0  0 )
-    (10 10 0 )
-    (0  10 0 )
-    (0  0  10)
-    (10 0  10)
-    (10 10 10)
-    (0  10 10)
+    (0 0 0)
+    (1 0 0)
+    (1 1 0)
+    (0 1 0)
+    (0 0 1)
+    (1 0 1)
+    (1 1 1)
+    (0 1 1)
 );
 
 blocks
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSchemes
index 656615a05a..c015424a5a 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSchemes
@@ -29,7 +29,7 @@ divSchemes
 {
     default                         none;
 
-    "div\(phi,alpha.*)"             Gauss vanLeer;
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSolution b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSolution
index 3c4168e624..c3bb75a29a 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSolution
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/system/fvSolution
@@ -69,5 +69,4 @@ PIMPLE
 relaxationFactors
 {}
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/validation/createGraphs
index 270c2b51d9..e7516459e2 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/validation/createGraphs
@@ -21,9 +21,9 @@ gnuplot<<EOF
     set yrange [0:1.5e-2]
     set key top right
 
-    plot '<printf "4 0\n4 0.01\n6 0.01\n6 0\n"' w l t '[Kumar J., PhD thesis, Magdeburg, 2006]',\
-    '<printf "8 0\n8 0.01\n10 0.01\n10 0\n"' w l t 'Initial Condition',\
-    '../postProcessing/numberDensity/4/numberDensity.dat' u 1:4 w lp t 'air'
+    plot '<printf "7.548417545 0\n7.548417545 0.01\n10.62698298 0.01\n10.62698298 0\n"' w l dt 2 lc rgb 'black' t 'Initial condition',\
+    '<printf "3.548417545 0\n3.548417545 0.01\n6.626982979 0.01\n6.626982979 0\n"' w l lc rgb 'black' t 'Exact',\
+    '../postProcessing/numberDensity/4/numberDensity.dat' u 1:4 w lp ls 4 lc rgb 'black' t 'Numerical'
 
     set output '../moments.eps'
 
@@ -36,10 +36,10 @@ gnuplot<<EOF
     set yrange [0:1.5]
     set key top right
 
-    plot '../postProcessing/moments/0/moments.dat' u 1:(\$2/0.0258575) w p pt 5 t 'j=0 (Numbers), air',\
-    '<printf "0 1\n6 1\n"' w l t 'j=0 (Numbers), [Kumar J., PhD thesis, Magdeburg, 2006]',\
-    '../postProcessing/moments/0/moments.dat' u 1:(\$3/0.2325241) w p pt 6 t 'j=1 (Volume), air',\
-    '<printf "0 1\n6 0.33333\n"' w l t 'j=1 (Volume), [Kumar J., PhD thesis, Magdeburg, 2006]'
+    plot '../postProcessing/moments/0/moments.dat' every 2 u 1:(\$2/0.030785654) w p pt 5 lc rgb 'black' t 'j=0 (Numbers), numerical',\
+    '<printf "0 1\n6 1\n"' w l lc rgb 'black' t 'j=0 (Numbers), exact',\
+    '../postProcessing/moments/0/moments.dat' u 1:(\$3/0.279433081) every 2 w p pt 6 lc rgb 'black' t 'j=1 (Volume), numerical',\
+    '<printf "0 1\n6 0.33333\n"' w l dt 2 lc rgb 'black' t 'j=1 (Volume), exact'
 EOF
 
 #------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air1
index 9fc0bf9aae..f650822453 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air1
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air2
index 3f1a11948d..640a8280ab 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air2
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air3
index f9395a7dda..05808a1637 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.air3
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.water b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.water
index c678eb451c..b4ea29a60f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/T.water
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [0 0 0 1 0 0 0];
+dimensions      [0 0 0 1 0 0 0];
 
-internalField       uniform 300;
+internalField   uniform 300;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air1
index 3fc39e1bdc..84f0747ec1 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air1
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air2
index 8ac15fa83d..d1715da9b4 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air2
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air3
index 99241ce7b8..ec585e1d04 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.air3
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.air3;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.water b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.water
index 85a2905d1c..326e870bd2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/U.water
@@ -8,8 +8,9 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
+    location    "0";
     object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 1 -1 0 0 0 0];
 
 internalField   uniform (0 0 0);
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air1
index 2e4c9f39df..bb78e7ad52 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air1
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air2
index 4cef1edfe4..079497e274 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air2
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air3
index d72f523ec8..6aaf9012d1 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.air3
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.water b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.water
index ca4e461e76..acd3a9ae8e 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/alpha.water
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air1
index 394faa960a..c3f52c76e2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air1
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air2
index 3e7e3883b3..27b0f27a7b 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air2
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air3
index a7ee501541..14454f3da9 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/f.air3
@@ -19,8 +19,6 @@ dimensions      [0 0 0 0 0 0 0];
 
 internalField   uniform 1.0;
 
-boundaryField
-{
-}
+boundaryField   {}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/p b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/p
index 75814dc0cb..9a9f4b636f 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/p
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/p
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/p_rgh b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/p_rgh
index fb9f37adc5..8744509a62 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/p_rgh
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/0/p_rgh
@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-dimensions          [1 -1 -2 0 0 0 0];
+dimensions      [1 -1 -2 0 0 0 0];
 
-internalField       uniform 1e5;
+internalField   uniform 1e5;
 
-boundaryField
-{
-}
+boundaryField   {}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/Allclean b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/Allclean
index f23abc9fad..876929401d 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/Allclean
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/Allclean
@@ -1,7 +1,11 @@
 #!/bin/sh
 
-cd ${0%/*} || exit 1
+# Run from this directory
+cd "${0%/*}" || exit 1
 
+# Source clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase && rm -f probabilityDensity.eps
+
+#------------------------------------------------------------------------------
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/Allrun b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/Allrun
index 10a9274540..e3a4c6207e 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/Allrun
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/Allrun
@@ -1,14 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
 
-# Source tutorial run functions
+# Run from this directory
+cd "${0%/*}" || exit 1
+
+# Source run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-# Set application name
-application=$(getApplication)
-
 runApplication blockMesh
-runApplication $application
+runApplication $(getApplication)
 
 ( cd validation && ./createGraphs )
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/g b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/g
index 24a8dfba51..716851f8f2 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/g
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/g
@@ -18,5 +18,4 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 0);
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air1 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air1
index 50b70cf8dc..c16ea15668 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air1
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air1
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air2 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air2
index e74d22dc5d..b23344d0e8 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air2
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air2
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air3 b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air3
index 3d725c0680..26bd163c0e 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air3
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.air3
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   28.9;
     }
     thermodynamics
@@ -45,5 +44,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.water b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.water
index 38a3615fad..b1eaba15ce 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.water
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/constant/thermophysicalProperties.water
@@ -30,7 +30,6 @@ mixture
 {
     specie
     {
-        nMoles      1;
         molWeight   18;
     }
     equationOfState
@@ -49,5 +48,4 @@ mixture
     }
 }
 
-
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/blockMeshDict b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/blockMeshDict
index 4e1960a31c..cc61afbb73 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/blockMeshDict
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/blockMeshDict
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      blockMeshDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSchemes b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSchemes
index 656615a05a..c015424a5a 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSchemes
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSchemes
@@ -29,7 +29,7 @@ divSchemes
 {
     default                         none;
 
-    "div\(phi,alpha.*)"             Gauss vanLeer;
+    "div\(phi,alpha.*\)"            Gauss vanLeer;
     "div\(alphaRhoPhi.*,U.*\)"      Gauss limitedLinearV 1;
     "div\(alphaPhi.*,f.*\)"         Gauss limitedLinear 1;
 
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSolution b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSolution
index 9932e93f2e..8e6e8525bf 100644
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSolution
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/system/fvSolution
@@ -63,12 +63,6 @@ PIMPLE
 }
 
 relaxationFactors
-{
-    equations
-    {
-        "f.*"              1.0;
-    }
-}
-
+{}
 
 // ************************************************************************* //
diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs
index 41104b40f0..cc17edb8ba 100755
--- a/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs
+++ b/test/multiphase/multiphaseEulerFoam/populationBalance/simultaneousCoalescenceAndBreakup/validation/createGraphs
@@ -17,23 +17,23 @@ gnuplot<<EOF
     set xlabel 'd (m)'
     set ytics 0.1 mirror
     set ylabel 'Probability density function (m^{-3})'
-
+    set key left
     set xrange [1:10]
-    set yrange [0:0.5]
+    set yrange [0:0.6]
 
     numberDensity = '../postProcessing/numberDensity/10/numberDensity.dat'
     volumeDensity = '../postProcessing/volumeDensity/10/volumeDensity.dat'
 
     kVConversion = (6/pi)**(1./3.)
 
-    plot '-' w l t 'Number density, [Vanni, J. Colloid Interface Sci., 221: 143-160, 2000]',\
-    '-' w l t 'Volume density, [Vanni, J. Colloid Interface Sci., 221: 143-160, 2000]',\
-    numberDensity every ::0::12 u (\$3/kVConversion):(\$4*kVConversion) w p pt 1 t 'Number density, air1',\
-    numberDensity every ::13::22 u (\$3/kVConversion):(\$4*kVConversion) w p pt 5 t 'Number density, air2',\
-    numberDensity every ::23::30 u (\$3/kVConversion):(\$4*kVConversion) w p pt 9 t 'Number density, air3',\
-    volumeDensity every ::0::12 u (\$3/kVConversion):(\$4*kVConversion) w p pt 2 t 'Volume density, air1',\
-    volumeDensity every ::13::22 u (\$3/kVConversion):(\$4*kVConversion) w p pt 6 t 'Volume density, air2',\
-    volumeDensity every ::23::30 u (\$3/kVConversion):(\$4*kVConversion) w p pt 10 t 'Volume density, air3'
+    plot '-' w l lc rgb 'black' t 'NDF, Vanni (2000)',\
+    '-' w l dt 2 lc rgb 'black' t 'VDF, Vanni (2000)',\
+    numberDensity every ::0::12 u (\$3/kVConversion):(\$4*kVConversion) w p pt 1 lc rgb 'black' t 'air1',\
+    numberDensity every ::13::22 u (\$3/kVConversion):(\$4*kVConversion) w p pt 5 lc rgb 'black' t 'air2',\
+    numberDensity every ::23::30 u (\$3/kVConversion):(\$4*kVConversion) w p pt 9 lc rgb 'black' t 'air3',\
+    volumeDensity every ::0::12 u (\$3/kVConversion):(\$4*kVConversion) w p pt 2 lc rgb 'black' t 'air1',\
+    volumeDensity every ::13::22 u (\$3/kVConversion):(\$4*kVConversion) w p pt 6 lc rgb 'black' t 'air2',\
+    volumeDensity every ::23::30 u (\$3/kVConversion):(\$4*kVConversion) w p pt 10 lc rgb 'black' t 'air3'
     1.000   0.042
     1.460   0.062
     1.950   0.083