diff --git a/bin/tools/CleanFunctions b/bin/tools/CleanFunctions
index 398052608e..341a3c68e3 100644
--- a/bin/tools/CleanFunctions
+++ b/bin/tools/CleanFunctions
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     | Website:  https://openfoam.org
-#   \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2023 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -53,7 +53,7 @@ cleanCase()
                $d/cellProc*
     done
 
-    [ -d system ] && [ -d dynamicCode ] && rm -rf dynamicCode
+    [ -d dynamicCode ] && rm -rf dynamicCode
 
     rm -rf processor*
     rm -rf postProcessing
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index ff57c15eea..9a1f425d72 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -70,7 +70,7 @@ static inline int findParameterAlternative
 }
 
 
-//- Get dictionary or (optionally) environment variable
+// Get dictionary or (optionally) environment variable
 string getVariable
 (
     const word& name,
@@ -140,8 +140,8 @@ string getVariable
 }
 
 
-//- Recursively expands dictionary or environment variable starting at index
-//  in string. Updates index.
+// Recursively expands dictionary or environment variable starting at index
+// in string. Updates index.
 string expand
 (
     const string& s,
@@ -176,7 +176,7 @@ string expand
 }
 
 
-//- Expand path parts of a string
+// Expand path parts of a string
 Foam::string& inplaceExpandPath(string& s)
 {
     if (!s.empty())
diff --git a/test/dictionary/Allclean b/test/dictionary/Allclean
new file mode 100755
index 0000000000..be36bbd7b7
--- /dev/null
+++ b/test/dictionary/Allclean
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+cleanCase
+
+#------------------------------------------------------------------------------
diff --git a/test/dictionary/Allrun b/test/dictionary/Allrun
index 9d97682223..f42bfe46bc 100755
--- a/test/dictionary/Allrun
+++ b/test/dictionary/Allrun
@@ -4,6 +4,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
-runApplication foamDictionary -expand testDict
+runApplication -s testDict foamDictionary -expand testDict
+runApplication -s testCalc foamDictionary -expand testCalc
+runApplication -s simpleBlockMeshDict foamDictionary -expand simpleBlockMeshDict
 
 #------------------------------------------------------------------------------
diff --git a/test/dictionary/simpleBlockMeshDict b/test/dictionary/simpleBlockMeshDict
new file mode 100644
index 0000000000..fce3171b48
--- /dev/null
+++ b/test/dictionary/simpleBlockMeshDict
@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       dictionary;
+    object      simpleBlockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+min         (-2.5 -1.2 -3.0);   // Minimum coordinates of the block
+max         (2.5 1.2 3.0);      // Maximum coordinates of the block
+nCellsByL   33.3333;            // Number of cells per unit length
+
+// Calculate the number of cells in each block direction
+nCells      #calc #{ Vector<label>($nCellsByL*($<vector>max - $<vector>min) + vector::one/2) #};
+
+// Generate the vertices using a boundBox
+#calcInclude "boundBox.H"
+vertices #calc "boundBox($<vector>min, $<vector>max).points()";
+
+blocks
+(
+    hex #calc "identityMap(8)" $nCells simpleGrading (1 1 1)
+);
+
+defaultPatch
+{
+    type patch;
+}
+
+boundary
+();
+
+// ************************************************************************* //
diff --git a/test/dictionary/testCalc b/test/dictionary/testCalc
new file mode 100644
index 0000000000..6ff45ddbfc
--- /dev/null
+++ b/test/dictionary/testCalc
@@ -0,0 +1,62 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       dictionary;
+    object      testCalc;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+a   1.1;
+b   3.2;
+c   #calc "$a*$b";
+
+// Special care is required for calc entries that include a division since
+// "/" is also used as the scoping operator to identify keywords in
+// sub-dictionaries. For example, "$a/b" expects a keyword "b" within a
+// sub-dictionary named "a". A division can be correctly executed by using a
+// space between a variables and "/", e.g.
+
+c   #calc "$a / $b";
+
+// or bracketing the variable, e.g.
+
+c   #calc "($a)/$b";
+
+// The code string can be delimited either by '"..."' in which newlines must be
+// escaped or '#{...#}' which directly supports multi-line strings and is more
+// convenient when evaluating string expressions by avoiding the need to
+// escape the quotes, e.g.
+
+c   #calc #{ $a*sqrt($b) #};
+
+s   "field";
+fieldName #calc #{ $<string>s + "Name" #};
+
+// Additional include files for the #calc code compilation can be specified
+// using the #calcInclude entry, e.g. if functions from transform.H are used
+angleOfAttack   5; // degs
+
+angle           #calc "-degToRad($angleOfAttack)";
+
+#calcInclude    "transform.H"
+liftDir         #calc "transform(Ry($angle), vector(0, 0, 1))";
+dragDir         #calc "transform(Ry($angle), vector(1, 0, 0))";
+
+// Get U from testCalc2 and cache locally for #calc
+U               ${${FOAM_CASE}/testCalc2!U};
+
+// The testCalc2 file is local so this simpler form could be used
+// U               $testCalc2!U;
+
+// Calculate the magnitude of the velocity and turbulent kinetic energy
+magU            #calc "mag($<vector>U)";
+k               #calc "1.5*magSqr(0.05*$<vector>U)";
+
+// ************************************************************************* //
diff --git a/test/dictionary/testCalc2 b/test/dictionary/testCalc2
new file mode 100644
index 0000000000..2b9b956cd0
--- /dev/null
+++ b/test/dictionary/testCalc2
@@ -0,0 +1,18 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    format      ascii;
+    class       dictionary;
+    object      testCalc2;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+U   (10.2 2.1 0.2);
+
+// ************************************************************************* //