diff --git a/configuration/cirrus-ex.py b/configuration/cirrus-ex.py
index ea303342..ac378ef7 100644
--- a/configuration/cirrus-ex.py
+++ b/configuration/cirrus-ex.py
@@ -3,7 +3,6 @@
 from reframe.core.backends import register_launcher
 from reframe.core.launchers import JobLauncher
 
-
 @register_launcher("torchrun")
 class TorchRunLauncher(JobLauncher):
     """Launcher for Torch run"""
@@ -51,7 +50,7 @@ def command(self, job):
                         "PrgEnv-aocc",
                         "PrgEnv-intel"
                     ],
-                    "max_jobs": 64,
+                    "max_jobs": 10,
                     "processor": {
                         "num_cpus": 288,
                         "num_cpus_per_socket": 144,
diff --git a/pyproject.toml b/pyproject.toml
index 82510636..70205333 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,6 +8,7 @@ license = {file = "LICENSE"}
 
 [tool.black]
 line-length = 120
+target-version = ["py311"]
 
 [tool.flake8]
 max-line-length = 120
diff --git a/tests/apps/gromacs/gmx_1400k_atoms.py b/tests/apps/gromacs/gmx_1400k_atoms.py
index ccad2041..4ee307d4 100644
--- a/tests/apps/gromacs/gmx_1400k_atoms.py
+++ b/tests/apps/gromacs/gmx_1400k_atoms.py
@@ -22,6 +22,7 @@ class Gromacs1400kAtomsBase(GromacsBaseCheck):
             "archer2-tds:compute": 128,
             "cirrus:compute": 36,
             "cirrus:compute-gpu": 40,
+            "cirrus-ex:compute": 288,
         },
     )
 
@@ -30,15 +31,26 @@ class Gromacs1400kAtomsBase(GromacsBaseCheck):
     reference = {
         "archer2:compute": {
             "energy": (energy_reference, -0.01, 0.01, "kJ/mol"),
+            "performance": (24.0, -0.1, None, "ns/day"),
         },
         "archer2-tds:compute": {
             "energy": (energy_reference, -0.01, 0.01, "kJ/mol"),
+            "performance": (22.4, -0.1, None, "ns/day"),
         },
         "cirrus:compute": {
             "energy": (energy_reference, -0.01, 0.01, "kJ/mol"),
+            "performance": (5.50, -0.1, None, "ns/day"),
         },
         "cirrus:compute-gpu": {
             "energy": (energy_reference, -0.01, 0.01, "kJ/mol"),
+            "performance": (11.5, -0.05, None, "ns/day"),
+        },
+        "cirrus-ex:compute": {
+            "energy": (energy_reference, -0.01, 0.01, "kJ/mol"),
+            # The performance of this benchmark seems to be very variable,
+            # with performance sometimes dropping below 50 ns/day.
+            # Disabling the performance check for now until we can investigate this further.
+            # "performance": (78.0, -0.1, None, "ns/day"),
         },
     }
 
@@ -47,26 +59,21 @@ class Gromacs1400kAtomsBase(GromacsBaseCheck):
 class GromacsCPUCheck(Gromacs1400kAtomsBase):
     """Gromacs CPU checks"""
 
-    valid_systems = ["archer2:compute", "cirrus:compute"]
+    valid_systems = ["archer2:compute", "cirrus:compute", "cirrus-ex:compute"]
     modules = ["gromacs"]
     descr = Gromacs1400kAtomsBase.descr + " -- CPU"
 
     n_nodes = 4
-    num_tasks = 128
+
     num_cpus_per_task = 1
     env_vars = {"OMP_NUM_THREADS": str(num_cpus_per_task)}
-    reference["archer2:compute"] = {}
-    reference["archer2-tds:compute"] = {}
-    reference["cirrus:compute"] = {}
 
-    reference["archer2:compute"]["performance"] = (24.0, -0.1, None, "ns/day")
-    reference["archer2-tds:compute"]["performance"] = (22.4, -0.1, None, "ns/day")
-    reference["cirrus:compute"]["performance"] = (5.50, -0.1, None, "ns/day")
+    tags = {"applications", "performance", "small"}
 
     @run_before("run")
     def setup_resources(self):
         """sets up number of tasks"""
-        self.num_tasks_per_node = self.cores.get(self.current_partition.fullname, 1)
+        self.num_tasks_per_node = self.current_partition.processor.num_cpus
         self.num_tasks = self.n_nodes * self.num_tasks_per_node
 
 
@@ -89,8 +96,6 @@ class GromacsGPUCheck(Gromacs1400kAtomsBase):
     n_nodes = 1
     num_tasks = None
     num_cpus_per_tasks = None
-    reference["cirrus:compute-gpu"] = {}
-    reference["cirrus:compute-gpu"]["performance"] = (11.5, -0.05, None, "ns/day")
 
     @run_after("setup")
     def setup_gpu_options(self):
diff --git a/tests/apps/lammps/ethanol.py b/tests/apps/lammps/ethanol.py
index 1d6a673c..171c2bf6 100644
--- a/tests/apps/lammps/ethanol.py
+++ b/tests/apps/lammps/ethanol.py
@@ -32,10 +32,22 @@ class LAMMPSBaseEthanol(LAMMPSBase):
     ethanol_energy_reference = 537394.35
 
     reference = {
-        "cirrus:compute-gpu": {"energy": (ethanol_energy_reference, -0.01, 0.01, "kJ/mol")},
-        "archer2:compute": {"energy": (ethanol_energy_reference, -0.01, 0.01, "kJ/mol")},
-        "cirrus-ex:compute": {"energy": (ethanol_energy_reference, -0.01, 0.01, "kJ/mol")},
-        "archer2-tds:compute": {"energy": (ethanol_energy_reference, -0.01, 0.01, "kJ/mol")},
+        "cirrus:compute-gpu": {
+            "energy": (ethanol_energy_reference, -0.01, 0.01, "kJ/mol"),
+            "performance": (9.4, -0.05, None, "ns/day"),
+        },
+        "archer2:compute": {
+            "energy": (ethanol_energy_reference, -0.01, 0.01, "kJ/mol"),
+            "performance": (11.250, -0.05, None, "ns/day"),
+        },
+        "cirrus-ex:compute": {
+            "energy": (ethanol_energy_reference, -0.01, 0.01, "kJ/mol"),
+            "performance": (26, -0.1, None, "ns/day"),
+        },
+        "archer2-tds:compute": {
+            "energy": (ethanol_energy_reference, -0.01, 0.01, "kJ/mol"),
+            "performance": (11.250, -0.05, None, "ns/day"),
+        },
     }
 
     @performance_function("kJ/mol", perf_key="energy")
@@ -55,15 +67,6 @@ class LAMMPSEthanolCPU(LAMMPSBaseEthanol):
 
     descr = LAMMPSBaseEthanol.descr + " -- CPU"
 
-    reference["archer2-tds:compute"] = {}
-    reference["archer2:compute"] = {}
-    reference["cirrus-ex:compute"] = {}
-
-    reference["archer2:compute"]["performance"] = (11.250, -0.05, None, "ns/day")
-    reference["cirrus-ex:compute"]["performance"] = (27.56, -0.05, None, "ns/day")
-
-    reference["archer2-tds:compute"]["performance"] = (11.250, -0.05, None, "ns/day")
-
     @run_after("init")
     def setup_nnodes(self):
         """sets up number of tasks per node"""
@@ -127,8 +130,6 @@ class LAMMPSEthanolGPU(LAMMPSBaseEthanol):
     n_nodes = 1
     num_tasks = None
     num_cpus_per_task = None
-    reference["cirrus:compute-gpu"] = {}
-    reference["cirrus:compute-gpu"]["performance"] = (9.4, -0.05, None, "ns/day")
 
     @run_after("init")
     def setup_nnodes(self):
diff --git a/tests/apps/lammps/exaalt.py b/tests/apps/lammps/exaalt.py
index cb80c92f..ff9b8b7e 100644
--- a/tests/apps/lammps/exaalt.py
+++ b/tests/apps/lammps/exaalt.py
@@ -1,26 +1,20 @@
 """ReFrame script for lammps dipole test"""
 
-import os
-
 import reframe as rfm
 import reframe.utility.sanity as sn
 
-from lammps_base import BuildLAMMPS, LAMMPSBase
+from lammps_base import LAMMPSBase
 
 
 class LAMMPSBaseExaalt(LAMMPSBase):
     """ReFrame LAMMPS Base class for Exaalt tests"""
 
-    valid_systems = ["archer2:compute"]
-    stream_binary = fixture(BuildLAMMPS, scope="environment")
     num_cpus_per_task = 1
     env_vars = {"OMP_NUM_THREADS": str(num_cpus_per_task)}
-
+    modules = ["lammps"]
     cores = variable(
         dict,
-        value={
-            "archer2:compute": 128,
-        },
+        value={"archer2:compute": 128, "cirrus-ex:compute": 288},
     )
 
     reference = {
@@ -28,6 +22,9 @@ class LAMMPSBaseExaalt(LAMMPSBase):
             "energy": (-8.7467248, -0.001, 0.001, "kJ/mol"),
             "performance": (0.007, -0.1, None, "ns/day"),
         },
+        "cirrus-ex:compute": {
+            "performance": (0.055, -0.15, None, "ns/day"),
+        },
     }
 
     @run_after("init")
@@ -39,7 +36,7 @@ def setup_nnodes(self):
     @run_after("setup")
     def set_executable(self):
         """sets up executable"""
-        self.executable = os.path.join(self.stream_binary.build_system.builddir, "lmp")
+        self.executable = "lmp"
 
     @run_before("run")
     def setup_resources(self):
@@ -62,18 +59,19 @@ def extract_energy(self):
 class LAMMPSExaaltSmall(LAMMPSBaseExaalt):
     """ReFrame LAMMPS small test based on NERSC-10 Exaalt benchmark"""
 
+    valid_systems = ["archer2:compute", "cirrus-ex:compute"]
     descr = "Small performance test using NERSC-10 Exaalt LAMMPS benchmark reference run"
-    tags = {"applications", "performance"}
+    tags = {"applications", "performance", "small"}
     executable_opts = [
         "-in in.snap.test",
         "-var snapdir 2J8_W.SNAP",
-        "-var nx 256",
-        "-var ny 256",
-        "-var nz 256",
-        "-var nsteps 100",
+        "-var nx 128",
+        "-var ny 128",
+        "-var nz 128",
+        "-var nsteps 200",
     ]
 
-    n_nodes = 16
+    n_nodes = 4
     time_limit = "30m"
 
 
@@ -81,17 +79,21 @@ class LAMMPSExaaltSmall(LAMMPSBaseExaalt):
 class LAMMPSExaaltRef(LAMMPSBaseExaalt):
     """ReFrame LAMMPS largescale test based on NERSC-10 Exaalt benchmark"""
 
+    valid_systems = ["archer2:compute", "cirrus-ex:compute"]
+
+    """ReFrame LAMMPS largescale test based on NERSC-10 Exaalt benchmark"""
+
     descr = "Largescale performance test using NERSC-10 Exaalt LAMMPS benchmark reference run"
     tags = {"largescale", "applications", "performance"}
 
     executable_opts = [
         "-in in.snap.test",
         "-var snapdir 2J8_W.SNAP",
-        "-var nx 1024",
-        "-var ny 1024",
-        "-var nz 1024",
+        "-var nx 512",
+        "-var ny 512",
+        "-var nz 512",
         "-var nsteps 100",
     ]
 
-    n_nodes = 1024
+    n_nodes = 256
     time_limit = "30m"
diff --git a/tests/apps/openfoam/openfoam_org_cavity3d.py b/tests/apps/openfoam/openfoam_org_cavity3d.py
new file mode 100644
index 00000000..5d4a0084
--- /dev/null
+++ b/tests/apps/openfoam/openfoam_org_cavity3d.py
@@ -0,0 +1,65 @@
+"""ReFrame test for OpenFOAM 3D lid-driven cavity."""
+
+import reframe as rfm
+import reframe.utility.sanity as sn
+
+from openfoam_org_base import OpenFOAMBase
+
+
+class OpenFOAMCavity3DBase(OpenFOAMBase):
+    """OpenFOAM 3D lid-driven cavity base test."""
+
+    valid_systems = ["cirrus-ex:compute"]
+
+    num_cpus_per_task = 1
+    time_limit = "20m"
+
+    @run_before("run")
+    def setup_tasks(self):
+        """Set up the number of tasks and tasks per node for the test."""
+        self.num_tasks_per_node = self.current_partition.processor.num_cpus
+        self.num_tasks = self.num_nodes * self.num_tasks_per_node
+
+    @sanity_function
+    def assert_finished(self):
+        """Check that the solver completed successfully."""
+        return sn.all([sn.assert_found("End", self.stdout), sn.assert_found("Finalising parallel run", self.stdout)])
+
+    @performance_function("seconds", perf_key="performance")
+    def extract_perf(self):
+        """Extract the final execution time from the solver output."""
+        return sn.extractsingle(
+            r"ExecutionTime\s+=\s+(?P<time>\d+\.\d+)\s+s\s+ClockTime\s+=\s+\d+\s+s\n\nEnd",
+            self.stdout,
+            "time",
+            float,
+        )
+
+    @run_before("run")
+    def setup_testcase(self):
+        """Prepare to run OpenFoam in parallel, by performance the mesh decomposition and partitioning."""
+
+        self.prerun_cmds = [
+            "cd cavity_3d",
+            "blockMesh",
+            f"cp system/decomposeParDict{self.num_tasks:04.0f}  system/decomposeParDict",
+            "decomposePar -force -fileHandler collated",
+        ]
+
+    modules = ["openfoam-org"]
+
+    @run_before("performance")
+    def set_reference(self):
+        """Set the reference performance for Cirrus."""
+        self.reference["cirrus-ex:compute:performance"] = self.reference_performance_cirrus_ex
+
+
+@rfm.simple_test
+class OpenFOAMCavity3D4Node(OpenFOAMCavity3DBase):
+    """OpenFOAM 3D lid-driven cavity test on four nodes."""
+
+    num_nodes = 4
+    executable = "icoFoam"
+    executable_opts = ["-parallel", "-fileHandler", "collated"]
+
+    reference_performance_cirrus_ex = (78, -0.2, 0.05, "seconds")
diff --git a/tests/apps/openfoam/src/cavity_3d/0/U b/tests/apps/openfoam/src/cavity_3d/0/U
new file mode 100644
index 00000000..b231f451
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/0/U
@@ -0,0 +1,41 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    movingWall
+    {
+        type            fixedValue;
+        value           uniform (1 0 0);
+    }
+
+    fixedWalls
+    {
+        type            noSlip;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/0/p b/tests/apps/openfoam/src/cavity_3d/0/p
new file mode 100644
index 00000000..70197444
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/0/p
@@ -0,0 +1,40 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    movingWall
+    {
+        type            zeroGradient;
+    }
+
+    fixedWalls
+    {
+        type            zeroGradient;
+    }
+
+    frontAndBack
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/README.md b/tests/apps/openfoam/src/cavity_3d/README.md
new file mode 100644
index 00000000..24be13e5
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/README.md
@@ -0,0 +1,142 @@
+# OpenFOAM benchmark
+
+The problem is three dimensional lid-driven cavity flow following, e.g.,
+
+https://www.openfoam.com/documentation/tutorial-guide/2-incompressible-flow/2.1-lid-driven-cavity-flow
+
+The following subdirectories should be present
+
+drwxr-sr-x 2 kevin z19 4096 Aug 28 10:06  0
+drwxr-sr-x 2 kevin z19 4096 Aug 28 10:08  constant
+drwxr-sr-x 2 kevin z19 4096 Aug 28 10:10  system
+
+We will assume we are running on CIRRUS with the default openfoam/org
+module:
+
+$ module load PrgEnv-gnu
+$ module load openfoam-org
+
+The (two-dimensional) lid-driven cavity flow tutorial should be found in
+
+${FOAM_TUTORIALS}/incompressible/icoFoam/cavity/cavity
+
+
+## System
+
+A system of uniform resolution (288x288x288) is described in:
+
+system/blockMeshDist
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (288 288 288) simpleGrading (1 1 1)
+);
+
+The system has unit length, so the resolution is determined by the
+number of points in each dimension. Corresponding extents appear in
+the x, y, and z sections of
+
+system/PDRblockMeshDist
+
+If a different resolution is required, both files should be updated.
+
+The system size 288x288x288 has been used in an attempt to saturate
+single node performance (128 MPI processors). This should provide
+scope for some degree of strong scaling to larger numbers of nodes.
+There are also a prime factorisation involving 32x3x3 which allows
+for decompositions where the number of MPI processes per node want
+those factors.
+
+
+### BlockMesh
+
+The mesh is generated from blockMeshDict by running blockMesh. This
+needs to be done exactly once.
+
+$ blockMesh
+
+Results are stored in
+
+constant/polyMesh
+
+The details do not depend on the parallel decomposition, and the mesh may
+be re-used as long as the resolution or geometry do not change.
+
+
+### Parallel decomposition
+
+For any given number of MPI processes, a decomposition is required.
+A series of files with names of the form
+
+system/decomposeParDict0288
+
+are provided for 288 and 576 processes. A decomposition may be
+generated via
+
+$ decomposePar -force -fileHandler collated \
+               -decomposeParDict system/decomposeParDict0288
+
+where the required decomposition has been specified on the command line.
+The results of the decomposition will appear in a directory:
+
+processors288
+
+This is appropriate for 288 MPI processes (1 node). If a new decomposition
+is required, the existing decomposition directory must be removed
+(or renamed).
+
+The decomposition process is serial, and can present a significant serial
+overhead at large process count if repeated runs are required. It is
+therefore efficient if the decomposition can be run only once.
+
+
+## Control
+
+Various run time parameters are provided in 
+
+system/controlDict
+
+The length of the run is controlled by
+
+startTime       0;
+endTime         0.0025;
+
+This length of simulation has been selected so that the computation
+takes around 10 minutes on one node.
+
+The time step is choosen so that the Courant number remains under control
+at the resolution selected for the relevant lid speed:
+
+deltaT          0.000025;
+
+This gives 600 iterations to reach the end time.
+
+If the resolution is changed, some experimentation may be required to
+arrive at a new time step which keeps the Courant number under control.
+
+
+## Run time
+
+At run time a
+
+system/decomposeParDict
+
+file must be present and consistent with the current decomposition. A
+copy ot link to one of the existing files is therefore required.
+
+The icoFoam solver is invoked by, e.g.,
+
+srun icoFoam -fileHandler collated
+
+and the log will appear in stdout as expected.
+
+
+The Courant number at the final time should be in the region of:
+
+Time = 0.0025
+
+Courant Number mean: 0.007157 max: 0.07028
+
+(to four significant figures). The exact figure appearing in the output
+is decomposition dependent.
+
diff --git a/tests/apps/openfoam/src/cavity_3d/constant/physicalProperties b/tests/apps/openfoam/src/cavity_3d/constant/physicalProperties
new file mode 100644
index 00000000..75f257ba
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/constant/physicalProperties
@@ -0,0 +1,20 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+nu              0.01;
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/PDRblockMeshDict b/tests/apps/openfoam/src/cavity_3d/system/PDRblockMeshDict
new file mode 100644
index 00000000..923946c0
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/PDRblockMeshDict
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      PDRblockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+scale   0.1;
+
+x
+{
+    points  (0 1);
+    nCells  (288);
+    ratios  (1);
+}
+
+y
+{
+    points  (0 1);
+    nCells  (288);
+    ratios  (1);
+}
+
+z
+{
+    points  (0 1);
+    nCells  (288);
+    ratios  (1);
+}
+
+
+boundary
+(
+    movingWall
+    {
+        type  wall;
+        faces (3);
+    }
+    fixedWalls
+    {
+        type  wall;
+        faces (0 1 2 4 5);
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/blockMeshDict b/tests/apps/openfoam/src/cavity_3d/system/blockMeshDict
new file mode 100644
index 00000000..f20c1a83
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/blockMeshDict
@@ -0,0 +1,65 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+scale   0.1;
+
+vertices
+(
+    (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
+(
+    hex (0 1 2 3 4 5 6 7) (288 288 288) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    movingWall
+    {
+        type wall;
+        faces
+        (
+            (3 7 6 2)
+        );
+    }
+    fixedWalls
+    {
+        type wall;
+        faces
+        (
+            (0 4 7 3)
+            (2 6 5 1)
+            (1 5 4 0)
+            (0 3 2 1)
+            (4 5 6 7)
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/controlDict b/tests/apps/openfoam/src/cavity_3d/system/controlDict
new file mode 100644
index 00000000..8a331a20
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/controlDict
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     icoFoam;
+
+startFrom       startTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         0.0025;
+
+deltaT          0.000025;
+
+writeControl    runTime;
+
+writeInterval   0.015;
+
+purgeWrite      0;
+
+writeFormat     binary;
+
+writePrecision  6;
+
+writeCompression off;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable false;
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0128 b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0128
new file mode 100644
index 00000000..31b32806
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0128
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  128;
+
+method  simple;
+
+simpleCoeffs
+{
+    n   (8 4 4);
+}
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0256 b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0256
new file mode 100644
index 00000000..6be84d17
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0256
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  256;
+
+method  simple;
+
+simpleCoeffs
+{
+    n   (16 4 4);
+}
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0288 b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0288
new file mode 100644
index 00000000..f9dc28b1
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0288
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  288;
+
+method  simple;
+
+simpleCoeffs
+{
+    n   (8 6 6);
+}
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0576 b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0576
new file mode 100644
index 00000000..e829533d
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict0576
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  576;
+
+method  simple;
+
+simpleCoeffs
+{
+    n   (16 6 6);
+}
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict1152 b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict1152
new file mode 100644
index 00000000..22e57d58
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict1152
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  1152;
+
+method  simple;
+
+simpleCoeffs
+{
+    n   (32 6 6);
+}
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict2304 b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict2304
new file mode 100644
index 00000000..1a0bb629
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict2304
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  2304;
+
+method  simple;
+
+simpleCoeffs
+{
+    n   (64 6 6);
+}
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict4608 b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict4608
new file mode 100644
index 00000000..bfbdef7d
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/decomposeParDict4608
@@ -0,0 +1,27 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains  1152;
+
+method  simple;
+
+simpleCoeffs
+{
+    n   (128 6 6);
+}
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/fvSchemes b/tests/apps/openfoam/src/cavity_3d/system/fvSchemes
new file mode 100644
index 00000000..1697f551
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/fvSchemes
@@ -0,0 +1,50 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+    grad(p)         Gauss linear;
+}
+
+divSchemes
+{
+    default         none;
+    div(phi,U)      Gauss linear;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear orthogonal;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         orthogonal;
+}
+
+
+// ************************************************************************* //
diff --git a/tests/apps/openfoam/src/cavity_3d/system/fvSolution b/tests/apps/openfoam/src/cavity_3d/system/fvSolution
new file mode 100644
index 00000000..d8fa2b5f
--- /dev/null
+++ b/tests/apps/openfoam/src/cavity_3d/system/fvSolution
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2212                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    p
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-06;
+        relTol          0.05;
+    }
+
+    pFinal
+    {
+        $p;
+        relTol          0;
+    }
+
+    U
+    {
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
+        tolerance       1e-05;
+        relTol          0;
+    }
+}
+
+PISO
+{
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+    pRefCell        0;
+    pRefValue       0;
+}
+
+
+// ************************************************************************* //
diff --git a/tests/apps/vasp/src/CdTe/INCAR.base b/tests/apps/vasp/src/CdTe/INCAR.base
new file mode 100644
index 00000000..8b4bf62b
--- /dev/null
+++ b/tests/apps/vasp/src/CdTe/INCAR.base
@@ -0,0 +1,30 @@
+SYSTEM = CdTe
+
+ISTART = 0 ; ICHARG = 2
+
+LWAVE = .FALSE. ; LCHARG = .FALSE.
+
+NCSHMEM = 1
+NBLOCK_FOCK = 8
+
+LSCAAWARE = .TRUE.
+
+NELMDL = 5 ; NELM = 7
+
+ALGO = All
+ISIF = 2
+
+LHFCALC = .TRUE. ; AEXX = 0.25 ; HFSCREEN = 0.2
+
+NBANDS = 640
+ENCUT = 450
+PREC = Accurate
+PRECFOCK = Fast
+LASPH = .TRUE.
+LREAL = .FALSE.
+
+ISMEAR = 0 ; SIGMA = 0.05
+
+LNONCOLLINEAR = .TRUE.
+MAGMOM = 195*0
+
diff --git a/tests/apps/vasp/src/CdTe/KPOINTS b/tests/apps/vasp/src/CdTe/KPOINTS
new file mode 100644
index 00000000..9596c982
--- /dev/null
+++ b/tests/apps/vasp/src/CdTe/KPOINTS
@@ -0,0 +1,5 @@
+2x2x2 Gamma
+ 0
+Monkhorst
+2 2 2
+0 0 0
diff --git a/tests/apps/vasp/src/CdTe/POSCAR b/tests/apps/vasp/src/CdTe/POSCAR
new file mode 100644
index 00000000..30954a45
--- /dev/null
+++ b/tests/apps/vasp/src/CdTe/POSCAR
@@ -0,0 +1,73 @@
+Cd33 Te32
+1.0
+13.086768 0.000000 0.000000
+0.000000 13.086768 0.000000
+0.000000 0.000000 13.086768
+Cd Te
+33 32
+direct
+0.004485 0.995515 0.004485 Cd
+0.001247 0.998753 0.496959 Cd
+0.001247 0.503041 0.001247 Cd
+0.999625 0.501218 0.498782 Cd
+0.496959 0.998753 0.001247 Cd
+0.498781 0.000375 0.498781 Cd
+0.498781 0.501219 0.999625 Cd
+0.500528 0.499472 0.500528 Cd
+0.001247 0.251247 0.253040 Cd
+0.004486 0.254485 0.745515 Cd
+0.999625 0.748782 0.251218 Cd
+0.001247 0.746959 0.748753 Cd
+0.498782 0.249625 0.251219 Cd
+0.496960 0.251247 0.748753 Cd
+0.500528 0.750528 0.249472 Cd
+0.498781 0.748781 0.750375 Cd
+0.251219 0.000375 0.251219 Cd
+0.253040 0.998753 0.748753 Cd
+0.249472 0.499472 0.249472 Cd
+0.251219 0.501219 0.750375 Cd
+0.748753 0.998753 0.253040 Cd
+0.745514 0.995515 0.745515 Cd
+0.750375 0.501219 0.251219 Cd
+0.748753 0.503040 0.748753 Cd
+0.253040 0.251247 0.001247 Cd
+0.251219 0.249625 0.498781 Cd
+0.251219 0.748781 0.999625 Cd
+0.249472 0.750528 0.500528 Cd
+0.745514 0.254485 0.004485 Cd
+0.748753 0.251247 0.496960 Cd
+0.748753 0.746959 0.001247 Cd
+0.750375 0.748782 0.498782 Cd
+0.875000 0.125000 0.875000 Cd
+0.126656 0.125000 0.375000 Te
+0.132779 0.125000 0.875000 Te
+0.125892 0.625000 0.375000 Te
+0.126656 0.625000 0.875000 Te
+0.623344 0.125000 0.375000 Te
+0.617221 0.125000 0.875000 Te
+0.624108 0.625000 0.375000 Te
+0.623344 0.625000 0.875000 Te
+0.124848 0.374848 0.124848 Te
+0.127488 0.377488 0.622512 Te
+0.127488 0.872512 0.127488 Te
+0.124848 0.875152 0.625152 Te
+0.622512 0.377488 0.127488 Te
+0.625152 0.374848 0.625152 Te
+0.625152 0.875152 0.124848 Te
+0.622512 0.872512 0.622512 Te
+0.375000 0.125000 0.126656 Te
+0.375000 0.125000 0.623344 Te
+0.375000 0.625000 0.125892 Te
+0.375000 0.625000 0.624108 Te
+0.875000 0.125000 0.132779 Te
+0.875000 0.125000 0.617221 Te
+0.875000 0.625000 0.126656 Te
+0.875000 0.625000 0.623344 Te
+0.375000 0.375892 0.375000 Te
+0.375000 0.376656 0.875000 Te
+0.375000 0.874108 0.375000 Te
+0.375000 0.873344 0.875000 Te
+0.875000 0.376656 0.375000 Te
+0.875000 0.382779 0.875000 Te
+0.875000 0.873344 0.375000 Te
+0.875000 0.867221 0.875000 Te
diff --git a/tests/apps/vasp/vasp.py b/tests/apps/vasp/vasp.py
new file mode 100644
index 00000000..4efd9213
--- /dev/null
+++ b/tests/apps/vasp/vasp.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+"""ReFrame test for VASP CdTe benchmark."""
+
+import reframe as rfm
+import reframe.utility.sanity as sn
+
+
+@rfm.simple_test
+class VASPCdTeCheck(rfm.RunOnlyRegressionTest):
+    """VASP CdTe correctness and performance check."""
+
+    descr = "VASP CdTe benchmark run"
+    valid_systems = ["cirrus-ex:compute"]
+    valid_prog_environs = ["PrgEnv-gnu"]
+    modules = ["vasp/6/6.5.1"]
+
+    executable = "vasp_ncl"
+
+    num_nodes = 4
+    num_tasks_per_node = 144
+    num_cpus_per_task = 2
+    num_tasks = num_nodes * num_tasks_per_node
+    time_limit = "20m"
+
+    use_multithreading = False
+    tags = {"applications", "performance", "small"}
+    keep_files = ["OUTCAR", "INCAR"]
+
+    env_vars = {
+        "OMP_NUM_THREADS": "1",
+        "OMP_PLACES": "cores",
+        "SRUN_CPUS_PER_TASK": str(num_cpus_per_task),
+    }
+
+    reference = {
+        "cirrus-ex:compute": {
+            "performance": (651.0, -0.05, 0.05, "seconds"),
+        }
+    }
+
+    @run_before("run")
+    def setup_case(self):
+        """Prepare the VASP input files and INCAR settings."""
+        self.job.launcher.options = ["--hint=nomultithread", "--distribution=block:block"]
+        self.prerun_cmds = [
+            "cd CdTe",
+            "mv INCAR.base INCAR",
+            "cat $VASP_PSPOT_DIR/potpaw_PBE/Cd/POTCAR  $VASP_PSPOT_DIR/potpaw_PBE/Te/POTCAR > POTCAR",
+            "echo 'NCORE=4' >> INCAR",
+            "echo 'KPAR=2' >> INCAR",
+        ]
+
+    @sanity_function
+    def assert_finished(self):
+        """Sanity check that VASP completed and printed timing."""
+        return sn.all(
+            [
+                sn.assert_found(r"General timing and accounting informations for this job:", "CdTe/OUTCAR"),
+                sn.assert_found(r"Elapsed time \(sec\):", "CdTe/OUTCAR"),
+            ]
+        )
+
+    @performance_function("seconds", perf_key="performance")
+    def extract_perf(self):
+        """Extract elapsed runtime from OUTCAR."""
+        return sn.extractsingle(r"Elapsed time \(sec\):\s+(?P<runtime>\S+)", "CdTe/OUTCAR", "runtime", float)
diff --git a/tests/env/slurm_energy_check.py b/tests/env/slurm_energy_check.py
index 36327eaf..4cdd106b 100644
--- a/tests/env/slurm_energy_check.py
+++ b/tests/env/slurm_energy_check.py
@@ -83,15 +83,8 @@ class SlurmEnergy4nodesTest(rfm.RunOnlyRegressionTest):
         "cirrus-ex:compute": {"energy-diff": (0, -1, 1, "J")},
     }
 
-    @sanity_function
-    def assert_finished(self):
-        """Sanity check that SLURM_CPU_FREQ_REQ is set"""
-        return sn.assert_found("", self.stdout)
-
-    @performance_function("J", perf_key="energy-diff")
-    def extract_perf(self):
-        """Extract energy from counters to compare with slurm and check diff is zero"""
-
+    def get_energy(self):
+        """Return energy from slurm and energy from counters"""
         jobid = self.job.jobid
         slurm = rfm.utility.osext.run_command(
             "sacct -j " + str(jobid) + " --format=JobID,ConsumedEnergy --noconvert | tr '\n' ' ' ",
@@ -100,7 +93,7 @@ def extract_perf(self):
         )
 
         nodelist_raw = rfm.utility.osext.run_command(
-            "ls nid* | tr '\n' ',' | sed 's/,$//g'",
+            "ls cs-n* | tr '\n' ',' | sed 's/,$//g'",
             check=True,
             shell=True,
         )
@@ -109,9 +102,12 @@ def extract_perf(self):
         energy_data = []
         energy_counters = []
 
+        assert len(nodelist) == self.num_nodes, "Number of nodes in nodelist does not match number of nodes requested"
+
         for nodeid in nodelist:
             energy_data.append(sn.extractall(r"(?P<energy>[0-9]+)\sJ\s(?P<time>[0-9]+)\sus", nodeid, "energy"))
 
+        print("Node list: ", nodelist_raw)
         for energy in energy_data:
             energy_counters.append(int(str(energy[0])))
             energy_counters.append(int(str(energy[1])))
@@ -125,7 +121,7 @@ def extract_perf(self):
             # print(energy_counters[i + 1] - energy_counters[i])
             energy_counters_diff += energy_counters[i + 1] - energy_counters[i]
 
-        diff = energy_counters_diff - int(str(energy_slurm[0]))
+        return energy_counters_diff, int(str(energy_slurm[0]))
 
         # Helpful debugging outputs:
         # print("jobid: ", jobid)
@@ -136,4 +132,19 @@ def extract_perf(self):
         # print("Difference between the energy counters: ", energy_counters_diff)
         # print("difference between counters and slurm: ", diff)
 
+    @sanity_function
+    def assert_energy_recorded(self):
+        """Assert that the energy counters and slurm energy are greater than zero"""
+
+        energy_counters_diff, energy_slurm = self.get_energy()
+
+        return sn.assert_true(energy_counters_diff > 0) and sn.assert_true(energy_slurm > 0)
+
+    @performance_function("J", perf_key="energy-diff")
+    def extract_perf(self):
+        """Extract relative energy difference between counters and slurm output"""
+
+        energy_counters_diff, energy_slurm = self.get_energy()
+        diff = (energy_counters_diff - energy_slurm) / energy_slurm
+
         return diff
diff --git a/tests/libs/pytorch/deepcam.py b/tests/libs/pytorch/deepcam.py
index a775013c..4cf0f907 100644
--- a/tests/libs/pytorch/deepcam.py
+++ b/tests/libs/pytorch/deepcam.py
@@ -89,7 +89,7 @@ class DeepCAMCPUtest(DeepCAMBase):
     valid_prog_environs = ["PrgEnv-cray"]
     reference = {
         "archer2:compute": {"epoch-time": (272, -0.1, 0.1, "s")},
-        "cirrus-ex:compute": {"epoch-time": (40.08, -0.01, 0.01, "s")},
+        "cirrus-ex:compute": {"epoch-time": (40, -0.1, 0.1, "s")},
     }
 
     @run_after("init")
diff --git a/tests/synth/cbenchio/cbenchio.py b/tests/synth/cbenchio/cbenchio.py
new file mode 100644
index 00000000..fdd01c90
--- /dev/null
+++ b/tests/synth/cbenchio/cbenchio.py
@@ -0,0 +1,259 @@
+#!/usr/bin/env python3
+"""
+CBenchio Input/Output test
+"""
+
+import os
+import yaml
+
+import reframe as rfm
+import reframe.utility.sanity as sn
+
+try:
+    from yaml import CLoader as Loader
+except ImportError:
+    from yaml import Loader
+
+
+def get_config(filename: str) -> dict:
+    """Read parameters from a yaml file
+
+    Args:
+        filename: The name of the yaml file containing the parameters.
+        The file should be located in the same directory as this script.
+    Returns:
+        A dictionary containing the parameters read from the yaml file.
+
+    """
+
+    # Filename is relative to the location of this script
+    filename = os.path.join(os.path.dirname(__file__), filename)
+
+    with open(filename, "r") as f:
+        config = yaml.load(f, Loader=Loader)
+    return config
+
+
+class Cbenchio(rfm.RunOnlyRegressionTest):
+    """Base class for cbenchio tests."""
+
+    tags = {"performance", "io"}
+
+    valid_systems = ["cirrus-ex:compute"]
+    valid_prog_environs = ["PrgEnv-gnu"]
+    maintainers = ["l.parisi@epcc.ed.ac.uk"]
+    config = None
+    modules = ["cbenchio-gcc"]
+
+    executable = "benchio"
+    executable_opts = ["config.yaml"]
+    path = None
+    cbenchio_config = None
+
+    def write_config(self, config):
+        """Write the configuration for cbenchio to a yaml file."""
+
+        filename = os.path.join(self.stagedir, "config.yaml")
+
+        with open(filename, "w") as file:
+            yaml.dump({"benchmarks": [config]}, file, Dumper=yaml.Dumper)
+
+    @sanity_function
+    def completed(self):
+        """Check that the test completed successfully."""
+
+        return sn.assert_found(r"Done", self.stdout) and sn.assert_true(os.path.exists("report.yaml"))
+
+    @run_before("performance")
+    def extract_bandwidth(self):
+        """Extract the bandwidth from the cbenchio yaml report."""
+
+        report_file = os.path.join(self.stagedir, "report.yaml")
+        with open(report_file, "r") as file:
+            report = yaml.load(file, Loader=yaml.Loader)
+
+        bandwidths = [
+            result["bandwidth"] for result in report["benchmarks"][0]["results"]
+        ]  # Bandwidths measurements for each repeat of the benchmark.
+        self.perf_variables = {}
+        for i in range(len(bandwidths)):
+            self.perf_variables[f"bandwidth_{i}"] = sn.make_performance_function(
+                lambda i=i: float(bandwidths[i]), "GB/s"
+            )
+
+
+class CbenchioWrite(Cbenchio):
+    """Class for cbenchio write tests."""
+
+    def set_default_parameter(self, param_name, default_value):
+        """Set a default value for a parameter if it is not already set.
+
+        Might be done using custom setters and getters, but reframe's metaprogramming might interfere with that.
+        """
+        if not hasattr(self, param_name):
+            setattr(self, param_name, default_value)
+
+    def set_default_parameters(self):
+        """Set default values for parameters if they are not already set.
+        This is needed as parameters are define at instance creation and
+        will raise an error if the field is not defined, instead of overwriting.
+        That means initialisation need to happen after the instance is initialised.
+        """
+
+        self.set_default_parameter("field_size_per_process_per_dimension", 1048576)
+        self.set_default_parameter("repeat", 8)
+        self.set_default_parameter("stripe_size", 1048576)
+        self.set_default_parameter("random_strided", False)
+        self.set_default_parameter("file_per_process", True)
+        self.set_default_parameter("fields", 1)
+        self.set_default_parameter("n_dimensions", 1)
+        self.set_default_parameter("decomposition", "slab")
+        self.set_default_parameter("path", None)
+        self.set_default_parameter("stripes", 1)
+
+    def create_write_directories(self):
+        """If writing data, create the target directory."""
+
+        self.prerun_cmds = []
+
+        self.prerun_cmds.append(f"rm -rf {self.path}")  # Cleaun up any previously written data
+        self.prerun_cmds.append(f"mkdir -p {self.path}")  # Create the directory where to write the data
+
+        # pylint complain about stripes but not
+        # for the other similarly parameters, so we disable the
+        # warning while we use stripes in this function.
+        # pylint: disable=access-member-before-definition
+        # pylint: disable=attribute-defined-outside-init
+
+        if self.stripes == "num_nodes":
+            self.stripes = self.nodes
+
+        if self.stripes != 1:  # Only valid on Lustre filesystem
+            self.prerun_cmds.append(f"lfs setstripe -C {self.stripes} -S {int(self.stripe_size/2**10)}K {self.path}")
+
+        # pylint: enable=access-member-before-definition
+        # pylint: enable=attribute-defined-outside-init
+
+        self.prerun_cmds.append(
+            f"chmod -R o+wXr {self.path}"
+        )  # Allow anyone to delete the data from the benchmarks if not properly cleaned up
+
+    @run_before("run")
+    def init_parameters(self):
+        """Initialise the parameters"""
+
+        self.set_default_parameters()  # Set default values for parameters if they are not already set.
+
+        self.num_tasks = self.nodes * self.tasks_per_node
+        self.num_tasks_per_node = self.tasks_per_node
+        self.num_cpus_per_task = self.current_partition.processor.num_cpus // self.num_tasks_per_node
+        self.path = os.path.join(self.base_path, f"{self.short_name}")
+        self.cbenchio_config = self.generate_config()  # Generate the parameters for cbenchio executable
+        self.write_config(self.cbenchio_config)
+        self.create_write_directories()
+
+    def generate_config(self):
+        """Generates the yaml file as input to cbenchio"""
+
+        config = {
+            "name": "bandwidth_test",
+            "API": self.api,
+            "processorGrid": [0, 0, 0],
+            "repeat": self.repeat,
+            "sync": True,
+            "operation": "write",
+            "content": "random",
+            "alignment": 4096,
+            "fields": self.fields,
+        }
+
+        config["filePerProcess"] = self.file_per_process
+        config["paths"] = [self.path]
+        type_size = 8  # (Bytes) Assuming we are writing 64-bit floating point numbers.
+
+        if config["API"] == "posix":  # Chunk size and pattern is only supported for Posix
+            config["chunkSize"] = int(
+                self.chunk_size / type_size
+            )  # Convert from bytes to number of elements (assuming 64-bit floating point numbers)
+            config["randomStrided"] = self.random_strided
+
+        n_elements_per_process_per_dim = int(
+            self.field_size_per_process_per_dimension / (type_size)
+        )  # Total number of elements to write per process.
+
+        # Compute domain decomposition and shape
+        config["shape"] = [1, 1, 1]
+
+        if self.api == "posix":
+            assert self.n_dimensions == 1, "Posix API only supports 1 dimension"
+
+        assert self.n_dimensions <= 3, "Only up to 3 dimensions are supported"
+
+        assert self.decomposition == "slab", "Only slab decomposition is supported for now"
+        for d in range(3):
+
+            if d < self.n_dimensions:
+                config["shape"][d] = n_elements_per_process_per_dim
+
+        if not self.file_per_process:
+            config["processorGrid"] = [self.num_tasks, 0, 0]
+            config["shape"][0] = n_elements_per_process_per_dim * self.num_tasks
+
+        return config
+
+
+class CbenchioRead(Cbenchio):
+    """Class for cbenchio read tests."""
+
+    @run_before("run")
+    def set_read_parameters(self):
+        "" "Set the parameters for the read test based on the write test." ""
+
+        cbenchio_config = self.write_test.cbenchio_config
+
+        # Create mirror read operation
+        cbenchio_config["operation"] = "read"
+        cbenchio_config["sync"] = False
+        cbenchio_config["checkReads"] = False
+        self.write_config(cbenchio_config)
+
+        # Submission parameters for the read test are the same as the write test
+        self.num_tasks = self.write_test.num_tasks
+        self.num_tasks_per_node = self.write_test.num_tasks_per_node
+        self.num_cpus_per_task = self.write_test.num_cpus_per_task
+        self.path = self.write_test.path
+
+    @run_before("cleanup")
+    def cleanup_written_files(self):
+        """Cleanup the I/O directory after read tests, as we assume that the data is not needed afterwards.
+        We do not remove the data for write tests, as the data might be needed from other tests for reading.
+        """
+        # Remove the directory in path once we are done reading them.
+
+        result = os.system(f"rm -rf {self.path}")
+        if result != 0:
+            print(f"Warning: Failed to clean up directory {self.path}. Return error code: {result}")
+
+
+def make_read_test(cls):
+    """Create a read test based on a write test class."""
+
+    # check that the class contains write
+    if cls.__name__.find("Write") == -1:
+        raise ValueError("The class passed to make_read_test must contain 'Write' in its name")
+    # The fixture confuses pylint, so we disable the warning for the next line.
+    # pylint: disable=no-member
+    fixture = rfm.core.builtins.fixture(cls, scope="environment")
+    # pylint: enable=no-member
+    module = fixture.cls.__module__
+    return rfm.simple_test(
+        rfm.core.meta.make_test(
+            cls.__name__.replace("Write", "Read"),
+            (CbenchioRead,),
+            {
+                "operation": "read",
+                "write_test": fixture,
+            },
+            module=module,
+        )
+    )
diff --git a/tests/synth/cbenchio/cbenchio_benchmarks.py b/tests/synth/cbenchio/cbenchio_benchmarks.py
new file mode 100644
index 00000000..805c8520
--- /dev/null
+++ b/tests/synth/cbenchio/cbenchio_benchmarks.py
@@ -0,0 +1,91 @@
+"""Cbenchio benchmarks
+
+Contains I/O benchmarks based on cbenchio.
+
+"""
+
+from cbenchio import CbenchioWrite, make_read_test
+
+# Needs to import reframe so that the test runner can find the test classes,
+# even if they are not used directly in this file.
+# pylint: disable=unused-import
+# flake8: noqa: F401
+import reframe as rfm
+
+
+# pylint: enable=unused-import
+class CbenchioPosixSequentialWrite(CbenchioWrite):
+    """Measure the bandwidth of the filesystem for file per process patterns for large sequential I/O."""
+
+    operation = "write"
+    fields = 1
+    nodes = parameter([1, 4, 8])
+    tasks_per_node = parameter([288])
+    base_path = parameter(["base_path"])
+    chunk_size = parameter([1048576])
+    field_size_per_process_per_dimension = parameter([1073741824])
+    api = "posix"
+
+
+CbenchioPosixSequentialRead = make_read_test(CbenchioPosixSequentialWrite)
+
+
+class CbenchioPosixRandomWrite(CbenchioWrite):
+    """Measure the bandwidth of the filesystem for file per process patterns random 4KiB I/O."""
+
+    operation = "write"
+    random_strided = True
+    fields = 4
+
+    nodes = parameter([1, 4, 8])
+    tasks_per_node = parameter([288])
+    base_path = parameter(["/work/z19/shared/io_benchmarks"])
+    api = "posix"
+    chunk_size = parameter([4096])
+    field_size_per_process_per_dimension = parameter([65536])
+
+
+CbenchioPosixRandomRead = make_read_test(CbenchioPosixRandomWrite)
+
+
+class CbenchioMpi1DWrite(CbenchioWrite):
+    """Ideal scaling of a 1D array with one task per node.
+    This tests the ideal scaling of parallel writes to a single file.
+    """
+
+    operation = "write"
+    file_per_process = False
+    dimensions = 1
+    fields = 4
+    n_dimensions = 1
+    stripe_size = 4194304
+
+    nodes = parameter([1, 4, 8])
+    tasks_per_node = parameter([1])
+    base_path = parameter(["/work/z19/shared/io_benchmarks"])
+    api = "mpi"
+    stripes = parameter(["num_nodes"])
+    field_size_per_process_per_dimension = parameter([1073741824])
+
+
+CbenchioMpi1DRead = make_read_test(CbenchioMpi1DWrite)
+
+
+class CbenchioMpi3DWrite(CbenchioWrite):
+    """Measure the bandwidth of the filesystem for a single file written by all processes in a 3D layout."""
+
+    operation = "write"
+    file_per_process = False
+    dimensions = 3
+    fields = 4
+    n_dimensions = 3
+    stripe_size = 4194304
+    nodes = parameter([1, 4, 8])
+    tasks_per_node = parameter([288])
+    base_path = parameter(["/work/z19/shared/io_benchmarks"])
+    api = "mpi"
+    stripes = parameter([-1])
+    field_size_per_process_per_dimension = parameter([1024])
+
+
+CbenchioMpi3DRead = make_read_test(CbenchioMpi3DWrite)
diff --git a/tests/synth/dstream/dstream.py b/tests/synth/dstream/dstream.py
index fc67d951..76354dbd 100644
--- a/tests/synth/dstream/dstream.py
+++ b/tests/synth/dstream/dstream.py
@@ -31,10 +31,10 @@ class StreamTest(rfm.RegressionTest):
             "Triad": (219400, -0.05, 0.05, "MB/s"),
         },
         "cirrus-ex:compute": {
-            "Copy": (912000, -0.05, 0.05, "MB/s"),
-            "Scale": (799000, -0.05, 0.05, "MB/s"),
-            "Add": (933000, -0.05, 0.05, "MB/s"),
-            "Triad": (889000, -0.05, 0.05, "MB/s"),
+            "Copy": (912000, -0.06, 0.06, "MB/s"),
+            "Scale": (799000, -0.06, 0.06, "MB/s"),
+            "Add": (933000, -0.06, 0.06, "MB/s"),
+            "Triad": (889000, -0.06, 0.06, "MB/s"),
         },
         "cirrus:compute": {
             "Copy": (88898, -0.05, 0.05, "MB/s"),
diff --git a/tests/synth/mdtest/mdtest.py b/tests/synth/mdtest/mdtest.py
new file mode 100644
index 00000000..cee3f6a0
--- /dev/null
+++ b/tests/synth/mdtest/mdtest.py
@@ -0,0 +1,149 @@
+#!/usr/bin/env python3
+"""ReFrame test for mdtest benchmark."""
+
+import reframe as rfm
+import reframe.utility.sanity as sn
+from reframe.core.builtins import performance_function, run_before, sanity_function
+
+
+class Mdtest(rfm.RunOnlyRegressionTest):
+    """Run mdtest with the same configuration as test-run/mdtest/submit.sh."""
+
+    valid_systems = ["cirrus-ex:compute"]
+    valid_prog_environs = ["PrgEnv-gnu"]
+    modules = ["mdtest-gcc"]
+
+    num_cpus_per_task = 1
+    time_limit = "20m"
+    executable = "mdtest"
+
+    env_vars = {
+        "OMP_NUM_THREADS": "1",
+        "OMP_PLACES": "cores",
+    }
+
+    tags = {"performance", "io"}
+
+    # Set the number of tasks based on test parameters, defined in derived classes.
+    @run_after("init")
+    def set_num_tasks(self):
+        """Set the number of tasks based on test parameters."""
+
+        self.num_tasks = self.tasks_per_node * self.nodes
+        self.num_tasks_per_node = self.tasks_per_node
+        self.num_cpus_per_task = 288 // self.tasks_per_node
+
+    @run_before("run")
+    def set_executable_opts(self):
+        """Set the executable options for mdtest based on test parameters."""
+
+        opts = [
+            "-F",
+            "-C",
+            "-T",
+            "-r",
+            "-n",
+            str(self.num_files_per_task),
+            "-N",
+            str(self.num_tasks_per_node),
+            "-d",
+            self.work_directory,
+        ]
+
+        if self.multiple_directories:
+            opts.append("-u")
+
+        self.executable_opts = opts
+
+    @run_before("run")
+    def set_run_options(self):
+        """Set srun options for the job launcher."""
+        self.job.launcher.options = ["--mem=0", "--hint=nomultithread", "--distribution=block:block"]
+        self.postrun_cmds = [f"rm -rf {self.work_directory}"]
+
+    @sanity_function
+    def assert_mdtest_finished(self):
+        """Sanity checks."""
+        return sn.assert_found(r"SUMMARY:\s+\(of\s+1\s+iterations\)", self.stdout)
+
+    @performance_function("ops/s")
+    def file_creation_mean(self):
+        """Extract mean file creation rate from mdtest summary."""
+        return sn.extractsingle(
+            r"^\s*File creation\s*:\s*\S+\s+\S+\s+(\S+)",
+            self.stdout,
+            1,
+            float,
+            item=-1,
+        )
+
+    @performance_function("ops/s")
+    def file_stat_mean(self):
+        """Extract mean file stat rate from mdtest summary."""
+        return sn.extractsingle(
+            r"^\s*File stat\s*:\s*\S+\s+\S+\s+(\S+)",
+            self.stdout,
+            1,
+            float,
+            item=-1,
+        )
+
+    @performance_function("ops/s")
+    def file_removal_mean(self):
+        """Extract mean file removal rate from mdtest summary."""
+        return sn.extractsingle(
+            r"^\s*File removal\s*:\s*\S+\s+\S+\s+(\S+)",
+            self.stdout,
+            1,
+            float,
+            item=-1,
+        )
+
+    @performance_function("ops/s")
+    def tree_creation_mean(self):
+        """Extract mean tree creation rate from mdtest summary."""
+        return sn.extractsingle(
+            r"^\s*Tree creation\s*:\s*\S+\s+\S+\s+(\S+)",
+            self.stdout,
+            1,
+            float,
+            item=-1,
+        )
+
+    @performance_function("ops/s")
+    def tree_removal_mean(self):
+        """Extract mean tree removal rate from mdtest summary."""
+        return sn.extractsingle(
+            r"^\s*Tree removal\s*:\s*\S+\s+\S+\s+(\S+)",
+            self.stdout,
+            1,
+            float,
+            item=-1,
+        )
+
+
+@rfm.simple_test
+class MdtestSingleNode(Mdtest):
+    """Single node multiple directories mdtest test."""
+
+    nodes = 1
+    tasks_per_node = parameter([1, 8, 24, 96, 288])
+
+    num_cpus_per_task = 1
+    time_limit = "20m"
+    num_files_per_task = 1000
+    multiple_directories = True
+    work_directory = parameter(["test_dir"])
+
+
+@rfm.simple_test
+class MdtestMultiNode(Mdtest):
+    """Run mdtest multiple directories on multiple nodes."""
+
+    nodes = parameter([2, 4, 8, 16])
+    tasks_per_node = 288
+    num_cpus_per_task = 1
+    time_limit = "20m"
+    num_files_per_task = 1000
+    multiple_directories = True
+    work_directory = parameter(["test_dir"])
diff --git a/tests/utils/containers/containers.py b/tests/utils/containers/containers.py
index 31f5fff0..937d08ba 100644
--- a/tests/utils/containers/containers.py
+++ b/tests/utils/containers/containers.py
@@ -130,7 +130,7 @@ class OSUContainerTestCirrusEX(rfm.RunOnlyRegressionTest):
         "OMP_NUM_THREADS": str(num_cpus_per_task),
         "OMP_PLACES": "cores",
         "APPTAINERENV_LD_LIBRARY_PATH": "/opt/cray/pe/mpich/8.1.32/ofi/gnu/11.2/lib-abi-mpich:\
-/opt/cray/libfabric/1.22.0/lib64:\
+/opt/cray/libfabric/2.3.1/lib64:\
 /opt/cray/pals/1.6/lib:\
 /opt/cray/pe/lib64:\
 /opt/xpmem/lib64:/lib64",
@@ -139,7 +139,7 @@ class OSUContainerTestCirrusEX(rfm.RunOnlyRegressionTest):
 /etc/host.conf,/etc/libibverbs.d/mlx5.driver,\
 /etc/libnl/classid,\
 /etc/resolv.conf,\
-/opt/cray/libfabric/1.22.0/lib64/libfabric.so.1,\
+/opt/cray/libfabric/2.3.1/lib64/libfabric.so.1,\
 /lib64/libatomic.so.1,\
 /lib64/libgcc_s.so.1,/lib64/libgfortran.so.5,\
 /lib64/libquadmath.so.0,\
@@ -158,7 +158,7 @@ class OSUContainerTestCirrusEX(rfm.RunOnlyRegressionTest):
     }
 
     reference = {
-        "cirrus-ex:compute": {"latency_big": (1100, -0.02, 0.30, "us"), "latency_small": (9.7, -0.05, 0.30, "us")}
+        "cirrus-ex:compute": {"latency_big": (1100, -0.1, 0.30, "us"), "latency_small": (9.7, -0.1, 0.30, "us")}
     }
 
     @require_deps