diff --git a/.circleci/config.yml b/.circleci/config.yml
index d42e6ada13..9765cf6c40 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,8 +2,8 @@
 version: 2.1
 
 orbs:
-  coverage-reporter: codacy/coverage-reporter@11.4.1
-  codecov: codecov/codecov@1.2.3
+  coverage-reporter: codacy/coverage-reporter@13.13.7
+  codecov: codecov/codecov@3.2.5
 
 commands:
   check_changes:
@@ -32,7 +32,7 @@ commands:
             pytest -n 4 --junitxml=test-reports/report.xml
             esmvaltool version
       - store_test_results:
-          path: test-reports/
+          path: test-reports/report.xml
       - store_artifacts:
           path: /logs
       - run:
@@ -124,6 +124,9 @@ jobs:
             - /root/.cache/pip
             - .mypy_cache
             - .pytest_cache
+      - run:
+          name: Install gpg (required by codecov orb)
+          command: apt update && apt install -y gpg
       - codecov/upload:
           when: always
           file: 'test-reports/coverage.xml'
diff --git a/.github/workflows/run-tests-comment.yml b/.github/workflows/run-tests-comment.yml
deleted file mode 100644
index ccae9db0ee..0000000000
--- a/.github/workflows/run-tests-comment.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-name: Test via PR Comment
-on:
-  issue_comment:
-    types:
-      - created
-
-# Required shell entrypoint to have properly configured bash shell
-defaults:
-  run:
-    shell: bash -l {0}
-
-jobs:
-  linux:
-    runs-on: "ubuntu-latest"
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10", "3.11"]
-      fail-fast: false
-    name: Linux Python ${{ matrix.python-version }}
-    if: ${{ github.event.issue.pull_request && github.event.comment.body == '@runGAtests' }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: conda-incubator/setup-miniconda@v2
-        with:
-          activate-environment: esmvalcore
-          environment-file: environment.yml
-          python-version: ${{ matrix.python-version }}
-          miniforge-version: "latest"
-          miniforge-variant: Mambaforge
-          use-mamba: true
-      - run: mkdir -p test_linux_artifacts_python_${{ matrix.python-version }}
-      - run: conda --version 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/conda_version.txt
-      - run: python -V 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/python_version.txt
-      - run: pip install -e .[develop] 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/install.txt
-      - run: flake8
-      - run: pytest -n 2 -m "not installation" 2>&1 | tee test_linux_artifacts_python_${{ matrix.python-version }}/test_report.txt
-      - name: Upload artifacts
-        if: ${{ always() }}  # upload artifacts even if fail
-        uses: actions/upload-artifact@v2
-        with:
-          name: Test_Linux_python_${{ matrix.python-version }}
-          path: test_linux_artifacts_python_${{ matrix.python-version }}
-
-  osx:
-    runs-on: "macos-latest"
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10", "3.11"]
-      fail-fast: false
-    name: OSX Python ${{ matrix.python-version }}
-    if: ${{ github.event.issue.pull_request && github.event.comment.body == '@runGAtests' }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - uses: conda-incubator/setup-miniconda@v2
-        with:
-          activate-environment: esmvalcore
-          environment-file: environment.yml
-          python-version: ${{ matrix.python-version }}
-          miniforge-version: "latest"
-          miniforge-variant: Mambaforge
-          use-mamba: true
-      - run: mkdir -p test_osx_artifacts_python_${{ matrix.python-version }}
-      - run: conda --version 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/conda_version.txt
-      - run: python -V 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/python_version.txt
-      - run: pip install -e .[develop] 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/install.txt
-      - run: flake8
-      - run: pytest -n 2 -m "not installation" 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/test_report.txt
-      - name: Upload artifacts
-        if: ${{ always() }}  # upload artifacts even if fail
-        uses: actions/upload-artifact@v2
-        with:
-          name: Test_OSX_python_${{ matrix.python-version }}
-          path: test_osx_artifacts_python_${{ matrix.python-version }}
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index c95c86a3fc..2e4d195c1c 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -14,9 +14,11 @@ build:
   jobs:
     pre_create_environment:
       # update mamba just in case
-      - mamba update --yes --quiet --name=base mamba
+      - mamba update --yes --quiet --name=base mamba 'zstd=1.5.2'
       - mamba --version
+      - mamba list --name=base
     post_create_environment:
+      - conda run -n ${CONDA_DEFAULT_ENV} mamba list
       # use conda run executable wrapper to have all env variables
       - conda run -n ${CONDA_DEFAULT_ENV} mamba --version
       - conda run -n ${CONDA_DEFAULT_ENV} pip install . --no-deps
diff --git a/CITATION.cff b/CITATION.cff
index 1f5a31582f..70cf872768 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -201,11 +201,11 @@ authors:
     given-names: Joerg
 
 cff-version: 1.2.0
-date-released: 2023-07-04
+date-released: 2023-11-01
 doi: "10.5281/zenodo.3387139"
 license: "Apache-2.0"
 message: "If you use this software, please cite it using these metadata."
 repository-code: "https://github.com/ESMValGroup/ESMValCore/"
 title: ESMValCore
-version: "v2.9.0"
+version: "v2.10.0rc1"
 ...
diff --git a/README.md b/README.md
index 5b51d55cf1..20d13f1637 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,8 @@
 [![codecov](https://codecov.io/gh/ESMValGroup/ESMValCore/branch/main/graph/badge.svg?token=wQnDzguwq6)](https://codecov.io/gh/ESMValGroup/ESMValCore)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/5d496dea9ef64ec68e448a6df5a65783)](https://www.codacy.com/gh/ESMValGroup/ESMValCore?utm_source=github.com&utm_medium=referral&utm_content=ESMValGroup/ESMValCore&utm_campaign=Badge_Grade)
 [![Docker Build Status](https://img.shields.io/docker/cloud/build/esmvalgroup/esmvalcore)](https://hub.docker.com/r/esmvalgroup/esmvalcore/)
-[![Anaconda-Server Badge](https://anaconda.org/conda-forge/esmvalcore/badges/version.svg)](https://anaconda.org/conda-forge/esmvalcore)
+[![Anaconda-Server Badge](https://img.shields.io/badge/Anaconda.org-2.9.0-blue.svg)](https://anaconda.org/conda-forge/esmvalcore)
 [![Github Actions Test](https://github.com/ESMValGroup/ESMValCore/actions/workflows/run-tests.yml/badge.svg)](https://github.com/ESMValGroup/ESMValCore/actions/workflows/run-tests.yml)
-[![Github Actions Dashboard](https://api.meercode.io/badge/ESMValGroup/ESMValCore?type=ci-success-rate&branch=main&lastDay=14)](https://meercode.io)
 
 ![esmvaltoollogo](https://raw.githubusercontent.com/ESMValGroup/ESMValCore/main/doc/figures/ESMValTool-logo-2.png)
 
diff --git a/conda-linux-64.lock b/conda-linux-64.lock
index cda69cb7f4..69c8d6ab36 100644
--- a/conda-linux-64.lock
+++ b/conda-linux-64.lock
@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 2b5ce1d2957de54bf44f92cef302051df5f4407ef5d8d75d24f94604e083413f
+# input_hash: 55d83fc9b0296f7958ba5243657df8702c78bc2ffca2c410e5ded6c9b712abdf
 @EXPLICIT
 https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
 https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2023.7.22-hbcca054_0.conda#a73ecd2988327ad4c8f2c331482917f2
@@ -9,70 +9,68 @@ https://conda.anaconda.org/conda-forge/noarch/font-ttf-inconsolata-3.000-h77eed3
 https://conda.anaconda.org/conda-forge/noarch/font-ttf-source-code-pro-2.038-h77eed37_0.tar.bz2#4d59c254e01d9cde7957100457e2d5fb
 https://conda.anaconda.org/conda-forge/noarch/font-ttf-ubuntu-0.83-hab24e00_0.tar.bz2#19410c3df09dfb12d1206132a1d357c5
 https://conda.anaconda.org/conda-forge/noarch/kernel-headers_linux-64-2.6.32-he073ed8_16.conda#7ca122655873935e02c91279c5b03c8c
-https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.39-hcc3a1bd_1.conda#737be0d34c22d24432049ab7a3214de4
-https://conda.anaconda.org/conda-forge/linux-64/libgcc-devel_linux-64-12.2.0-h3b97bd3_19.tar.bz2#199a7292b1d3535376ecf7670c231d1f
-https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.1.0-h15d22d2_0.conda#afb656a334c409dd9805508af1c89c7a
-https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-devel_linux-64-12.2.0-h3b97bd3_19.tar.bz2#277d373b57791ee71cafc3c5bfcf0641
-https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.1.0-hfd8a6a1_0.conda#067bcc23164642f4c226da631f2a2e1d
+https://conda.anaconda.org/conda-forge/linux-64/ld_impl_linux-64-2.40-h41732ed_0.conda#7aca3059a1729aa76c597603f10b0dd3
+https://conda.anaconda.org/conda-forge/linux-64/libboost-headers-1.82.0-ha770c72_6.conda#a943dcb8fd22cf23ce901ac84f6538c2
+https://conda.anaconda.org/conda-forge/linux-64/libgcc-devel_linux-64-12.3.0-h8bca6fd_2.conda#ed613582de7b8569fdc53ca141be176a
+https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-devel_linux-64-12.3.0-h8bca6fd_2.conda#7268a17e56eb099d1b8869bbbf46de4c
+https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-13.2.0-h7e041cc_2.conda#9172c297304f2a20134fc56c97fbe229
 https://conda.anaconda.org/conda-forge/noarch/poppler-data-0.4.12-hd8ed1ab_0.conda#d8d7293c5b37f39b2ac32940621c6592
-https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.11-3_cp311.conda#c2e2630ddb68cf52eec74dc7dfab20b5
+https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.11-4_cp311.conda#d786502c97404c94d7d58d258a445a65
 https://conda.anaconda.org/conda-forge/noarch/tzdata-2023c-h71feb2d_0.conda#939e3e74d8be4dac89ce83b20de2492a
 https://conda.anaconda.org/conda-forge/noarch/fonts-conda-forge-1-0.tar.bz2#f766549260d6815b0c52253f1fb1bb29
-https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.1.0-h69a702a_0.conda#506dc07710dd5b0ba63cbf134897fc10
-https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.1.0-he5830b7_0.conda#56ca14d57ac29a75d23a39eb3ee0ddeb
+https://conda.anaconda.org/conda-forge/linux-64/libgomp-13.2.0-h807b86a_2.conda#e2042154faafe61969556f28bade94b9
 https://conda.anaconda.org/conda-forge/noarch/sysroot_linux-64-2.12-he073ed8_16.conda#071ea8dceff4d30ac511f4a2f8437cd1
 https://conda.anaconda.org/conda-forge/linux-64/_openmp_mutex-4.5-2_gnu.tar.bz2#73aaf86a425cc6e73fcf236a5a46396d
-https://conda.anaconda.org/conda-forge/linux-64/binutils_impl_linux-64-2.39-he00db2b_1.conda#3d726e8b51a1f5bfd66892a2b7d9db2d
+https://conda.anaconda.org/conda-forge/linux-64/binutils_impl_linux-64-2.40-hf600244_0.conda#33084421a8c0af6aef1b439707f7662a
 https://conda.anaconda.org/conda-forge/noarch/fonts-conda-ecosystem-1-0.tar.bz2#fee5683a3f04bd15cbd8318b096a27ab
-https://conda.anaconda.org/conda-forge/linux-64/binutils-2.39-hdd6e379_1.conda#1276c18b0a562739185dbf5bd14b57b2
-https://conda.anaconda.org/conda-forge/linux-64/binutils_linux-64-2.39-h5fc0e48_13.conda#7f25a524665e4e2f8a5f86522f8d0e31
-https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.1.0-he5830b7_0.conda#cd93f779ff018dd85c7544c015c9db3c
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.8.23-hd590300_0.conda#cc4f06f7eedb1523f3b83fd0fb3942ff
+https://conda.anaconda.org/conda-forge/linux-64/binutils-2.40-hdd6e379_0.conda#ccc940fddbc3fcd3d79cd4c654c4b5c4
+https://conda.anaconda.org/conda-forge/linux-64/binutils_linux-64-2.40-hbdbef99_2.conda#adfebae9fdc63a598495dfe3b006973a
+https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-13.2.0-h807b86a_2.conda#c28003b0be0494f9a7664389146716ff
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-common-0.9.4-hd590300_0.conda#8dacaf703f8e57aa0c4f0c5c8f4be39b
 https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.8-h7f98852_4.tar.bz2#a1fd65c7ccbf10880423d82bca54eb54
-https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.19.1-hd590300_0.conda#e8c18d865be43e2fb3f7a145b6adf1f5
-https://conda.anaconda.org/conda-forge/linux-64/freexl-1.0.6-h166bdaf_1.tar.bz2#897e772a157faf3330d72dd291486f62
+https://conda.anaconda.org/conda-forge/linux-64/c-ares-1.20.1-hd590300_1.conda#2facbaf5ee1a56967aecaee89799160e
 https://conda.anaconda.org/conda-forge/linux-64/fribidi-1.0.10-h36c2ea0_0.tar.bz2#ac7bc6a654f8f41b352b38f4051135f8
-https://conda.anaconda.org/conda-forge/linux-64/geos-3.11.2-hcb278e6_0.conda#3b8e364995e3575e57960d29c1e5ab14
+https://conda.anaconda.org/conda-forge/linux-64/geos-3.12.0-h59595ed_0.conda#3fdf79ef322c8379ae83be491d805369
 https://conda.anaconda.org/conda-forge/linux-64/gettext-0.21.1-h27087fc_0.tar.bz2#14947d8770185e5153fdd04d4673ed37
 https://conda.anaconda.org/conda-forge/linux-64/gflags-2.2.2-he1b5a44_1004.tar.bz2#cddaf2c63ea4a5901cf09524c490ecdc
 https://conda.anaconda.org/conda-forge/linux-64/giflib-5.2.1-h0b41bf4_3.conda#96f3b11872ef6fad973eac856cd2624f
 https://conda.anaconda.org/conda-forge/linux-64/gmp-6.2.1-h58526e2_0.tar.bz2#b94cf2db16066b242ebd26db2facbd56
 https://conda.anaconda.org/conda-forge/linux-64/graphite2-1.3.13-h58526e2_1001.tar.bz2#8c54672728e8ec6aa6db90cf2806d220
-https://conda.anaconda.org/conda-forge/linux-64/icu-72.1-hcb278e6_0.conda#7c8d20d847bb45f56bd941578fcfa146
-https://conda.anaconda.org/conda-forge/linux-64/json-c-0.16-hc379101_0.tar.bz2#0e2bca6857cb73acec30387fef7c3142
+https://conda.anaconda.org/conda-forge/linux-64/icu-73.2-h59595ed_0.conda#cc47e1facc155f91abd89b11e48e72ff
+https://conda.anaconda.org/conda-forge/linux-64/json-c-0.17-h7ab15ed_0.conda#9961b1f100c3b6852bd97c9233d06979
 https://conda.anaconda.org/conda-forge/linux-64/keyutils-1.6.1-h166bdaf_0.tar.bz2#30186d27e2c9fa62b45fb1476b7200e3
 https://conda.anaconda.org/conda-forge/linux-64/lerc-4.0.0-h27087fc_0.tar.bz2#76bbff344f0134279f225174e9064c8f
-https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230125.3-cxx17_h59595ed_0.conda#d1db1b8be7c3a8983dcbbbfe4f0765de
-https://conda.anaconda.org/conda-forge/linux-64/libaec-1.0.6-hcb278e6_1.conda#0f683578378cddb223e7fd24f785ab2a
-https://conda.anaconda.org/conda-forge/linux-64/libbrotlicommon-1.0.9-h166bdaf_9.conda#61641e239f96eae2b8492dc7e755828c
+https://conda.anaconda.org/conda-forge/linux-64/libabseil-20230802.1-cxx17_h59595ed_0.conda#2785ddf4cb0e7e743477991d64353947
+https://conda.anaconda.org/conda-forge/linux-64/libaec-1.1.2-h59595ed_1.conda#127b0be54c1c90760d7fe02ea7a56426
+https://conda.anaconda.org/conda-forge/linux-64/libbrotlicommon-1.1.0-hd590300_1.conda#aec6c91c7371c26392a06708a73c70e5
 https://conda.anaconda.org/conda-forge/linux-64/libcrc32c-1.1.2-h9c3ff4c_0.tar.bz2#c965a5aa0d5c1c37ffc62dff36e28400
-https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.18-h0b41bf4_0.conda#6aa9c9de5542ecb07fdda9ca626252d8
+https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.19-hd590300_0.conda#1635570038840ee3f9c71d22aa5b8b6d
 https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-h516909a_1.tar.bz2#6f8720dff19e17ce5d48cfe7f3d2f0a3
 https://conda.anaconda.org/conda-forge/linux-64/libexpat-2.5.0-hcb278e6_1.conda#6305a3dd2752c76335295da4e581f2fd
 https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2#d645c6d2ac96843a2bfaccd2d62b3ac3
+https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-13.2.0-ha4646dd_2.conda#78fdab09d9138851dde2b5fe2a11019e
 https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.17-h166bdaf_0.tar.bz2#b62b52da46c39ee2bc3c162ac7f1804d
-https://conda.anaconda.org/conda-forge/linux-64/libjpeg-turbo-2.1.5.1-h0b41bf4_0.conda#1edd9e67bdb90d78cea97733ff6b54e6
-https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.0-h7f98852_0.tar.bz2#39b1328babf85c7c3a61636d9cd50206
+https://conda.anaconda.org/conda-forge/linux-64/libjpeg-turbo-3.0.0-hd590300_1.conda#ea25936bb4080d843790b586850f82b8
+https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.1-hd590300_0.conda#30fd6e37fe21f86f4bd26d6ee73eeec7
 https://conda.anaconda.org/conda-forge/linux-64/libnuma-2.0.16-h0b41bf4_1.conda#28bfe2cb11357ccc5be21101a6b7ce86
-https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.23-pthreads_h80387f5_0.conda#9c5ea51ccb8ffae7d06c645869d24ce6
-https://conda.anaconda.org/conda-forge/linux-64/libsanitizer-12.2.0-h46fd767_19.tar.bz2#80d0e00150401e9c06a055f36e8e73f2
+https://conda.anaconda.org/conda-forge/linux-64/libsanitizer-12.3.0-h0f45ef3_2.conda#4655db64eca78a6fcc4fb654fc1f8d57
 https://conda.anaconda.org/conda-forge/linux-64/libsodium-1.0.18-h36c2ea0_1.tar.bz2#c3788462a6fbddafdb413a9f9053e58d
 https://conda.anaconda.org/conda-forge/linux-64/libtool-2.4.7-h27087fc_0.conda#f204c8ba400ec475452737094fb81d52
 https://conda.anaconda.org/conda-forge/linux-64/libutf8proc-2.8.0-h166bdaf_0.tar.bz2#ede4266dc02e875fe1ea77b25dd43747
 https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.38.1-h0b41bf4_0.conda#40b61aab5c7ba9ff276c41cfffe6b80b
-https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.3.1-hd590300_0.conda#82bf6f63eb15ef719b556b63feec3a77
+https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.3.2-hd590300_0.conda#30de3fd9b3b602f7473f30e684eeea8c
 https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.13-hd590300_5.conda#f36c115f1ee199da648e0597ec2047ad
 https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.9.4-hcb278e6_0.conda#318b08df404f9c9be5712aaa5a6f0bb0
 https://conda.anaconda.org/conda-forge/linux-64/lzo-2.10-h516909a_1000.tar.bz2#bb14fcb13341b81d5eb386423b9d2bac
-https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.4-hcb278e6_0.conda#681105bccc2a3f7f1a837d47d39c9179
+https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.4-h59595ed_2.conda#7dbaa197d7ba6032caf7ae7f32c1efa0
 https://conda.anaconda.org/conda-forge/linux-64/nspr-4.35-h27087fc_0.conda#da0ec11a6454ae19bff5b02ed881a2b1
-https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.2-hd590300_0.conda#e5ac5227582d6c83ccf247288c0eb095
-https://conda.anaconda.org/conda-forge/linux-64/pixman-0.40.0-h36c2ea0_0.tar.bz2#660e72c82f2e75a6b3fe6a6e75c79f19
+https://conda.anaconda.org/conda-forge/linux-64/openssl-3.1.4-hd590300_0.conda#412ba6938c3e2abaca8b1129ea82e238
+https://conda.anaconda.org/conda-forge/linux-64/pixman-0.42.2-h59595ed_0.conda#700edd63ccd5fc66b70b1c028cea9a68
 https://conda.anaconda.org/conda-forge/linux-64/pthread-stubs-0.4-h36c2ea0_1001.tar.bz2#22dad4df6e8630e8dff2428f6f6a7036
 https://conda.anaconda.org/conda-forge/linux-64/rdma-core-28.9-h59595ed_1.conda#aeffb7c06b5f65e55e6c637408dc4100
-https://conda.anaconda.org/conda-forge/linux-64/re2-2023.03.02-h8c504da_0.conda#206f8fa808748f6e90599c3368a1114e
 https://conda.anaconda.org/conda-forge/linux-64/snappy-1.1.10-h9fff704_0.conda#e6d228cd0bb74a51dd18f5bfce0b4115
 https://conda.anaconda.org/conda-forge/linux-64/tzcode-2023c-h0b41bf4_0.conda#0c0533894f21c3d35697cb8378d390e2
+https://conda.anaconda.org/conda-forge/linux-64/uriparser-0.9.7-hcb278e6_1.conda#2c46deb08ba9b10e90d0a6401ad65deb
 https://conda.anaconda.org/conda-forge/linux-64/xorg-kbproto-1.0.7-h7f98852_1002.tar.bz2#4b230e8381279d76131116660f5a241a
 https://conda.anaconda.org/conda-forge/linux-64/xorg-libice-1.1.1-hd590300_0.conda#b462a33c0be1421532f28bfe8f4a7514
 https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.11-hd590300_0.conda#2c80dc38fface310c9bd81b17037fee5
@@ -80,139 +78,141 @@ https://conda.anaconda.org/conda-forge/linux-64/xorg-libxdmcp-1.1.3-h7f98852_0.t
 https://conda.anaconda.org/conda-forge/linux-64/xorg-renderproto-0.11.1-h7f98852_1002.tar.bz2#06feff3d2634e3097ce2fe681474b534
 https://conda.anaconda.org/conda-forge/linux-64/xorg-xextproto-7.3.0-h0b41bf4_1003.conda#bce9f945da8ad2ae9b1d7165a64d0f87
 https://conda.anaconda.org/conda-forge/linux-64/xorg-xproto-7.0.31-h7f98852_1007.tar.bz2#b4a4381d54784606820704f7b5f05a15
-https://conda.anaconda.org/conda-forge/linux-64/xxhash-0.8.1-h0b41bf4_0.conda#e9c3bcf0e0c719431abec8ca447eee27
+https://conda.anaconda.org/conda-forge/linux-64/xxhash-0.8.2-hd590300_0.conda#f08fb5c89edfc4aadee1c81d4cfb1fa1
 https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.6-h166bdaf_0.tar.bz2#2161070d867d1b1204ea749c8eec4ef0
 https://conda.anaconda.org/conda-forge/linux-64/yaml-0.2.5-h7f98852_2.tar.bz2#4cb3ad778ec2d5a7acbdf254eb1c42ae
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-cal-0.6.0-h93469e0_0.conda#580a52a05f5be28ce00764149017c6d4
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-compression-0.2.17-h862ab75_1.conda#0013fcee7acb3cfc801c5929824feb3c
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-sdkutils-0.1.12-h862ab75_0.conda#be7020c516cdf1e5937bc56e37aca7ca
-https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.16-h862ab75_1.conda#f883d61afbc95c50f7b3f62546da4235
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-cal-0.6.7-h6e18cf3_0.conda#cdbd44927a53a313d69f3c206a418dd2
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-compression-0.2.17-h037bafe_4.conda#72cb3661f349a95ea48b0ddcdc4c0f18
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-sdkutils-0.1.12-h037bafe_3.conda#6c2ea725535e0f2a18f645a0bf03a8f6
+https://conda.anaconda.org/conda-forge/linux-64/aws-checksums-0.1.17-h037bafe_3.conda#ac1b0e60de127cc46a04e76a907434a1
 https://conda.anaconda.org/conda-forge/linux-64/expat-2.5.0-hcb278e6_1.conda#8b9b5aca60558d02ddaa09d599e55920
-https://conda.anaconda.org/conda-forge/linux-64/gcc_impl_linux-64-12.2.0-hcc96c02_19.tar.bz2#bb48ea333c8e6dcc159a1575f04d869e
+https://conda.anaconda.org/conda-forge/linux-64/gcc_impl_linux-64-12.3.0-he2b93b0_2.conda#2f4d8677dc7dd87f93e9abfb2ce86808
 https://conda.anaconda.org/conda-forge/linux-64/glog-0.6.0-h6f12383_0.tar.bz2#b31f3565cb84435407594e548a2fb7b2
-https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.15-h501b40f_6.conda#c3e9338e15d90106f467377017352b97
-https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-17_linux64_openblas.conda#57fb44770b1bc832fb2dbefa1bd502de
-https://conda.anaconda.org/conda-forge/linux-64/libbrotlidec-1.0.9-h166bdaf_9.conda#081aa22f4581c08e4372b0b6c2f8478e
-https://conda.anaconda.org/conda-forge/linux-64/libbrotlienc-1.0.9-h166bdaf_9.conda#1f0a03af852a9659ed2bf08f2f1704fd
+https://conda.anaconda.org/conda-forge/linux-64/hdf4-4.2.15-h2a13503_7.conda#bd77f8da987968ec3927990495dc22e4
+https://conda.anaconda.org/conda-forge/linux-64/libbrotlidec-1.1.0-hd590300_1.conda#f07002e225d7a60a694d42a7bf5ff53f
+https://conda.anaconda.org/conda-forge/linux-64/libbrotlienc-1.1.0-hd590300_1.conda#5fc11c6020d421960607d821310fcd4d
 https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20191231-he28a2e2_2.tar.bz2#4d331e44109e3f0e19b4cb8f9b82f3e1
 https://conda.anaconda.org/conda-forge/linux-64/libevent-2.1.12-hf998b51_1.conda#a1cfcc585f0c42bf8d5546bb1dfb668d
-https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.52.0-h61bc06f_0.conda#613955a50485812985c059e7b269f42e
+https://conda.anaconda.org/conda-forge/linux-64/libgfortran-ng-13.2.0-h69a702a_2.conda#e75a75a6eaf6f318dae2631158c46575
+https://conda.anaconda.org/conda-forge/linux-64/libkml-1.3.0-h01aab08_1018.conda#3eb5f16bcc8a02892199aa63555c731f
+https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.55.1-h47da74e_0.conda#a802251d1eaeeae041c867faf0f94fa8
 https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.39-h753d276_0.conda#e1c890aebdebbfbf87e2c917187b4416
-https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-4.23.3-hd1fb520_0.conda#c8da7f04073ed0fabcb60885a4c1a722
-https://conda.anaconda.org/conda-forge/linux-64/librttopo-1.1.0-h0d5128d_13.conda#e1d6139ff0500977a760567a4bec1ce9
-https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.42.0-h2797004_0.conda#fdaae20a1cf7cd62130a0973190a31b7
+https://conda.anaconda.org/conda-forge/linux-64/libprotobuf-4.24.3-hf27288f_1.conda#5097789a2bc83e697d7509df57f25bfd
+https://conda.anaconda.org/conda-forge/linux-64/libre2-11-2023.06.02-h7a70373_0.conda#c0e7eacd9694db3ef5ef2979a7deea70
+https://conda.anaconda.org/conda-forge/linux-64/librttopo-1.1.0-hb58d41b_14.conda#264f9a3a4ea52c8f4d3e8ae1213a3335
+https://conda.anaconda.org/conda-forge/linux-64/libsqlite-3.44.0-h2797004_0.conda#b58e6816d137f3aabf77d341dd5d732b
 https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.11.0-h0841786_0.conda#1f5a58e686b13bcfde88b93f547d23fe
+https://conda.anaconda.org/conda-forge/linux-64/libudunits2-2.2.28-h40f5838_3.conda#4bdace082e911a3e1f1f0b721bed5b56
 https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.15-h0b41bf4_0.conda#33277193f5b92bad9fdd230eb700929c
-https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.11.5-h0d562d8_0.conda#558ab736404275d7df61c473c1af35aa
-https://conda.anaconda.org/conda-forge/linux-64/libzip-1.9.2-hc929e4a_1.tar.bz2#5b122b50e738c4be5c3f2899f010d7cf
+https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.11.5-h232c23b_1.conda#f3858448893839820d4bcfb14ad3ecdf
+https://conda.anaconda.org/conda-forge/linux-64/libzip-1.10.1-h2629f0a_3.conda#ac79812548e7e8cf61f7b0abdef01d3b
 https://conda.anaconda.org/conda-forge/linux-64/pcre2-10.40-hc3806b6_0.tar.bz2#69e2c796349cd9b273890bee0febfe1b
 https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda#47d31b792659ce70f470b5c82fdfb7a4
-https://conda.anaconda.org/conda-forge/linux-64/s2n-1.3.46-h06160fa_0.conda#413d96a0b655c8f8aacc36473a2dbb04
-https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.12-h27826a3_0.tar.bz2#5b8c42eb62e9fc961af70bdd6a26e168
-https://conda.anaconda.org/conda-forge/linux-64/ucx-1.14.1-hf587318_2.conda#37b27851c8d5a9a98e61ecd36aa990a7
+https://conda.anaconda.org/conda-forge/linux-64/s2n-1.3.55-h06160fa_0.conda#8cdfb7d58bdfd543717eeacc0801f3c0
+https://conda.anaconda.org/conda-forge/linux-64/tk-8.6.13-h2797004_0.conda#513336054f884f95d9fd925748f41ef3
+https://conda.anaconda.org/conda-forge/linux-64/ucx-1.15.0-h64cca9d_0.conda#b35b1f1a9fdbf93266c91f297dc9060e
 https://conda.anaconda.org/conda-forge/linux-64/xorg-libsm-1.2.4-h7391055_0.conda#93ee23f12bc2e684548181256edd2cf6
-https://conda.anaconda.org/conda-forge/linux-64/zeromq-4.3.4-h9c3ff4c_1.tar.bz2#21743a8d2ea0c8cfbbf8fe489b0347df
+https://conda.anaconda.org/conda-forge/linux-64/zeromq-4.3.5-h59595ed_0.conda#8851084c192dbc56215ac4e3c9aa30fa
 https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.13-hd590300_5.conda#68c34ec6149623be41a1933ab996a209
-https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.2-hfc55251_7.conda#32ae18eb2a687912fc9e92a501c0a11b
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-io-0.13.28-h3870b5a_0.conda#b775667301ab249f94ad2bea91fc4223
-https://conda.anaconda.org/conda-forge/linux-64/blosc-1.21.4-h0f2a231_0.conda#876286b5941933a0f558777e57d883cc
-https://conda.anaconda.org/conda-forge/linux-64/boost-cpp-1.78.0-h6582d0a_3.conda#d3c3c7698d0b878aab1b86db95407c8e
-https://conda.anaconda.org/conda-forge/linux-64/brotli-bin-1.0.9-h166bdaf_9.conda#d47dee1856d9cb955b8076eeff304a5b
-https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-hca18f0e_1.conda#e1232042de76d24539a436d37597eb06
-https://conda.anaconda.org/conda-forge/linux-64/gcc-12.2.0-h26027b1_13.conda#ec93d13e0fe8514f65842120dbae1b16
-https://conda.anaconda.org/conda-forge/linux-64/gcc_linux-64-12.2.0-h4798a0e_13.conda#1d009211292e0d869a31f3bc5b4ee78b
-https://conda.anaconda.org/conda-forge/linux-64/gfortran_impl_linux-64-12.2.0-h55be85b_19.tar.bz2#143d770a2a2911cd84b98286db0e6a40
-https://conda.anaconda.org/conda-forge/linux-64/gxx_impl_linux-64-12.2.0-hcc96c02_19.tar.bz2#698aae34e4f5e0ea8eac0d529c8f20b6
-https://conda.anaconda.org/conda-forge/linux-64/krb5-1.21.1-h659d440_0.conda#1b5126ec25763eb17ef74c8763d26e84
-https://conda.anaconda.org/conda-forge/linux-64/libarchive-3.6.2-h039dbb9_1.conda#29cf970521d30d113f3425b84cb250f6
-https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-17_linux64_openblas.conda#7ef0969b00fe3d6eef56a8151d3afb29
-https://conda.anaconda.org/conda-forge/linux-64/libglib-2.76.4-hebfc3b9_0.conda#c6f951789c888f7bbd2dd6858eab69de
-https://conda.anaconda.org/conda-forge/linux-64/libgrpc-1.56.2-h3905398_0.conda#a87e780f3d9cc7cf432e47ced83a67ce
-https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-17_linux64_openblas.conda#a2103882c46492e26500fcb56c03de8b
-https://conda.anaconda.org/conda-forge/linux-64/libthrift-0.18.1-h8fd135c_2.conda#bbf65f7688512872f063810623b755dc
-https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.5.1-h8b53f26_0.conda#8ad377fb60abab446a9f02c62b3c2190
+https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.5-hfc55251_0.conda#04b88013080254850d6c01ed54810589
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-io-0.13.35-hd1885a1_4.conda#a0728c6591063bee78f037741d1da83b
+https://conda.anaconda.org/conda-forge/linux-64/blosc-1.21.5-h0f2a231_0.conda#009521b7ed97cca25f8f997f9e745976
+https://conda.anaconda.org/conda-forge/linux-64/brotli-bin-1.1.0-hd590300_1.conda#39f910d205726805a958da408ca194ba
+https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-h267a509_2.conda#9ae35c3d96db2c94ce0cef86efdfa2cb
+https://conda.anaconda.org/conda-forge/linux-64/gcc-12.3.0-h8d2909c_2.conda#e2f2f81f367e14ca1f77a870bda2fe59
+https://conda.anaconda.org/conda-forge/linux-64/gcc_linux-64-12.3.0-h76fc315_2.conda#11517e7b5c910c5b5d6985c0c7eb7f50
+https://conda.anaconda.org/conda-forge/linux-64/gfortran_impl_linux-64-12.3.0-hfcedea8_2.conda#09d48cadff6669068c3bf7ae7dc8ea4a
+https://conda.anaconda.org/conda-forge/linux-64/gxx_impl_linux-64-12.3.0-he2b93b0_2.conda#f89b9916afc36fc5562fbfc11330a8a2
+https://conda.anaconda.org/conda-forge/linux-64/krb5-1.21.2-h659d440_0.conda#cd95826dbd331ed1be26bdf401432844
+https://conda.anaconda.org/conda-forge/linux-64/libarchive-3.7.2-h039dbb9_0.conda#611d6c83d1130ea60c916531adfb11db
+https://conda.anaconda.org/conda-forge/linux-64/libglib-2.78.0-hebfc3b9_0.conda#e618003da3547216310088478e475945
+https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.24-pthreads_h413a1c8_0.conda#6e4ef6ca28655124dcde9bd500e44c32
+https://conda.anaconda.org/conda-forge/linux-64/libthrift-0.19.0-hb90f79a_1.conda#8cdb7d41faa0260875ba92414c487e2d
+https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.6.0-ha9c0a0a_2.conda#55ed21669b2015f77c180feb1dd41930
 https://conda.anaconda.org/conda-forge/linux-64/libxslt-1.1.37-h0054252_1.conda#f27960e8873abb5476e96ef33bdbdccd
-https://conda.anaconda.org/conda-forge/linux-64/nss-3.89-he45b914_0.conda#2745719a58eeaab6657256a3f142f099
-https://conda.anaconda.org/conda-forge/linux-64/orc-1.9.0-h385abfd_1.conda#2cd5aac7ef1b4c6ac51bf521251a89b3
+https://conda.anaconda.org/conda-forge/linux-64/minizip-4.0.2-h0ab5242_0.conda#c6eafb51b60db59fd2132f6bbaada9b3
+https://conda.anaconda.org/conda-forge/linux-64/nss-3.94-h1d7d5a4_0.conda#7caef74bbfa730e014b20f0852068509
+https://conda.anaconda.org/conda-forge/linux-64/orc-1.9.0-h208142c_3.conda#f983ae19192439116ca5b5589560f167
 https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.1.3-h32600fe_0.conda#8287aeb8462e2d4b235eff788e75919d
-https://conda.anaconda.org/conda-forge/linux-64/python-3.11.4-hab00c5b_0_cpython.conda#1c628861a2a126b9fc9363ca1b7d014e
-https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.42.0-h2c6b66d_0.conda#1192f6ec654a5bc4ee1d64bdc4a3e5cc
-https://conda.anaconda.org/conda-forge/linux-64/udunits2-2.2.28-hc3e0081_0.tar.bz2#d4c341e0379c31e9e781d4f204726867
-https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.6-h8ee46fc_0.conda#7590b76c3d11d21caa44f3fc38ac584a
+https://conda.anaconda.org/conda-forge/linux-64/python-3.11.6-hab00c5b_0_cpython.conda#b0dfbe2fcbfdb097d321bfd50ecddab1
+https://conda.anaconda.org/conda-forge/linux-64/re2-2023.06.02-h2873b5e_0.conda#bb2d5e593ef13fe4aff0bc9440f945ae
+https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.44.0-h2c6b66d_0.conda#df56c636df4a98990462d66ac7be2330
+https://conda.anaconda.org/conda-forge/linux-64/udunits2-2.2.28-h40f5838_3.conda#6bb8deb138f87c9d48320ac21b87e7a1
+https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.8.7-h8ee46fc_0.conda#49e482d882669206653b095f5206c05b
 https://conda.anaconda.org/conda-forge/noarch/alabaster-0.7.13-pyhd8ed1ab_0.conda#06006184e203b61d3525f90de394471e
-https://conda.anaconda.org/conda-forge/linux-64/antlr-python-runtime-4.7.2-py311h38be061_1003.tar.bz2#0ab8f8f0cae99343907fe68cda11baea
+https://conda.anaconda.org/conda-forge/noarch/antlr-python-runtime-4.11.1-pyhd8ed1ab_0.tar.bz2#15109c4977d39ad7aa3423f57243e286
 https://conda.anaconda.org/conda-forge/linux-64/atk-1.0-2.38.0-hd4edc92_1.tar.bz2#6c72ec3e660a51736913ef6ea68c454b
 https://conda.anaconda.org/conda-forge/noarch/attrs-23.1.0-pyh71513ae_1.conda#3edfead7cedd1ab4400a6c588f3e75f8
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.3.1-h9599702_1.conda#a8820ce2dbe6f7d54f6540d9a3a0028a
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-http-0.7.11-hbe98c3e_0.conda#067641478d8f706b80a5a434a22b82be
-https://conda.anaconda.org/conda-forge/noarch/backcall-0.2.0-pyh9f0ad1d_0.tar.bz2#6006a6d08a3fa99268a2681c7fb55213
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-event-stream-0.3.2-he4fbe49_4.conda#38da036c9d74d4d44f35e05474135f77
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-http-0.7.13-hbbfb9a7_7.conda#2c4c47d83a0e111799dda4059c88621d
 https://conda.anaconda.org/conda-forge/noarch/backports-1.0-pyhd8ed1ab_3.conda#54ca2e08b3220c148a1d8329c2678e02
-https://conda.anaconda.org/conda-forge/linux-64/backports.zoneinfo-0.2.1-py311h38be061_7.tar.bz2#ec62b3c5b953cb610f5e2b09cd776caf
-https://conda.anaconda.org/conda-forge/linux-64/brotli-1.0.9-h166bdaf_9.conda#4601544b4982ba1861fa9b9c607b2c06
-https://conda.anaconda.org/conda-forge/linux-64/brotli-python-1.0.9-py311ha362b79_9.conda#ced5340f5dc6cff43a80deac8d0e398f
+https://conda.anaconda.org/conda-forge/linux-64/backports.zoneinfo-0.2.1-py311h38be061_8.conda#5384590f14dfe6ccd02811236afc9f8e
+https://conda.anaconda.org/conda-forge/linux-64/brotli-1.1.0-hd590300_1.conda#f27a24d46e3ea7b70a1f98e50c62508f
+https://conda.anaconda.org/conda-forge/linux-64/brotli-python-1.1.0-py311hb755f60_1.conda#cce9e7c3f1c307f2a5fb08a2922d6164
 https://conda.anaconda.org/conda-forge/linux-64/c-compiler-1.6.0-hd590300_0.conda#ea6c792f792bdd7ae6e7e2dee32f0a48
 https://conda.anaconda.org/conda-forge/noarch/certifi-2023.7.22-pyhd8ed1ab_0.conda#7f3dbc9179b4dde7da98dfb151d0ad22
 https://conda.anaconda.org/conda-forge/noarch/cfgv-3.3.1-pyhd8ed1ab_0.tar.bz2#ebb5f5f7dc4f1a3780ef7ea7738db08c
-https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.2.0-pyhd8ed1ab_0.conda#313516e9a4b08b12dfb1e1cd390a96e3
-https://conda.anaconda.org/conda-forge/noarch/click-8.1.6-unix_pyh707e725_0.conda#64dbb3b205546691a61204d1cfb208e3
-https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.2.1-pyhd8ed1ab_0.conda#b325bfc4cff7d7f8a868f1f7ecc4ed16
-https://conda.anaconda.org/conda-forge/noarch/codespell-2.2.5-pyhd8ed1ab_0.conda#c73551c990f6e7e9c83cdb8bdbafdeb8
+https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.3.2-pyhd8ed1ab_0.conda#7f4a9e3fcff3f6356ae99244a014da6a
+https://conda.anaconda.org/conda-forge/noarch/click-8.1.7-unix_pyh707e725_0.conda#f3ad426304898027fc619827ff428eca
+https://conda.anaconda.org/conda-forge/noarch/cloudpickle-3.0.0-pyhd8ed1ab_0.conda#753d29fe41bb881e4b9c004f0abf973f
+https://conda.anaconda.org/conda-forge/noarch/codespell-2.2.6-pyhd8ed1ab_0.conda#a206349b7bb7475ae580f987cb425bdd
 https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_0.tar.bz2#3faab06a954c2a04039983f2c4a50d99
-https://conda.anaconda.org/conda-forge/noarch/cycler-0.11.0-pyhd8ed1ab_0.tar.bz2#a50559fad0affdbb33729a68669ca1cb
-https://conda.anaconda.org/conda-forge/linux-64/cython-3.0.0-py311hb755f60_0.conda#257dfede48699e2e6372528d08399e5a
+https://conda.anaconda.org/conda-forge/noarch/cycler-0.12.1-pyhd8ed1ab_0.conda#5cd86562580f274031ede6aa6aa24441
+https://conda.anaconda.org/conda-forge/linux-64/cython-3.0.5-py311hb755f60_0.conda#25b42509a68f96e612534af3fe2cf033
 https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
 https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
 https://conda.anaconda.org/conda-forge/noarch/dill-0.3.7-pyhd8ed1ab_0.conda#5e4f3466526c52bc9af2d2353a1460bd
 https://conda.anaconda.org/conda-forge/noarch/distlib-0.3.7-pyhd8ed1ab_0.conda#12d8aae6994f342618443a8f05c652a0
-https://conda.anaconda.org/conda-forge/linux-64/docutils-0.20.1-py311h38be061_0.conda#207175b7d514d42f977ec505800d6824
+https://conda.anaconda.org/conda-forge/linux-64/docutils-0.20.1-py311h38be061_2.conda#33f8066e53679dd4be2355fec849bf01
 https://conda.anaconda.org/conda-forge/noarch/dodgy-0.2.1-py_0.tar.bz2#62a69d073f7446c90f417b0787122f5b
 https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.2-pyhd8ed1ab_0.conda#de4cb3384374e1411f0454edcf546cdb
+https://conda.anaconda.org/conda-forge/noarch/exceptiongroup-1.1.3-pyhd8ed1ab_0.conda#e6518222753f519e911e83136d2158d9
 https://conda.anaconda.org/conda-forge/noarch/execnet-2.0.2-pyhd8ed1ab_0.conda#67de0d8241e1060a479e3c37793e26f9
-https://conda.anaconda.org/conda-forge/noarch/executing-1.2.0-pyhd8ed1ab_0.tar.bz2#4c1bc140e2be5c8ba6e3acab99e25c50
-https://conda.anaconda.org/conda-forge/noarch/filelock-3.12.2-pyhd8ed1ab_0.conda#53522ec72e6adae42bd373ef58357230
+https://conda.anaconda.org/conda-forge/noarch/executing-2.0.1-pyhd8ed1ab_0.conda#e16be50e378d8a4533b989035b196ab8
+https://conda.anaconda.org/conda-forge/noarch/filelock-3.13.1-pyhd8ed1ab_0.conda#0c1729b74a8152fde6a38ba0a2ab9f45
 https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.14.2-h14ed4e7_0.conda#0f69b688f52ff6da70bccb7ff7001d1d
-https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.6.0-pyh1a96a4e_0.conda#50ea2067ec92dfcc38b4f07992d7e235
-https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.10-h6b639ba_2.conda#ee8220db21db8094998005990418fe5b
+https://conda.anaconda.org/conda-forge/linux-64/freexl-2.0.0-h743c826_0.conda#12e6988845706b2cfbc3bc35c9a61a95
+https://conda.anaconda.org/conda-forge/noarch/fsspec-2023.10.0-pyhca7485f_0.conda#5b86cf1ceaaa9be2ec4627377e538db1
+https://conda.anaconda.org/conda-forge/linux-64/gdk-pixbuf-2.42.10-h829c605_4.conda#252a696860674caf7a855e16f680d63a
 https://conda.anaconda.org/conda-forge/noarch/geographiclib-1.52-pyhd8ed1ab_0.tar.bz2#6880e7100ebae550a33ce26663316d85
-https://conda.anaconda.org/conda-forge/linux-64/gfortran-12.2.0-h8acd90e_13.conda#ca62fa3fcd15a7d92194ee2ff7c9c54b
-https://conda.anaconda.org/conda-forge/linux-64/gfortran_linux-64-12.2.0-h307d370_13.conda#d4a4dd80f5a470407eed32cb2932174a
+https://conda.anaconda.org/conda-forge/linux-64/gfortran-12.3.0-h499e0f7_2.conda#0558a8c44eb7a18e6682bd3a8ae6dcab
+https://conda.anaconda.org/conda-forge/linux-64/gfortran_linux-64-12.3.0-h7fe76b4_2.conda#3a749210487c0358b6f135a648cbbf60
 https://conda.anaconda.org/conda-forge/linux-64/gts-0.7.6-h977cf35_4.conda#4d8df0b0db060d33c9a702ada998a8fe
-https://conda.anaconda.org/conda-forge/linux-64/gxx-12.2.0-h26027b1_13.conda#de605ff437f3fdc010f1b529642339f1
-https://conda.anaconda.org/conda-forge/linux-64/gxx_linux-64-12.2.0-hb41e900_13.conda#cf45659115653fc80623116ccd0a6ae2
-https://conda.anaconda.org/conda-forge/linux-64/humanfriendly-10.0-py311h38be061_4.tar.bz2#5c4f38a9e482f00a7bf23fe479c8ca29
+https://conda.anaconda.org/conda-forge/linux-64/gxx-12.3.0-h8d2909c_2.conda#673bac341be6b90ef9e8abae7e52ca46
+https://conda.anaconda.org/conda-forge/linux-64/gxx_linux-64-12.3.0-h8a814eb_2.conda#f517b1525e9783849bd56a5dc45a9960
+https://conda.anaconda.org/conda-forge/noarch/humanfriendly-10.0-pyhd8ed1ab_6.conda#2ed1fe4b9079da97c44cfe9c2e5078fd
 https://conda.anaconda.org/conda-forge/noarch/idna-3.4-pyhd8ed1ab_0.tar.bz2#34272b248891bddccc64479f9a7fffed
 https://conda.anaconda.org/conda-forge/noarch/imagesize-1.4.1-pyhd8ed1ab_0.tar.bz2#7de5386c8fea29e76b303f37dde4c352
 https://conda.anaconda.org/conda-forge/noarch/iniconfig-2.0.0-pyhd8ed1ab_0.conda#f800d2da156d08e289b14e87e43c1ae5
 https://conda.anaconda.org/conda-forge/noarch/itsdangerous-2.1.2-pyhd8ed1ab_0.tar.bz2#3c3de74912f11d2b590184f03c7cd09b
-https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.4-py311h4dd048b_1.tar.bz2#46d451f575392c01dc193069bd89766d
-https://conda.anaconda.org/conda-forge/linux-64/lazy-object-proxy-1.9.0-py311h2582759_0.conda#07745544b144855ed4514a4cf0aadd74
-https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-haa2dc70_1.conda#980d8aca0bc23ca73fa8caa3e7c84c28
-https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.2.1-hca28451_0.conda#96aec6156d58591f5a4e67056521ce1b
-https://conda.anaconda.org/conda-forge/linux-64/libkml-1.3.0-h37653c0_1015.tar.bz2#37d3747dd24d604f63d2610910576e63
-https://conda.anaconda.org/conda-forge/linux-64/libpq-15.4-hfc447b1_0.conda#b9ce311e7aba8b5fc3122254f0a6e97e
-https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.3.1-hbf2b3c1_0.conda#4963f3f12db45a576f2b8fbe9a0b8569
+https://conda.anaconda.org/conda-forge/linux-64/kiwisolver-1.4.5-py311h9547e67_1.conda#2c65bdf442b0d37aad080c8a4e0d452f
+https://conda.anaconda.org/conda-forge/linux-64/lazy-object-proxy-1.9.0-py311h459d7ec_1.conda#7cc99d87755a9e64586a6004c5f0f534
+https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.15-hb7c19ff_3.conda#e96637dd92c5f340215c753a5c9a22d7
+https://conda.anaconda.org/conda-forge/linux-64/libblas-3.9.0-19_linux64_openblas.conda#420f4e9be59d0dc9133a0f43f7bab3f3
+https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.4.0-hca28451_0.conda#1158ac1d2613b28685644931f11ee807
+https://conda.anaconda.org/conda-forge/linux-64/libgrpc-1.58.2-he06187c_0.conda#1eec35ecc7bd34e4ec2f2b4eccb8816e
+https://conda.anaconda.org/conda-forge/linux-64/libpq-16.0-hfc447b1_1.conda#e4a9a5ba40123477db33e02a78dffb01
+https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.3.2-h658648e_1.conda#0ebb65e8d86843865796c7c95a941f34
 https://conda.anaconda.org/conda-forge/noarch/locket-1.0.0-pyhd8ed1ab_0.tar.bz2#91e27ef3d05cc772ce627e51cff111c4
-https://conda.anaconda.org/conda-forge/linux-64/lxml-4.9.3-py311h1a07684_0.conda#59a580306d62ef144c9dd592b5120f36
-https://conda.anaconda.org/conda-forge/linux-64/lz4-4.3.2-py311h9f220a4_0.conda#b8aad2507303e04037e8d02d8ac54217
-https://conda.anaconda.org/conda-forge/linux-64/markupsafe-2.1.3-py311h459d7ec_0.conda#9904dc4adb5d547cb21e136f98cb24b0
+https://conda.anaconda.org/conda-forge/linux-64/lxml-4.9.3-py311h1a07684_1.conda#aab51e50d994e58efdfa5382139b0468
+https://conda.anaconda.org/conda-forge/linux-64/lz4-4.3.2-py311h38e4bf4_1.conda#f8e0b648d77bbe44d1fe8af8cc56a590
+https://conda.anaconda.org/conda-forge/linux-64/markupsafe-2.1.3-py311h459d7ec_1.conda#71120b5155a0c500826cf81536721a15
 https://conda.anaconda.org/conda-forge/noarch/mccabe-0.7.0-pyhd8ed1ab_0.tar.bz2#34fc335fc50eef0b5ea708f2b5f54e0c
-https://conda.anaconda.org/conda-forge/noarch/mistune-3.0.0-pyhd8ed1ab_0.conda#c7d0ea64c37752ecbe6da458aee662d2
-https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.5-py311ha3edf6b_0.conda#7415f24f8c44e44152623d93c5015000
+https://conda.anaconda.org/conda-forge/noarch/mistune-3.0.1-pyhd8ed1ab_0.conda#1dad8397c94e4de97a70de552a7dcf49
+https://conda.anaconda.org/conda-forge/linux-64/msgpack-python-1.0.6-py311h9547e67_0.conda#e826b71bf3dc8c91ee097663e2bcface
 https://conda.anaconda.org/conda-forge/noarch/munch-4.0.0-pyhd8ed1ab_0.conda#376b32e8f9d3eacbd625f37d39bd507d
 https://conda.anaconda.org/conda-forge/noarch/munkres-1.1.4-pyh9f0ad1d_0.tar.bz2#2ba8498c1018c1e9c61eb99b973dfe19
 https://conda.anaconda.org/conda-forge/noarch/mypy_extensions-1.0.0-pyha770c72_0.conda#4eccaeba205f0aed9ac3a9ea58568ca3
-https://conda.anaconda.org/conda-forge/noarch/networkx-3.1-pyhd8ed1ab_0.conda#254f787d5068bc89f578bf63893ce8b4
-https://conda.anaconda.org/conda-forge/linux-64/numpy-1.25.2-py311h64a7726_0.conda#71fd6f1734a0fa64d8f852ae7156ec45
-https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.0-hfec8fc6_2.conda#5ce6a42505c6e9e6151c54c3ec8d68ea
-https://conda.anaconda.org/conda-forge/noarch/packaging-23.1-pyhd8ed1ab_0.conda#91cda59e66e1e4afe9476f8ef98f5c30
+https://conda.anaconda.org/conda-forge/noarch/networkx-3.2.1-pyhd8ed1ab_0.conda#425fce3b531bed6ec3c74fab3e5f0a1c
+https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.0-h488ebb8_3.conda#128c25b7fe6a25286a48f3a6a9b5b6f3
+https://conda.anaconda.org/conda-forge/noarch/packaging-23.2-pyhd8ed1ab_0.conda#79002079284aa895f883c6b7f3f88fd6
 https://conda.anaconda.org/conda-forge/noarch/pandocfilters-1.5.0-pyhd8ed1ab_0.tar.bz2#457c2c8c08e54905d6954e79cb5b5db9
 https://conda.anaconda.org/conda-forge/noarch/parso-0.8.3-pyhd8ed1ab_0.tar.bz2#17a565a0c3899244e938cdf417e7b094
 https://conda.anaconda.org/conda-forge/noarch/pathspec-0.11.2-pyhd8ed1ab_0.conda#e41debb259e68490e3ab81e46b639ab6
 https://conda.anaconda.org/conda-forge/noarch/pickleshare-0.7.5-py_1003.tar.bz2#415f0ebb6198cc2801c73438a9fb5761
-https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_0.tar.bz2#89e3c7cdde7d3aaa2aee933b604dd07f
-https://conda.anaconda.org/conda-forge/noarch/pluggy-1.2.0-pyhd8ed1ab_0.conda#7263924c642d22e311d9e59b839f1b33
-https://conda.anaconda.org/conda-forge/linux-64/psutil-5.9.5-py311h2582759_0.conda#a90f8e278c1cd7064b2713e6b7db87e6
+https://conda.anaconda.org/conda-forge/noarch/pkgutil-resolve-name-1.3.10-pyhd8ed1ab_1.conda#405678b942f2481cecdb3e010f4925d9
+https://conda.anaconda.org/conda-forge/noarch/pluggy-1.3.0-pyhd8ed1ab_0.conda#2390bd10bed1f3fdc7a537fb5a447d8d
+https://conda.anaconda.org/conda-forge/linux-64/psutil-5.9.5-py311h459d7ec_1.conda#490d7fa8675afd1aa6f1b2332d156a45
 https://conda.anaconda.org/conda-forge/noarch/ptyprocess-0.7.0-pyhd3deb0d_0.tar.bz2#359eeb6536da0e687af562ed265ec263
 https://conda.anaconda.org/conda-forge/noarch/pure_eval-0.2.2-pyhd8ed1ab_0.tar.bz2#6784285c7e55cb7212efabc79e4c2883
 https://conda.anaconda.org/conda-forge/noarch/py-1.11.0-pyh6c4a22f_0.tar.bz2#b4613d7e7a493916d867842a6a148054
@@ -220,210 +220,211 @@ https://conda.anaconda.org/conda-forge/noarch/pycodestyle-2.9.1-pyhd8ed1ab_0.tar
 https://conda.anaconda.org/conda-forge/noarch/pycparser-2.21-pyhd8ed1ab_0.tar.bz2#076becd9e05608f8dc72757d5f3a91ff
 https://conda.anaconda.org/conda-forge/noarch/pyflakes-2.5.0-pyhd8ed1ab_0.tar.bz2#1b3bef4313288ae8d35b1dfba4cd84a3
 https://conda.anaconda.org/conda-forge/noarch/pygments-2.16.1-pyhd8ed1ab_0.conda#40e5cb18165466773619e5c963f00a7b
-https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.0.9-pyhd8ed1ab_0.tar.bz2#e8fbc1b54b25f4b08281467bc13b70cc
+https://conda.anaconda.org/conda-forge/noarch/pyparsing-3.1.1-pyhd8ed1ab_0.conda#176f7d56f0cfe9008bdf1bccd7de02fb
 https://conda.anaconda.org/conda-forge/noarch/pyshp-2.3.1-pyhd8ed1ab_0.tar.bz2#92a889dc236a5197612bc85bee6d7174
 https://conda.anaconda.org/conda-forge/noarch/pysocks-1.7.1-pyha2e5f31_6.tar.bz2#2a7de29fb590ca14b5243c4c812c8025
-https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.18.0-pyhd8ed1ab_0.conda#3be9466311564f80f8056c0851fc5bb7
+https://conda.anaconda.org/conda-forge/noarch/python-fastjsonschema-2.18.1-pyhd8ed1ab_0.conda#305141cff54af2f90e089d868fffce28
 https://conda.anaconda.org/conda-forge/noarch/python-tzdata-2023.3-pyhd8ed1ab_0.conda#2590495f608a63625e165915fb4e2e34
-https://conda.anaconda.org/conda-forge/linux-64/python-xxhash-3.2.0-py311h2582759_0.conda#dfcc3e6e30d6ec2b2bb416fcd8ff4dc1
-https://conda.anaconda.org/conda-forge/noarch/pytz-2023.3-pyhd8ed1ab_0.conda#d3076b483092a435832603243567bc31
-https://conda.anaconda.org/conda-forge/linux-64/pyyaml-6.0-py311hd4cff14_5.tar.bz2#da8769492e423103c59f469f4f17f8d9
-https://conda.anaconda.org/conda-forge/linux-64/pyzmq-25.1.1-py311h75c88c4_0.conda#af6d43afe0d179ac83b7e0c16b2caaad
-https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.9.2-py311h46250e7_0.conda#bcf66b5abaec47198b42cdd0bb968540
-https://conda.anaconda.org/conda-forge/noarch/semver-3.0.1-pyhd8ed1ab_0.conda#ed90854ae56fb6edae1f13b4663b21b0
+https://conda.anaconda.org/conda-forge/linux-64/python-xxhash-3.4.1-py311h459d7ec_0.conda#60b5332b3989fda37884b92c7afd6a91
+https://conda.anaconda.org/conda-forge/noarch/pytz-2023.3.post1-pyhd8ed1ab_0.conda#c93346b446cd08c169d843ae5fc0da97
+https://conda.anaconda.org/conda-forge/linux-64/pyyaml-6.0.1-py311h459d7ec_1.conda#52719a74ad130de8fb5d047dc91f247a
+https://conda.anaconda.org/conda-forge/linux-64/pyzmq-25.1.1-py311h34ded2d_2.conda#ea365280db99687905b4d76cf6a3568c
+https://conda.anaconda.org/conda-forge/linux-64/rpds-py-0.10.6-py311h46250e7_0.conda#b7237977dbca779aaaab65f42f5558d9
+https://conda.anaconda.org/conda-forge/noarch/semver-3.0.2-pyhd8ed1ab_0.conda#5efb3fccda53974aed800b6d575f72ed
 https://conda.anaconda.org/conda-forge/noarch/setoptconf-tmp-0.3.1-pyhd8ed1ab_0.tar.bz2#af3e36d4effb85b9b9f93cd1db0963df
-https://conda.anaconda.org/conda-forge/noarch/setuptools-68.0.0-pyhd8ed1ab_0.conda#5a7739d0f57ee64133c9d32e6507c46d
+https://conda.anaconda.org/conda-forge/noarch/setuptools-68.2.2-pyhd8ed1ab_0.conda#fc2166155db840c634a1291a5c35a709
 https://conda.anaconda.org/conda-forge/noarch/six-1.16.0-pyh6c4a22f_0.tar.bz2#e5f25f8dbc060e9a8d912e432202afc2
-https://conda.anaconda.org/conda-forge/noarch/smmap-3.0.5-pyh44b312d_0.tar.bz2#3a8dc70789709aa315325d5df06fb7e4
+https://conda.anaconda.org/conda-forge/noarch/smmap-5.0.0-pyhd8ed1ab_0.tar.bz2#62f26a3d1387acee31322208f0cfa3e0
 https://conda.anaconda.org/conda-forge/noarch/snowballstemmer-2.2.0-pyhd8ed1ab_0.tar.bz2#4d22a9315e78c6827f806065957d566e
 https://conda.anaconda.org/conda-forge/noarch/sortedcontainers-2.4.0-pyhd8ed1ab_0.tar.bz2#6d6552722448103793743dabfbda532d
-https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.3.2.post1-pyhd8ed1ab_0.tar.bz2#146f4541d643d48fc8a75cacf69f03ae
+https://conda.anaconda.org/conda-forge/noarch/soupsieve-2.5-pyhd8ed1ab_1.conda#3f144b2c34f8cb5a9abd9ed23a39c561
 https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-jsmath-1.0.1-pyhd8ed1ab_0.conda#da1d979339e2714c30a8e806a33ec087
 https://conda.anaconda.org/conda-forge/noarch/sqlparse-0.4.4-pyhd8ed1ab_0.conda#2e2f31b3b1c866c29636377e14f8c4c6
-https://conda.anaconda.org/conda-forge/noarch/tblib-1.7.0-pyhd8ed1ab_0.tar.bz2#3d4afc31302aa7be471feb6be048ed76
+https://conda.anaconda.org/conda-forge/noarch/tblib-2.0.0-pyhd8ed1ab_0.conda#f5580336fe091d46f9a2ea97da044550
 https://conda.anaconda.org/conda-forge/noarch/termcolor-2.3.0-pyhd8ed1ab_0.conda#440d508f025b1692168caaf436504af3
 https://conda.anaconda.org/conda-forge/noarch/toml-0.10.2-pyhd8ed1ab_0.tar.bz2#f832c45a477c78bebd107098db465095
 https://conda.anaconda.org/conda-forge/noarch/tomli-2.0.1-pyhd8ed1ab_0.tar.bz2#5844808ffab9ebdb694585b50ba02a96
 https://conda.anaconda.org/conda-forge/noarch/tomlkit-0.12.1-pyha770c72_0.conda#62f5b331c53d73e2f6c4c130b53518a0
 https://conda.anaconda.org/conda-forge/noarch/toolz-0.12.0-pyhd8ed1ab_0.tar.bz2#92facfec94bc02d6ccf42e7173831a36
-https://conda.anaconda.org/conda-forge/linux-64/tornado-6.3.2-py311h459d7ec_0.conda#12b1c374ee90a1aa11ea921858394dc8
-https://conda.anaconda.org/conda-forge/noarch/traitlets-5.9.0-pyhd8ed1ab_0.conda#d0b4f5c87cd35ac3fb3d47b223263a64
-https://conda.anaconda.org/conda-forge/noarch/types-pyyaml-6.0.12.11-pyhd8ed1ab_0.conda#22776dce28e8ba933e5cbcf20b62c583
-https://conda.anaconda.org/conda-forge/noarch/types-urllib3-1.26.25.14-pyhd8ed1ab_0.conda#06118f39abab2ab953276a50b2775509
-https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.7.1-pyha770c72_0.conda#c39d6a09fe819de4951c2642629d9115
-https://conda.anaconda.org/conda-forge/linux-64/ujson-5.7.0-py311hcafe171_0.conda#ec3960b6d13bb60aad9c67f42a801720
+https://conda.anaconda.org/conda-forge/linux-64/tornado-6.3.3-py311h459d7ec_1.conda#a700fcb5cedd3e72d0c75d095c7a6eda
+https://conda.anaconda.org/conda-forge/noarch/traitlets-5.13.0-pyhd8ed1ab_0.conda#8a9953c15e1e5a7c1baddbbf4511a567
+https://conda.anaconda.org/conda-forge/noarch/types-pyyaml-6.0.12.12-pyhd8ed1ab_0.conda#0cb14c80f66937df894d60626dd1921f
+https://conda.anaconda.org/conda-forge/noarch/typing_extensions-4.8.0-pyha770c72_0.conda#5b1be40a26d10a06f6d4f1f9e19fa0c7
+https://conda.anaconda.org/conda-forge/linux-64/ujson-5.8.0-py311hb755f60_0.conda#91e67c62c48444e4efc08fb61835abe8
 https://conda.anaconda.org/conda-forge/noarch/untokenize-0.1.1-py_0.tar.bz2#1447ead40f2a01733a9c8dfc32988375
-https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-py_1.tar.bz2#3563be4c5611a44210d9ba0c16113136
+https://conda.anaconda.org/conda-forge/noarch/webencodings-0.5.1-pyhd8ed1ab_2.conda#daf5160ff9cde3a468556965329085b9
 https://conda.anaconda.org/conda-forge/noarch/webob-1.8.7-pyhd8ed1ab_0.tar.bz2#a8192f3585f341ea66c60c189580ac67
-https://conda.anaconda.org/conda-forge/noarch/wheel-0.41.1-pyhd8ed1ab_0.conda#8f467ba2db2b5470d297953d9c1f9c7d
-https://conda.anaconda.org/conda-forge/linux-64/wrapt-1.15.0-py311h2582759_0.conda#15565d8602a78c6a994e4d9fcb391920
+https://conda.anaconda.org/conda-forge/noarch/wheel-0.41.3-pyhd8ed1ab_0.conda#3fc026b9c87d091c4b34a6c997324ae8
+https://conda.anaconda.org/conda-forge/linux-64/wrapt-1.15.0-py311h459d7ec_1.conda#f4d770a09066aaa313b5cc22c0f6e9d1
 https://conda.anaconda.org/conda-forge/linux-64/xorg-libxext-1.3.4-h0b41bf4_2.conda#82b6df12252e6f32402b96dacc656fec
 https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.11-hd590300_0.conda#ed67c36f215b310412b2af935bf3e530
-https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.7.0-pyhd8ed1ab_0.conda#aacae3c0eaba0204dc6c5497c93c7992
+https://conda.anaconda.org/conda-forge/noarch/xyzservices-2023.10.1-pyhd8ed1ab_0.conda#1e0d85c0e2fef9539218da185b285f54
 https://conda.anaconda.org/conda-forge/noarch/zict-3.0.0-pyhd8ed1ab_0.conda#cf30c2c15b82aacb07f9c09e28ff2275
-https://conda.anaconda.org/conda-forge/noarch/zipp-3.16.2-pyhd8ed1ab_0.conda#2da0451b54c4563c32490cb1b7cf68a1
+https://conda.anaconda.org/conda-forge/noarch/zipp-3.17.0-pyhd8ed1ab_0.conda#2e4d6bc0b14e10f895fc6791a7d9b26a
 https://conda.anaconda.org/conda-forge/noarch/accessible-pygments-0.0.4-pyhd8ed1ab_0.conda#46a2e6e3dfa718ce3492018d5a110dd6
 https://conda.anaconda.org/conda-forge/noarch/asgiref-3.7.2-pyhd8ed1ab_0.conda#596932155bf88bb6837141550cb721b0
-https://conda.anaconda.org/conda-forge/linux-64/astroid-2.15.6-py311h38be061_0.conda#28b1d4a493fb6acd24cc299d77fed871
-https://conda.anaconda.org/conda-forge/noarch/asttokens-2.2.1-pyhd8ed1ab_0.conda#bf7f54dd0f25c3f06ecb82a07341841a
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-auth-0.7.0-hbbaa140_3.conda#cbd8f87157cd414417ade3e9f24274cd
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-mqtt-0.9.0-h2e270ba_0.conda#bcd553e453b41ce5e4a6154571687b49
-https://conda.anaconda.org/conda-forge/noarch/babel-2.12.1-pyhd8ed1ab_1.conda#ac432e732804a81ddcf29c92ead57cde
+https://conda.anaconda.org/conda-forge/linux-64/astroid-2.15.8-py311h38be061_0.conda#46d70fcb74472aab178991f0231ee3c6
+https://conda.anaconda.org/conda-forge/noarch/asttokens-2.4.1-pyhd8ed1ab_0.conda#5f25798dcefd8252ce5f9dc494d5f571
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-auth-0.7.5-h1a24852_0.conda#02305820d0dbfe542c6e4d67ddb0f13b
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-mqtt-0.9.8-h31a96f8_0.conda#cf4834799534b9fcb7bca1c136bcd7a9
+https://conda.anaconda.org/conda-forge/noarch/babel-2.13.1-pyhd8ed1ab_0.conda#3ccff479c246692468f604df9c85ef26
 https://conda.anaconda.org/conda-forge/noarch/backports.functools_lru_cache-1.6.5-pyhd8ed1ab_0.conda#6b1b907661838a75d067a22f87996b2e
 https://conda.anaconda.org/conda-forge/noarch/beautifulsoup4-4.12.2-pyha770c72_0.conda#a362ff7d976217f8fa78c0f1c4f59717
-https://conda.anaconda.org/conda-forge/noarch/bleach-6.0.0-pyhd8ed1ab_0.conda#d48b143d01385872a88ef8417e96c30e
-https://conda.anaconda.org/conda-forge/linux-64/cairo-1.16.0-hbbf8b49_1016.conda#c1dd96500b9b1a75e9e511931f415cbc
+https://conda.anaconda.org/conda-forge/noarch/bleach-6.1.0-pyhd8ed1ab_0.conda#0ed9d7c0e9afa7c025807a9a8136ea3e
+https://conda.anaconda.org/conda-forge/linux-64/cairo-1.18.0-h3faef2a_0.conda#f907bb958910dc404647326ca80c263e
 https://conda.anaconda.org/conda-forge/noarch/cattrs-23.1.2-pyhd8ed1ab_0.conda#e554f60477143949704bf470f66a81e7
-https://conda.anaconda.org/conda-forge/linux-64/cffi-1.15.1-py311h409f033_3.conda#9025d0786dbbe4bc91fd8e85502decce
-https://conda.anaconda.org/conda-forge/linux-64/cfitsio-4.2.0-hd9d235c_0.conda#8c57a9adbafd87f5eff842abde599cb4
-https://conda.anaconda.org/conda-forge/linux-64/cftime-1.6.2-py311h4c7f6c3_1.tar.bz2#c7e54004ffd03f8db0a58ab949f2a00b
+https://conda.anaconda.org/conda-forge/linux-64/cffi-1.16.0-py311hb3a22ac_0.conda#b3469563ac5e808b0cd92810d0697043
+https://conda.anaconda.org/conda-forge/linux-64/cfitsio-4.3.0-hbdc6101_0.conda#797554b8b7603011e8677884381fbcc5
 https://conda.anaconda.org/conda-forge/noarch/click-plugins-1.1.1-py_0.tar.bz2#4fd2c6b53934bd7d96d1f3fdaf99b79f
 https://conda.anaconda.org/conda-forge/noarch/cligj-0.7.2-pyhd8ed1ab_1.tar.bz2#a29b7c141d6b2de4bb67788a5f107734
-https://conda.anaconda.org/conda-forge/linux-64/contourpy-1.1.0-py311h9547e67_0.conda#daf3f23397ab2265d0cdfa339f3627ba
-https://conda.anaconda.org/conda-forge/linux-64/coverage-7.2.7-py311h459d7ec_0.conda#3c2c65575c28b23afc5e4ff721a2fc9f
-https://conda.anaconda.org/conda-forge/linux-64/curl-8.2.1-hca28451_0.conda#b7bf35457c5495009392c17feec4fddd
+https://conda.anaconda.org/conda-forge/linux-64/coverage-7.3.2-py311h459d7ec_0.conda#7b3145fed7adc7c63a0e08f6f29f5480
 https://conda.anaconda.org/conda-forge/linux-64/cxx-compiler-1.6.0-h00ab1b0_0.conda#364c6ae36c4e36fcbd4d273cf4db78af
-https://conda.anaconda.org/conda-forge/linux-64/cytoolz-0.12.2-py311h459d7ec_0.conda#5c416db47b7816e437eaf0d46e5c3a3d
+https://conda.anaconda.org/conda-forge/linux-64/cytoolz-0.12.2-py311h459d7ec_1.conda#afe341dbe834ae76d2c23157ff00e633
 https://conda.anaconda.org/conda-forge/noarch/docformatter-1.7.5-pyhd8ed1ab_0.conda#3a941b6083e945aa87e739a9b85c82e9
 https://conda.anaconda.org/conda-forge/noarch/fire-0.5.0-pyhd8ed1ab_0.conda#9fd22aae8d2f319e80f68b295ab91d64
-https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.42.0-py311h459d7ec_0.conda#8c1ac2c00995248898220c4c1a9d81ab
+https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.43.1-py311h459d7ec_0.conda#ac995b680de3bdce2531c553b27dfe7e
 https://conda.anaconda.org/conda-forge/linux-64/fortran-compiler-1.6.0-heb67821_0.conda#b65c49dda97ae497abcbdf3a8ba0018f
-https://conda.anaconda.org/conda-forge/noarch/geopy-2.3.0-pyhd8ed1ab_0.tar.bz2#529faeecd6eee3a3b782566ddf05ce92
-https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.10-pyhd8ed1ab_0.conda#3706d2f3d7cb5dae600c833345a76132
-https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.14.1-nompi_h4f84152_100.conda#ff9ae10aa224826c07da7ef26cb0b717
+https://conda.anaconda.org/conda-forge/noarch/geopy-2.4.0-pyhd8ed1ab_0.conda#90faaa7eaeba3cc877074c0916efe30c
+https://conda.anaconda.org/conda-forge/noarch/gitdb-4.0.11-pyhd8ed1ab_0.conda#623b19f616f2ca0c261441067e18ae40
+https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.14.2-nompi_h4f84152_100.conda#2de6a9bc8083b49f09b2f6eb28d3ba3c
 https://conda.anaconda.org/conda-forge/noarch/importlib-metadata-6.8.0-pyha770c72_0.conda#4e9f59a060c3be52bc4ddc46ee9b6946
-https://conda.anaconda.org/conda-forge/noarch/importlib_resources-6.0.1-pyhd8ed1ab_0.conda#d978c61aa5fc2c69380d53ad56b5ae86
+https://conda.anaconda.org/conda-forge/noarch/importlib_resources-6.1.0-pyhd8ed1ab_0.conda#48b0d98e0c0ec810d3ccc2a0926c8c0e
 https://conda.anaconda.org/conda-forge/noarch/isodate-0.6.1-pyhd8ed1ab_0.tar.bz2#4a62c93c1b5c0b920508ae3fd285eaf5
 https://conda.anaconda.org/conda-forge/noarch/isort-5.12.0-pyhd8ed1ab_1.conda#07ed3421bad60867234c7a9282ea39d4
-https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.0-pyhd8ed1ab_0.conda#1cd7f70057cdffc10977b613fb75425d
+https://conda.anaconda.org/conda-forge/noarch/jedi-0.19.1-pyhd8ed1ab_0.conda#81a3be0b2023e1ea8555781f0ad904a2
 https://conda.anaconda.org/conda-forge/noarch/jinja2-3.1.2-pyhd8ed1ab_1.tar.bz2#c8490ed5c70966d232fdd389d0dbed37
 https://conda.anaconda.org/conda-forge/noarch/jupyterlab_pygments-0.2.2-pyhd8ed1ab_0.tar.bz2#243f63592c8e449f40cd42eb5cf32f40
 https://conda.anaconda.org/conda-forge/noarch/latexcodec-2.0.1-pyh9f0ad1d_0.tar.bz2#8d67904973263afd2985ba56aa2d6bb4
-https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-hfa28ad5_6.conda#ef06bee47510a7f5db3c2297a51d6ce2
-https://conda.anaconda.org/conda-forge/linux-64/libgoogle-cloud-2.12.0-h840a212_1.conda#03c225a73835f5aa68c13e62eb360406
+https://conda.anaconda.org/conda-forge/linux-64/libcblas-3.9.0-19_linux64_openblas.conda#d12374af44575413fbbd4a217d46ea33
+https://conda.anaconda.org/conda-forge/linux-64/libgd-2.3.3-h119a65a_9.conda#cfebc557e54905dadc355c0e9f003004
+https://conda.anaconda.org/conda-forge/linux-64/libgoogle-cloud-2.12.0-h19a6dae_3.conda#cb26f6b7184480053106ea4713a52daf
+https://conda.anaconda.org/conda-forge/linux-64/liblapack-3.9.0-19_linux64_openblas.conda#9f100edf65436e3eabc2a51fc00b2c37
 https://conda.anaconda.org/conda-forge/noarch/logilab-common-1.7.3-py_0.tar.bz2#6eafcdf39a7eb90b6d951cfff59e8d3b
 https://conda.anaconda.org/conda-forge/noarch/matplotlib-inline-0.1.6-pyhd8ed1ab_0.tar.bz2#b21613793fcc81d944c76c9f2864a7de
-https://conda.anaconda.org/conda-forge/linux-64/mypy-1.5.0-py311h459d7ec_0.conda#a7c351313fe98e9f26e76b71aa3d41cd
+https://conda.anaconda.org/conda-forge/linux-64/mypy-1.6.1-py311h459d7ec_0.conda#d3e5072b7ff746e9f9b44f0f52de6727
 https://conda.anaconda.org/conda-forge/noarch/nested-lookup-0.2.25-pyhd8ed1ab_1.tar.bz2#2f59daeb14581d41b1e2dda0895933b2
 https://conda.anaconda.org/conda-forge/noarch/nodeenv-1.8.0-pyhd8ed1ab_0.conda#2a75b296096adabbabadd5e9782e5fcc
-https://conda.anaconda.org/conda-forge/noarch/partd-1.4.0-pyhd8ed1ab_0.conda#721dab5803ea92ce02ddc4ee50aa0c48
+https://conda.anaconda.org/conda-forge/noarch/partd-1.4.1-pyhd8ed1ab_0.conda#acf4b7c0bcd5fa3b0e05801c4d2accd6
 https://conda.anaconda.org/conda-forge/noarch/pexpect-4.8.0-pyh1a96a4e_2.tar.bz2#330448ce4403cc74990ac07c555942a1
-https://conda.anaconda.org/conda-forge/linux-64/pillow-10.0.0-py311h0b84326_0.conda#4b24acdc1fbbae9da03147e7d2cf8c8a
-https://conda.anaconda.org/conda-forge/noarch/pip-23.2.1-pyhd8ed1ab_0.conda#e2783aa3f9235225eec92f9081c5b801
-https://conda.anaconda.org/conda-forge/linux-64/postgresql-15.4-h8972f4a_0.conda#bf6169ef6f83cc04d8b2a72cd5c364bc
-https://conda.anaconda.org/conda-forge/linux-64/proj-9.2.1-ha643af7_0.conda#e992387307f4403ba0ec07d009032550
+https://conda.anaconda.org/conda-forge/linux-64/pillow-10.1.0-py311ha6c5da5_0.conda#83a988daf5c49e57f7d2086fb6781fe8
+https://conda.anaconda.org/conda-forge/noarch/pip-23.3.1-pyhd8ed1ab_0.conda#2400c0b86889f43aa52067161e1fb108
+https://conda.anaconda.org/conda-forge/linux-64/postgresql-16.0-h8972f4a_1.conda#6ce1ab5480d3aa4308654971ac5f731b
+https://conda.anaconda.org/conda-forge/linux-64/proj-9.3.0-h1d62c97_2.conda#b5e57a0c643da391bef850922963eece
 https://conda.anaconda.org/conda-forge/noarch/pydocstyle-6.3.0-pyhd8ed1ab_0.conda#7e23a61a7fbaedfef6eb0e1ac775c8e5
-https://conda.anaconda.org/conda-forge/noarch/pytest-7.4.0-pyhd8ed1ab_0.conda#3cfe9b9e958e7238a386933c75d190db
+https://conda.anaconda.org/conda-forge/noarch/pytest-7.4.3-pyhd8ed1ab_0.conda#5bdca0aca30b0ee62bb84854e027eae0
 https://conda.anaconda.org/conda-forge/noarch/python-dateutil-2.8.2-pyhd8ed1ab_0.tar.bz2#dd999d1cc9f79e67dbb855c8924c7984
 https://conda.anaconda.org/conda-forge/noarch/referencing-0.30.2-pyhd8ed1ab_0.conda#a33161b983172ba6ef69d5fc850650cd
-https://conda.anaconda.org/conda-forge/linux-64/shapely-2.0.1-py311h54d622a_1.conda#a894c65b48676c4973e9ee8b59bceb9e
 https://conda.anaconda.org/conda-forge/noarch/tinycss2-1.2.1-pyhd8ed1ab_0.tar.bz2#7234c9eefff659501cd2fe0d2ede4d48
-https://conda.anaconda.org/conda-forge/noarch/types-requests-2.31.0.2-pyhd8ed1ab_0.conda#700fb06cd011d594305e3b487d5a96a2
-https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.7.1-hd8ed1ab_0.conda#f96688577f1faa58096d06a45136afa2
+https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.8.0-hd8ed1ab_0.conda#384462e63262a527bda564fa2d9126c0
 https://conda.anaconda.org/conda-forge/noarch/url-normalize-1.4.3-pyhd8ed1ab_0.tar.bz2#7c4076e494f0efe76705154ac9302ba6
-https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.4-pyhd8ed1ab_0.conda#18badd8fa3648d1beb1fcc7f2e0f756e
-https://conda.anaconda.org/conda-forge/linux-64/xerces-c-3.2.4-h8d71039_2.conda#6d5edbe22b07abae2ea0a9065ef6be12
+https://conda.anaconda.org/conda-forge/noarch/urllib3-2.0.7-pyhd8ed1ab_0.conda#270e71c14d37074b1d066ee21cf0c4a6
+https://conda.anaconda.org/conda-forge/linux-64/xerces-c-3.2.4-hac6953d_3.conda#297e6a75dc1b6a440cd341a85eab8a00
 https://conda.anaconda.org/conda-forge/noarch/yamale-4.0.4-pyh6c4a22f_0.tar.bz2#cc9f59f147740d88679bf1bd94dbe588
 https://conda.anaconda.org/conda-forge/noarch/yamllint-1.32.0-pyhd8ed1ab_0.conda#6d2425548b0293a225ca4febd80feaa3
-https://conda.anaconda.org/conda-forge/linux-64/aws-c-s3-0.3.13-heb0bb06_2.conda#c0866da05d5e7bb3a3f6b68bcbf7537b
-https://conda.anaconda.org/conda-forge/linux-64/cf-units-3.2.0-py311h1f0f07a_0.conda#43a71a823583d75308eaf3a06c8f150b
+https://conda.anaconda.org/conda-forge/linux-64/aws-c-s3-0.3.20-he249171_1.conda#e7b72928833ea245d8bfb89a35ae7d5e
 https://conda.anaconda.org/conda-forge/linux-64/compilers-1.6.0-ha770c72_0.conda#e2259de4640a51a28c21931ae98e4975
-https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.3-py311h63ff55d_0.conda#cc8ad641cab65dfe59caddbc23a1aeca
-https://conda.anaconda.org/conda-forge/noarch/django-4.2.3-pyhd8ed1ab_0.conda#00a369ccfec9deaa325eabd749bfae28
+https://conda.anaconda.org/conda-forge/linux-64/cryptography-41.0.5-py311h63ff55d_0.conda#22584e5c97ed8f1a6b63a0ff43dba827
+https://conda.anaconda.org/conda-forge/noarch/django-4.2.7-pyhd8ed1ab_0.conda#107fbbd296283091c717acd51a3a87fd
 https://conda.anaconda.org/conda-forge/noarch/flake8-5.0.4-pyhd8ed1ab_0.tar.bz2#8079ea7dec0a917dd0cb6c257f7ea9ea
-https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.7.1-h22adcc9_11.conda#514167b60f598eaed3f7a60e1dceb9ee
-https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.32-pyhd8ed1ab_0.conda#5809a12901d57388444c3293c975d0bb
-https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-7.3.0-hdb3a94d_0.conda#765bc76c0dfaf24ff9d8a2935b2510df
+https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.7.1-hf074850_14.conda#1d53ee057d8481bd2b4c2c34c8e92aac
+https://conda.anaconda.org/conda-forge/noarch/gitpython-3.1.40-pyhd8ed1ab_0.conda#6bf74c3b7c13079a91d4bd3da51cefcf
+https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-8.2.1-h3d44ed6_0.conda#98db5f8813f45e2b29766aff0e4a499c
 https://conda.anaconda.org/conda-forge/noarch/importlib_metadata-6.8.0-hd8ed1ab_0.conda#b279b07ce18058034e5b3606ba103a8b
 https://conda.anaconda.org/conda-forge/noarch/jsonschema-specifications-2023.7.1-pyhd8ed1ab_0.conda#7c27ea1bdbe520bb830dcadd59f55cbf
-https://conda.anaconda.org/conda-forge/linux-64/kealib-1.5.1-h3e6883b_4.conda#ef5228158594262a8bc07a0c92a3ef5b
-https://conda.anaconda.org/conda-forge/linux-64/libspatialite-5.0.1-hca56755_27.conda#918a735059cab21b96fc13a8d04fbcd8
-https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.7.2-py311h54ef318_0.conda#2631a9e423855fb586c05f8a5ee8b177
-https://conda.anaconda.org/conda-forge/linux-64/pandas-2.0.3-py311h320fe9a_1.conda#5f92f46bd33917832a99d1660b4075ac
-https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.10.0-pyhd8ed1ab_0.conda#0809187ef9b89a3d94a5c24d13936236
-https://conda.anaconda.org/conda-forge/linux-64/poppler-23.05.0-hd18248d_1.conda#09e0de1aa7330fe697eed76eaeef666d
+https://conda.anaconda.org/conda-forge/linux-64/kealib-1.5.2-hcd42e92_1.conda#b04c039f0bd511533a0d8bc8a7b6835e
+https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.9.2-nompi_h80fb2b6_112.conda#a19fa6cacf80c8a366572853d5890eb4
+https://conda.anaconda.org/conda-forge/linux-64/libspatialite-5.1.0-h090f1da_0.conda#c4360eaa543bb3bcbb9cd135eb6fb0fc
+https://conda.anaconda.org/conda-forge/linux-64/numpy-1.26.0-py311h64a7726_0.conda#bf16a9f625126e378302f08e7ed67517
+https://conda.anaconda.org/conda-forge/noarch/platformdirs-3.11.0-pyhd8ed1ab_0.conda#8f567c0a74aa44cf732f15773b4083b0
+https://conda.anaconda.org/conda-forge/linux-64/poppler-23.10.0-h590f24d_0.conda#06b4a80e2cc3974e55f83e2115e2e90a
 https://conda.anaconda.org/conda-forge/noarch/pybtex-0.24.0-pyhd8ed1ab_2.tar.bz2#2099b86a7399c44c0c61cdb6de6915ba
-https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.6.0-py311ha169711_1.conda#92633556d37e88ce45193374d408072c
+https://conda.anaconda.org/conda-forge/linux-64/pyproj-3.6.1-py311h1facc83_3.conda#fee8c3c4404e37e724f08c2983eb484c
 https://conda.anaconda.org/conda-forge/noarch/pytest-cov-4.1.0-pyhd8ed1ab_0.conda#06eb685a3a0b146347a58dda979485da
-https://conda.anaconda.org/conda-forge/noarch/pytest-env-0.8.2-pyhd8ed1ab_0.conda#cd20b56ff31042aad74d45e3f47eb5b2
+https://conda.anaconda.org/conda-forge/noarch/pytest-env-1.1.1-pyhd8ed1ab_0.conda#0a4d7e888fae7b7d75243414b15d0c50
 https://conda.anaconda.org/conda-forge/noarch/pytest-metadata-3.0.0-pyhd8ed1ab_1.conda#8bdcc0f401561213821bf67513abeeff
-https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.11.1-pyhd8ed1ab_0.conda#fcd2531bc3e492657aeb042349aeaf8a
+https://conda.anaconda.org/conda-forge/noarch/pytest-mock-3.12.0-pyhd8ed1ab_0.conda#ac9fedc9a0c397f2318e82525491dd83
 https://conda.anaconda.org/conda-forge/noarch/pytest-mypy-0.8.0-pyhd8ed1ab_0.tar.bz2#4e81c96e5f875c09e5b9f999035b9d8e
 https://conda.anaconda.org/conda-forge/noarch/pytest-xdist-3.3.1-pyhd8ed1ab_0.conda#816073bb54ef59f33f0f26c14f88311b
 https://conda.anaconda.org/conda-forge/noarch/rdflib-7.0.0-pyhd8ed1ab_0.conda#44d14ef95495b3d4438f28998e0296a9
 https://conda.anaconda.org/conda-forge/noarch/requests-2.31.0-pyhd8ed1ab_0.conda#a30144e4156cdbb236f99ebb49828f8b
 https://conda.anaconda.org/conda-forge/noarch/requirements-detector-1.2.2-pyhd8ed1ab_0.conda#6626918380d99292df110f3c91b6e5ec
 https://conda.anaconda.org/conda-forge/noarch/stack_data-0.6.2-pyhd8ed1ab_0.conda#e7df0fdd404616638df5ece6e69ba7af
-https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.13.2-hd532e3d_0.conda#6d97164f19dbd27575ef1899b02dc1e0
-https://conda.anaconda.org/conda-forge/linux-64/ukkonen-1.0.1-py311h4dd048b_3.tar.bz2#dbfea4376856bf7bd2121e719cf816e5
-https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.6-pyhd8ed1ab_0.conda#078979d33523cb477bd1916ce41aacc9
-https://conda.anaconda.org/conda-forge/linux-64/aws-crt-cpp-0.21.0-h87b6960_2.conda#daacb517f0c54d561a1c8f793cc24406
-https://conda.anaconda.org/conda-forge/noarch/bokeh-3.2.1-pyhd8ed1ab_0.conda#1f6a50747c4e69d181f3a2ca739d1fe3
-https://conda.anaconda.org/conda-forge/linux-64/cartopy-0.22.0-py311h320fe9a_0.conda#1271b2375735e2aaa6d6770dbe2ad087
-https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.8.0-pyhd8ed1ab_0.conda#160a92928fc4a0ca40a64b586a2cf671
+https://conda.anaconda.org/conda-forge/linux-64/tiledb-2.16.3-h8c794c1_3.conda#7de728789b0aba16018f726dc5ddbec2
+https://conda.anaconda.org/conda-forge/noarch/types-requests-2.31.0.10-pyhd8ed1ab_0.conda#84dca7318667fa091bbfd8724d22ea99
+https://conda.anaconda.org/conda-forge/linux-64/ukkonen-1.0.1-py311h9547e67_4.conda#586da7df03b68640de14dc3e8bcbf76f
+https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.9-pyhd8ed1ab_0.conda#8e8280dec091763dfdc29e066de52270
+https://conda.anaconda.org/conda-forge/linux-64/aws-crt-cpp-0.24.4-h28e6ea9_2.conda#12fcf00d22c16ae8663d2f0fe0068d0e
+https://conda.anaconda.org/conda-forge/linux-64/cftime-1.6.3-py311h1f0f07a_0.conda#b7e6d52b39e199238c3400cafaabafb3
+https://conda.anaconda.org/conda-forge/linux-64/contourpy-1.1.1-py311h9547e67_1.conda#52d3de443952d33c5cee6b24b172ce96
+https://conda.anaconda.org/conda-forge/noarch/dask-core-2023.10.1-pyhd8ed1ab_0.conda#cf1f26a9e21311f10cfe9dbf0e0d99bc
 https://conda.anaconda.org/conda-forge/noarch/flake8-polyfill-1.0.2-py_0.tar.bz2#a53db35e3d07f0af2eccd59c2a00bffe
-https://conda.anaconda.org/conda-forge/noarch/identify-2.5.26-pyhd8ed1ab_0.conda#1ca86f154e13f4aa20b48e20d6bbf924
-https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.19.0-pyhd8ed1ab_0.conda#989d1df249e1fce06fa1435548eef68a
-https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.3.1-py311h38be061_0.conda#0cf8259b01ede82c76007996f73f89ed
-https://conda.anaconda.org/conda-forge/noarch/nc-time-axis-1.4.1-pyhd8ed1ab_0.tar.bz2#281b58948bf60a2582de9e548bcc5369
-https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.14-heaa33ce_1.conda#cde553e0e32389e26595db4eacf859eb
-https://conda.anaconda.org/conda-forge/noarch/pooch-1.7.0-pyha770c72_3.conda#5936894aade8240c867d292aa0d980c6
+https://conda.anaconda.org/conda-forge/noarch/identify-2.5.31-pyhd8ed1ab_0.conda#fea10604a45e974b110ea15a88913ebc
+https://conda.anaconda.org/conda-forge/noarch/jsonschema-4.19.2-pyhd8ed1ab_0.conda#24d41c2f9cc199d0a180ecf7ef54739c
+https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-5.5.0-py311h38be061_0.conda#cee83be29258275f75029125e186ab6d
+https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.7.2-h6f3d308_7.conda#f9555eada0412c9f3dd4b34f5afecf5b
+https://conda.anaconda.org/conda-forge/linux-64/netcdf-fortran-4.6.1-nompi_hacb5139_102.conda#487a1c19dd3eacfd055ad614e9acde87
+https://conda.anaconda.org/conda-forge/linux-64/pandas-2.1.2-py311h320fe9a_0.conda#c36a53056129665b34db419b6af3d230
+https://conda.anaconda.org/conda-forge/linux-64/pango-1.50.14-ha41ecd1_2.conda#1a66c10f6a0da3dbd2f3a68127e7f6a0
+https://conda.anaconda.org/conda-forge/noarch/pooch-1.8.0-pyhd8ed1ab_0.conda#134b2b57b7865d2316a7cce1915a51ed
 https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.39-pyha770c72_0.conda#a4986c6bb5b0d05a38855b0880a5f425
-https://conda.anaconda.org/conda-forge/noarch/pylint-2.17.5-pyhd8ed1ab_0.conda#30dc94b05de470e3b579d73d64127656
-https://conda.anaconda.org/conda-forge/noarch/pyopenssl-23.2.0-pyhd8ed1ab_1.conda#34f7d568bf59d18e3fef8c405cbece21
+https://conda.anaconda.org/conda-forge/noarch/pylint-2.17.7-pyhd8ed1ab_0.conda#3cab6aee60038b3f621bce3e50f52bed
+https://conda.anaconda.org/conda-forge/noarch/pyopenssl-23.3.0-pyhd8ed1ab_0.conda#7819533e674dbbc51468f3228b9b1bb6
 https://conda.anaconda.org/conda-forge/noarch/pytest-html-3.2.0-pyhd8ed1ab_1.tar.bz2#d5c7a941dfbceaab4b172a56d7918eb0
 https://conda.anaconda.org/conda-forge/noarch/requests-cache-1.1.0-pyhd8ed1ab_0.conda#57b89064c125bb9d0e533e018c3eb17a
-https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.2-pyhd8ed1ab_0.conda#a218f3be8ab6185a475c8168a86e18ae
-https://conda.anaconda.org/conda-forge/noarch/xarray-2023.7.0-pyhd8ed1ab_0.conda#2f18700699e1ea19aa1634ed57711677
+https://conda.anaconda.org/conda-forge/linux-64/scipy-1.11.3-py311h64a7726_1.conda#e4b4d3b764e2d029477d0db88248a8b5
+https://conda.anaconda.org/conda-forge/linux-64/shapely-2.0.2-py311he06c224_0.conda#c90e2469d7512f3bba893533a82d7a02
+https://conda.anaconda.org/conda-forge/noarch/virtualenv-20.24.6-pyhd8ed1ab_0.conda#fb1fc875719e217ed799a7aae11d3be4
 https://conda.anaconda.org/conda-forge/noarch/yapf-0.40.1-pyhd8ed1ab_0.conda#f269942e802d5e148632143d4c37acc9
-https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.10.57-h7062fed_18.conda#695364bcdf9336c2108382c48a6efa97
-https://conda.anaconda.org/conda-forge/noarch/cf_xarray-0.8.4-pyhd8ed1ab_0.conda#18472f8f9452f962fe0bcb1b8134b494
-https://conda.anaconda.org/conda-forge/noarch/distributed-2023.8.0-pyhd8ed1ab_0.conda#974b4a00b0e100e341cd9f179b05f574
+https://conda.anaconda.org/conda-forge/linux-64/aws-sdk-cpp-1.11.182-hb97d603_2.conda#4b28dbada9459f1d89c77939b9284388
+https://conda.anaconda.org/conda-forge/noarch/bokeh-3.3.0-pyhd8ed1ab_0.conda#5d6ff9d18f0b611a7dc131f4a7444c2e
+https://conda.anaconda.org/conda-forge/linux-64/cf-units-3.2.0-py311h1f0f07a_4.conda#1e105c1a8ea2163507726144b401eb1b
+https://conda.anaconda.org/conda-forge/noarch/distributed-2023.10.1-pyhd8ed1ab_0.conda#9fc9e3eacf6e23f902408d38198880de
+https://conda.anaconda.org/conda-forge/linux-64/esmf-8.4.2-nompi_h9e768e6_3.conda#c330e87e698bae8e7381c0315cf25dd0
+https://conda.anaconda.org/conda-forge/linux-64/gdal-3.7.2-py311h815a124_7.conda#e68c90c9490e1621ff4a7871849f03b2
 https://conda.anaconda.org/conda-forge/linux-64/gtk2-2.24.33-h90689f9_2.tar.bz2#957a0255ab58aaf394a91725d73ab422
-https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.3.0-pyhd8ed1ab_0.conda#1d018ee4ab13217e2544f795eb0a6798
+https://conda.anaconda.org/conda-forge/noarch/jupyter_client-8.5.0-pyhd8ed1ab_0.conda#77e442cb7c382d01c916f91a8652811a
 https://conda.anaconda.org/conda-forge/linux-64/librsvg-2.56.3-h98fae49_0.conda#620e754f4344f4c27259ff460a2b9c50
+https://conda.anaconda.org/conda-forge/linux-64/matplotlib-base-3.8.1-py311h54ef318_0.conda#201fdabdb86bb8fb6e99fa3f0dab8122
 https://conda.anaconda.org/conda-forge/noarch/myproxyclient-2.1.0-pyhd8ed1ab_2.tar.bz2#363b0816e411feb0df925d4f224f026a
 https://conda.anaconda.org/conda-forge/noarch/nbformat-5.9.2-pyhd8ed1ab_0.conda#61ba076de6530d9301a0053b02f093d2
+https://conda.anaconda.org/conda-forge/linux-64/netcdf4-1.6.5-nompi_py311he8ad708_100.conda#597b1ad6cb7011b7561c20ea30295cae
 https://conda.anaconda.org/conda-forge/noarch/pep8-naming-0.10.0-pyh9f0ad1d_0.tar.bz2#b3c5536e4f9f58a4b16adb6f1e11732d
-https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.3.3-pyha770c72_0.conda#dd64a0e440754ed97610b3e6b502b6b1
+https://conda.anaconda.org/conda-forge/noarch/pre-commit-3.5.0-pyha770c72_0.conda#964e3d762e427661c59263435a14c492
 https://conda.anaconda.org/conda-forge/noarch/prompt_toolkit-3.0.39-hd8ed1ab_0.conda#4bbbe67d5df19db30f04b8e344dc9976
 https://conda.anaconda.org/conda-forge/noarch/pylint-plugin-utils-0.7-pyhd8ed1ab_0.tar.bz2#1657976383aee04dbb3ae3bdf654bb58
-https://conda.anaconda.org/conda-forge/linux-64/python-stratify-0.3.0-py311h1f0f07a_0.conda#3a00b1b08d8c01b1a3bfa686b9152df2
-https://conda.anaconda.org/conda-forge/linux-64/scipy-1.11.1-py311h64a7726_0.conda#356da36102fc1eeb8a81e6d79e53bc7e
+https://conda.anaconda.org/conda-forge/linux-64/python-stratify-0.3.0-py311h1f0f07a_1.conda#cd36a89a048ad2bcc6d8b43f648fb1d0
+https://conda.anaconda.org/conda-forge/noarch/xarray-2023.10.1-pyhd8ed1ab_0.conda#9b20e5d68eea6878a0a6fc57a3043889
+https://conda.anaconda.org/conda-forge/linux-64/cartopy-0.22.0-py311h320fe9a_1.conda#10d1806e20da040c58c36deddf51c70c
+https://conda.anaconda.org/conda-forge/noarch/cf_xarray-0.8.4-pyhd8ed1ab_0.conda#18472f8f9452f962fe0bcb1b8134b494
 https://conda.anaconda.org/conda-forge/noarch/dask-jobqueue-0.8.2-pyhd8ed1ab_0.conda#cc344a296a41369bcb05f7216661cec8
 https://conda.anaconda.org/conda-forge/noarch/esgf-pyclient-0.3.1-pyh1a96a4e_2.tar.bz2#64068564a9c2932bf30e9b4ec567927d
+https://conda.anaconda.org/conda-forge/noarch/esmpy-8.4.2-pyhc1e730c_4.conda#ddcf387719b2e44df0cc4dd467643951
+https://conda.anaconda.org/conda-forge/linux-64/fiona-1.9.5-py311hbac4ec9_0.conda#786d3808394b1bdfd3f41f2e2c67279e
 https://conda.anaconda.org/conda-forge/linux-64/graphviz-8.1.0-h28d9a01_0.conda#33628e0e3de7afd2c8172f76439894cb
-https://conda.anaconda.org/conda-forge/noarch/ipython-8.14.0-pyh41d4057_0.conda#0a0b0d8177c4a209017b356439292db8
-https://conda.anaconda.org/conda-forge/linux-64/libarrow-12.0.1-h10ac928_8_cpu.conda#5f3fef49968b171fda2c8bdf2adf7051
-https://conda.anaconda.org/conda-forge/linux-64/libnetcdf-4.9.2-nompi_h7e745eb_109.conda#9e208615247477427acbd0900ca7038f
+https://conda.anaconda.org/conda-forge/noarch/ipython-8.17.2-pyh41d4057_0.conda#f39d0b60e268fe547f1367edbab457d4
+https://conda.anaconda.org/conda-forge/linux-64/libarrow-13.0.0-hecbb4c5_13_cpu.conda#71172fd3f165406793843c3211248169
 https://conda.anaconda.org/conda-forge/noarch/nbclient-0.8.0-pyhd8ed1ab_0.conda#e78da91cf428faaf05701ce8cc8f2f9b
-https://conda.anaconda.org/conda-forge/noarch/py-cordex-0.6.2-pyhd8ed1ab_0.conda#457fae5edf0703054b78f6bfb200e855
+https://conda.anaconda.org/conda-forge/noarch/nc-time-axis-1.4.1-pyhd8ed1ab_0.tar.bz2#281b58948bf60a2582de9e548bcc5369
 https://conda.anaconda.org/conda-forge/noarch/pylint-celery-0.3-py_1.tar.bz2#e29456a611a62d3f26105a2f9c68f759
 https://conda.anaconda.org/conda-forge/noarch/pylint-django-2.5.3-pyhd8ed1ab_0.tar.bz2#00d8853fb1f87195722ea6a582cc9b56
 https://conda.anaconda.org/conda-forge/noarch/pylint-flask-0.6-py_0.tar.bz2#5a9afd3d0a61b08d59eed70fab859c1b
-https://conda.anaconda.org/conda-forge/linux-64/libgdal-3.7.0-h4a547c6_3.conda#a41bb5d9bbb3c80c041fbdef33bd27d5
-https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.7.3-pyhd8ed1ab_0.conda#063c1fda5480050b8d989478c97a4c55
-https://conda.anaconda.org/conda-forge/linux-64/netcdf-fortran-4.6.1-nompi_hec59055_101.conda#c84dbed01258db73689f72abc01c5e1a
-https://conda.anaconda.org/conda-forge/linux-64/netcdf4-1.6.4-nompi_py311h9a7c333_101.conda#1dc70c7c3352c0ff1f861d866860db37
-https://conda.anaconda.org/conda-forge/noarch/prospector-1.10.2-pyhd8ed1ab_0.conda#2c536985982f7e531df8d640f554008a
-https://conda.anaconda.org/conda-forge/linux-64/pyarrow-12.0.1-py311h39c9aba_8_cpu.conda#587370a25bb2c50cce90909ce20d38b8
-https://conda.anaconda.org/conda-forge/linux-64/pydot-1.4.2-py311h38be061_3.tar.bz2#64a77de29fde80aef5013ddf5e62a564
-https://conda.anaconda.org/conda-forge/noarch/dask-2023.8.0-pyhd8ed1ab_0.conda#0cd5f8a91edc681f4b87e8a0ce33a591
-https://conda.anaconda.org/conda-forge/linux-64/esmf-8.4.2-nompi_ha7f9e30_1.conda#f3516df9a5e2b2ef3e3be2b350f9e93d
-https://conda.anaconda.org/conda-forge/linux-64/gdal-3.7.0-py311h1caf18b_3.conda#7502ec69aa41329bd65aa44eb2853738
-https://conda.anaconda.org/conda-forge/noarch/iris-3.6.1-pyha770c72_0.conda#36d615b339058273520990fc78239116
-https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.7.3-pyhd8ed1ab_0.conda#f44109e52a40b8149156f5ddd9c11b26
+https://conda.anaconda.org/conda-forge/noarch/iris-3.7.0-pyha770c72_0.conda#dccc1f660bf455c239adaabf56b91dc9
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-7.10.0-pyhd8ed1ab_0.conda#56c421c936a17bbc7fd4b36c9bd3b236
+https://conda.anaconda.org/conda-forge/noarch/prospector-1.10.3-pyhd8ed1ab_0.conda#f551d4d859a1d70c6abff8310a655481
+https://conda.anaconda.org/conda-forge/noarch/py-cordex-0.6.5-pyhd8ed1ab_0.conda#28c3e17587c80297c4d9b1bc4cbba917
+https://conda.anaconda.org/conda-forge/linux-64/pyarrow-13.0.0-py311h39c9aba_13_cpu.conda#9b9c895aa2414d8c27e2e7818d13bef7
+https://conda.anaconda.org/conda-forge/linux-64/pydot-1.4.2-py311h38be061_4.conda#5c223cb0d9c05552bf9d1586a92720b2
+https://conda.anaconda.org/conda-forge/noarch/dask-2023.10.1-pyhd8ed1ab_0.conda#5b5af2efa7659441a9967734d046fecf
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-pandoc-7.10.0-pyhd8ed1ab_0.conda#2307d9331078c3097631ac2129d4f3cf
 https://conda.anaconda.org/conda-forge/noarch/prov-2.0.0-pyhd3deb0d_0.tar.bz2#aa9b3ad140f6c0668c646f32e20ccf82
-https://conda.anaconda.org/conda-forge/noarch/esmpy-8.4.2-pyhc1e730c_1.conda#4067029ad6872d49f6d43c05dd1f51a9
-https://conda.anaconda.org/conda-forge/linux-64/fiona-1.9.4-py311hbac4ec9_0.conda#1d3445f5f7fa002a1c149c405376f012
-https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.7.3-pyhd8ed1ab_0.conda#f53d92ecd7d8563b006107f6a33e55c6
-https://conda.anaconda.org/conda-forge/noarch/iris-esmf-regrid-0.7.0-pyhd8ed1ab_0.conda#de82eb8d09362babacafe6b7e27752ac
+https://conda.anaconda.org/conda-forge/noarch/iris-esmf-regrid-0.8.0-pyhd8ed1ab_0.conda#56e85460d22fa7d4fb06300f785dd1e1
+https://conda.anaconda.org/conda-forge/noarch/nbconvert-7.10.0-pyhd8ed1ab_0.conda#800568b9c39cfd87a2a6a9a0488ea265
 https://conda.anaconda.org/conda-forge/noarch/autodocsumm-0.2.6-pyhd8ed1ab_0.tar.bz2#4409dd7e06a62c3b2aa9e96782c49c6d
-https://conda.anaconda.org/conda-forge/noarch/nbsphinx-0.9.2-pyhd8ed1ab_0.conda#d1212b423fdd10d2da59601385561ff7
-https://conda.anaconda.org/conda-forge/noarch/pydata-sphinx-theme-0.13.3-pyhd8ed1ab_0.conda#07aca5f2dea315dcc16680d6891e9056
-https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-applehelp-1.0.6-pyhd8ed1ab_0.conda#5bba7b5823474cb3fcd4e4cbf942da61
-https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-devhelp-1.0.4-pyhd8ed1ab_0.conda#73dcd0eb2252cbd1530fd1e6e3cbbb03
-https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-htmlhelp-2.0.3-pyhd8ed1ab_0.conda#fb4d6329a57e20e03d7aecd18c7ca918
-https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-qthelp-1.0.5-pyhd8ed1ab_0.conda#85466265b76473cc1d02420056cbc4e3
-https://conda.anaconda.org/conda-forge/noarch/sphinx-7.1.2-pyhd8ed1ab_0.conda#d02bfa35cd4f2cd624289f64911cae9d
-https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.7-pyhd8ed1ab_0.conda#01e35beea8aff61cdb445b90a7adf7d4
+https://conda.anaconda.org/conda-forge/noarch/nbsphinx-0.9.3-pyhd8ed1ab_0.conda#0dbaa7d08d3d79b2a1a4dd6a02cc4581
+https://conda.anaconda.org/conda-forge/noarch/pydata-sphinx-theme-0.14.3-pyhd8ed1ab_0.conda#3a52e29fde69705040bcbe74cbdcbd5c
+https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-applehelp-1.0.7-pyhd8ed1ab_0.conda#aebfabcb60c33a89c1f9290cab49bc93
+https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-devhelp-1.0.5-pyhd8ed1ab_0.conda#ebf08f5184d8eaa486697bc060031953
+https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-htmlhelp-2.0.4-pyhd8ed1ab_0.conda#a9a89000dfd19656ad004b937eeb6828
+https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-qthelp-1.0.6-pyhd8ed1ab_0.conda#cf5c9649272c677a964a7313279e3a9b
+https://conda.anaconda.org/conda-forge/noarch/sphinx-7.2.6-pyhd8ed1ab_0.conda#bbfd1120d1824d2d073bc65935f0e4c0
+https://conda.anaconda.org/conda-forge/noarch/sphinxcontrib-serializinghtml-1.1.9-pyhd8ed1ab_0.conda#0612e497d7860728f2cda421ea2aec09
diff --git a/doc/changelog.rst b/doc/changelog.rst
index b8718686c7..daa5dae664 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -3,6 +3,144 @@
 Changelog
 =========
 
+.. _changelog-v2-10-0:
+
+v2.10.0
+-------
+Highlights
+
+TODO: add highlights
+
+This release includes
+
+Backwards incompatible changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  Remove the deprecated option ``use_legacy_supplementaries`` (`#2202 <https://github.com/ESMValGroup/ESMValCore/pull/2202>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+
+   - The recommended upgrade procedure is to remove ``use_legacy_supplementaries`` from config-user.yml
+     (if it was there) and remove any mention of ``fx_variables`` from the recipe. If automatically defining
+     the required supplementary variables does not work, define them in the variable or
+     (``additional_``) ``datasets`` section as described in :ref:`supplementary_variables`.
+
+-  Use smarter (units-aware) weights (`#2139 <https://github.com/ESMValGroup/ESMValCore/pull/2139>`__) `Manuel Schlund <https://github.com/schlunma>`__
+   
+   - Some preprocessors handle units better. For details, see the pull request.
+
+-  Removed deprecated configuration option ``offline`` (`#2213 <https://github.com/ESMValGroup/ESMValCore/pull/2213>`__) `Manuel Schlund <https://github.com/schlunma>`__
+
+   - In :ref:`changelog-v2-8-0`, we replaced the old ``offline`` configuration option. From this version on, it stops working.
+     Please refer to :ref:`changelog-v2-8-0` for upgrade instructions.
+
+-  Fix issue with CORDEX datasets requiring different dataset tags for downloads and fixes (`#2066 <https://github.com/ESMValGroup/ESMValCore/pull/2066>`__) `Joakim Löw <https://github.com/ljoakim>`__
+   
+   - Due to the different facets for CORDEX datasets, there was an inconsistency in the fixing mechanism.
+     This change requires changes to existing recipes that use CORDEX datasets. Please refer to the pull request for detailed update instructions.
+
+-  Added new operators for statistics preprocessor (e.g., ``'percentile'``) and allowed passing additional arguments (`#2191 <https://github.com/ESMValGroup/ESMValCore/pull/2191>`__) `Manuel Schlund <https://github.com/schlunma>`__
+   
+   - This harmonizes the operators for all statistics preprocessors. From this version, the new names can be used; the old arguments will stop working from
+     version 2.12.0. Please refer to :ref:`stat_preprocs` for a detailed description.
+
+-  For the following changes, no user change is necessary
+  
+   -  Remove deprecated way of calling :func:`~esmvalcore.cmor.table.read_cmor_tables` (`#2201 <https://github.com/ESMValGroup/ESMValCore/pull/2201>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+
+   -  Remove deprecated callback argument from preprocessor ``load`` function (`#2207 <https://github.com/ESMValGroup/ESMValCore/pull/2207>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+
+   -  Remove deprecated preprocessor function `cleanup` (`#2215 <https://github.com/ESMValGroup/ESMValCore/pull/2215>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+
+
+Deprecations
+~~~~~~~~~~~~
+
+-  Clearly separate fixes and CMOR checks (`#2157 <https://github.com/ESMValGroup/ESMValCore/pull/2157>`__) `Manuel Schlund <https://github.com/schlunma>`__
+
+Bug fixes
+~~~~~~~~~
+
+-  Re-add correctly region-extracted cell measures and ancillary variables after :ref:`extract_region` (`#2166 <https://github.com/ESMValGroup/ESMValCore/pull/2166>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__, `Manuel Schlund <https://github.com/schlunma>`__
+-  Fix sorting of datasets
+
+   -  Fix sorting of ensemble members in :func:`~esmvalcore.dataset.datasets_to_recipe` (`#2095 <https://github.com/ESMValGroup/ESMValCore/pull/2095>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+   -  Fix a problem with sorting datasets that have a mix of facet types (`#2238 <https://github.com/ESMValGroup/ESMValCore/pull/2238>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+   -  Avoid a crash if dataset has supplementary variables (`#2198 <https://github.com/ESMValGroup/ESMValCore/pull/2198>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+
+CMOR standard
+~~~~~~~~~~~~~
+
+-  ERA5 on-the-fly CMORizer: changed sign of variables ``evspsbl`` and ``evspsblpot`` (`#2115 <https://github.com/ESMValGroup/ESMValCore/pull/2115>`__) `katjaweigel <https://github.com/katjaweigel>`__
+-  Add ``ch4`` surface custom cmor table entry (`#2168 <https://github.com/ESMValGroup/ESMValCore/pull/2168>`__) `Birgit Hassler <https://github.com/hb326>`__
+-  Add CMIP3 institutes names used at NCI (`#2152 <https://github.com/ESMValGroup/ESMValCore/pull/2152>`__) `Romain Beucher <https://github.com/rbeucher>`__
+-  Added :func:`~esmvalcore.cmor.fixes.get_time_bounds` and :func:`~esmvalcore.cmor.fixes.get_next_month` to public API (`#2214 <https://github.com/ESMValGroup/ESMValCore/pull/2214>`__) `Manuel Schlund <https://github.com/schlunma>`__
+-  Improve concatenation checks
+
+   -  Relax concatenation checks for ``--check_level=relax`` and ``--check_level=ignore`` (`#2144 <https://github.com/ESMValGroup/ESMValCore/pull/2144>`__) `sloosvel <https://github.com/sloosvel>`__
+   -  Fix ``concatenate`` preprocessor function (`#2240 <https://github.com/ESMValGroup/ESMValCore/pull/2240>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+   -  Fix time overlap handling in concatenation (`#2247 <https://github.com/ESMValGroup/ESMValCore/pull/2247>`__) `Klaus Zimmermann <https://github.com/zklaus>`__
+
+Computational performance improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-  Make :ref:`threshold_masking` preprocessors lazy  (`#2169 <https://github.com/ESMValGroup/ESMValCore/pull/2169>`__) `Jörg Benke <https://github.com/joergbenke>`__
+
+   -  Restored usage of numpy in `_mask_with_shp` (`#2209 <https://github.com/ESMValGroup/ESMValCore/pull/2209>`__) `Jörg Benke <https://github.com/joergbenke>`__
+-  Call coord.core_bounds() instead of coord.bounds in ``check.py`` (`#2146 <https://github.com/ESMValGroup/ESMValCore/pull/2146>`__) `sloosvel <https://github.com/sloosvel>`__
+-  Rechunk between preprocessor steps (`#2205 <https://github.com/ESMValGroup/ESMValCore/pull/2205>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+-  Reduce the size of the dask graph created by the ``anomalies`` preprocessor function (`#2200 <https://github.com/ESMValGroup/ESMValCore/pull/2200>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+
+Documentation
+~~~~~~~~~~~~~
+
+-  Add reference to release v2.9.0 in the changelog (`#2130 <https://github.com/ESMValGroup/ESMValCore/pull/2130>`__) `Rémi Kazeroni <https://github.com/remi-kazeroni>`__
+-  Add merge instructions to release instructions (`#2131 <https://github.com/ESMValGroup/ESMValCore/pull/2131>`__) `Klaus Zimmermann <https://github.com/zklaus>`__
+-  Update `mamba` before building environment during Readthedocs build (`#2149 <https://github.com/ESMValGroup/ESMValCore/pull/2149>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+-  Ensure compatible zstandard and zstd versions for .conda support (`#2204 <https://github.com/ESMValGroup/ESMValCore/pull/2204>`__) `Klaus Zimmermann <https://github.com/zklaus>`__
+-  Remove outdated documentation (`#2210 <https://github.com/ESMValGroup/ESMValCore/pull/2210>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+-  Remove meercode badge from README because their API is broken (`#2224 <https://github.com/ESMValGroup/ESMValCore/pull/2224>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+-  Correct usage help text of version command (`#2232 <https://github.com/ESMValGroup/ESMValCore/pull/2232>`__) `James Frost <https://github.com/jfrost-mo>`__
+-  Add ``navigation_with_keys: False`` to ``html_theme_options`` in Readthedocs ``conf.py`` (`#2245 <https://github.com/ESMValGroup/ESMValCore/pull/2245>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+-  Replace squarey badge with roundy shield for Anaconda sticker in README (`#2233 <https://github.com/ESMValGroup/ESMValCore/pull/2233>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+
+Fixes for datasets
+~~~~~~~~~~~~~~~~~~
+
+-  Updated doc about fixes and added type hints to fix functions (`#2160 <https://github.com/ESMValGroup/ESMValCore/pull/2160>`__) `Manuel Schlund <https://github.com/schlunma>`__
+
+Installation
+~~~~~~~~~~~~
+
+-  Clean-up how pins are written in conda environment file (`#2125 <https://github.com/ESMValGroup/ESMValCore/pull/2125>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+-  Use importlib.metadata instead of deprecated pkg_resources (`#2096 <https://github.com/ESMValGroup/ESMValCore/pull/2096>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+-  Pin shapely to >=2.0 (`#2075 <https://github.com/ESMValGroup/ESMValCore/pull/2075>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+
+Preprocessor
+~~~~~~~~~~~~
+
+-  Improve preprocessor output sorting code (`#2111 <https://github.com/ESMValGroup/ESMValCore/pull/2111>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+-  Preprocess datasets in the same order as they are listed in the recipe (`#2103 <https://github.com/ESMValGroup/ESMValCore/pull/2103>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+
+Automatic testing
+~~~~~~~~~~~~~~~~~
+
+-  [Github Actions] Compress all bash shell setters into one default option per workflow (`#2126 <https://github.com/ESMValGroup/ESMValCore/pull/2126>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+-  [Github Actions] Fix Monitor Tests Github Action (`#2135 <https://github.com/ESMValGroup/ESMValCore/pull/2135>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+-  [condalock] update conda lock file (`#2141 <https://github.com/ESMValGroup/ESMValCore/pull/2141>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+-  [Condalock] make sure mamba/conda are at latest version by forcing a pinned mamba install (`#2136 <https://github.com/ESMValGroup/ESMValCore/pull/2136>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+-  Update code coverage orbs (`#2206 <https://github.com/ESMValGroup/ESMValCore/pull/2206>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+-  Revisit the comment-triggered Github Actions test (`#2243 <https://github.com/ESMValGroup/ESMValCore/pull/2243>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+-  Remove workflow that runs Github Actions tests from PR comment (`#2244 <https://github.com/ESMValGroup/ESMValCore/pull/2244>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+
+Improvements
+~~~~~~~~~~~~
+
+-  Merge v2.9.x into main (`#2128 <https://github.com/ESMValGroup/ESMValCore/pull/2128>`__) `Manuel Schlund <https://github.com/schlunma>`__
+-  Fix typo in citation file (`#2182 <https://github.com/ESMValGroup/ESMValCore/pull/2182>`__) `Bouwe Andela <https://github.com/bouweandela>`__
+-  Cleaned and extended function that extracts datetimes from paths (`#2181 <https://github.com/ESMValGroup/ESMValCore/pull/2181>`__) `Manuel Schlund <https://github.com/schlunma>`__
+-  Add file encoding (and some read modes) at open file step (`#2219 <https://github.com/ESMValGroup/ESMValCore/pull/2219>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+-  Check type of argument passed to :func:`~esmvalcore.cmor.table.read_cmor_tables` (`#2217 <https://github.com/ESMValGroup/ESMValCore/pull/2217>`__) `Valeriu Predoi <https://github.com/valeriupredoi>`__
+-  Dynamic HTML output for monitoring (`#2062 <https://github.com/ESMValGroup/ESMValCore/pull/2062>`__) `Brei Soliño <https://github.com/bsolino>`__
+
 
 .. _changelog-v2-9-0:
 
diff --git a/doc/conf.py b/doc/conf.py
index a71f331378..1613a0133b 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -152,7 +152,19 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-# html_theme_options = {}
+#
+# Avoid the following warning issued by pydata_sphinx_theme:
+#
+# "WARNING: The default value for `navigation_with_keys` will change to `False`
+# in the next release. If you wish to preserve the old behavior for your site,
+# set `navigation_with_keys=True` in the `html_theme_options` dict in your
+# `conf.py` file.Be aware that `navigation_with_keys = True` has negative
+# accessibility implications:
+# https://github.com/pydata/pydata-sphinx-theme/issues/1492"
+# Short synopsis of said issue: as of now, left/right keys take one
+# to the previous/next page instead of scrolling horizontally; this
+# should be fixed upstream, then we can set again navigation with keys True
+html_theme_options = {"navigation_with_keys": False}
 
 # Add any paths that contain custom themes here, relative to this directory.
 # html_theme_path = []
diff --git a/doc/contributing.rst b/doc/contributing.rst
index 8201fac707..814ab79263 100644
--- a/doc/contributing.rst
+++ b/doc/contributing.rst
@@ -550,18 +550,6 @@ and the result of the tests ran by GitHub Actions can be viewed on the
 of the repository (to learn more about the Github-hosted runners, please have a look
 the `documentation <https://docs.github.com/en/actions/using-github-hosted-runners>`__).
 
-When opening a pull request, if you wish to run the Github Actions `Test <https://github.com/ESMValGroup/ESMValCore/actions/workflows/run-tests.yml>`__ test,
-you can activate it via a simple comment containing the @runGAtests tag
-(e.g. "@runGAtests" or "@runGAtests please run" - in effect, tagging the runGAtests
-bot that will start the test automatically). This is useful
-to check if a certain feature that you included in the Pull Request, and can be tested
-for via the test suite, works across the supported Python versions, and both on Linux and OSX.
-The test is currently deactivated, so before triggering the test via comment, make sure you activate
-the test in the main `Actions page <https://github.com/ESMValGroup/ESMValCore/actions>`__
-(click on Test via PR Comment and activate it); also and be sure to deactivate it afterwards
-(the Github API still needs a bit more development, and currently it triggers
-the test for **each comment** irrespective of PR, that's why this needs to be activated/decativated).
-
 The configuration of the tests run by CircleCI can be found in the directory
 `.circleci <https://github.com/ESMValGroup/ESMValCore/blob/main/.circleci>`__,
 while the configuration of the tests run by GitHub Actions can be found in the
diff --git a/doc/gensidebar.py b/doc/gensidebar.py
index 970722ff0a..01f8b3e839 100644
--- a/doc/gensidebar.py
+++ b/doc/gensidebar.py
@@ -10,13 +10,13 @@
 def _write_if_changed(fname, contents):
     """Write/update file only if changed."""
     try:
-        with open(fname, "r") as stream:
+        with open(fname, "r", encoding="utf-8") as stream:
             old_contents = stream.read()
     except IOError:
         old_contents = ""
 
     if old_contents != contents:
-        with open(fname, "w") as stream:
+        with open(fname, "w", encoding="utf-8") as stream:
             stream.write(contents)
 
 
diff --git a/doc/quickstart/run.rst b/doc/quickstart/run.rst
index 03eec25444..ebde6d4075 100644
--- a/doc/quickstart/run.rst
+++ b/doc/quickstart/run.rst
@@ -78,7 +78,9 @@ or
 This feature is available for projects that are hosted on the ESGF, i.e.
 CMIP3, CMIP5, CMIP6, CORDEX, and obs4MIPs.
 
-To control the strictness of the CMOR checker, use the flag ``--check_level``:
+To control the strictness of the CMOR checker and the checks during concatenation
+on auxiliary coordinates, supplementary variables, and derived coordinates, 
+use the flag ``--check_level``:
 
 .. code:: bash
 
@@ -86,10 +88,10 @@ To control the strictness of the CMOR checker, use the flag ``--check_level``:
 
 Possible values are:
 
-  - `ignore`: all errors will be reported as warnings
-  - `relaxed`: only fail if there are critical errors
-  - `default`: fail if there are any errors
-  - `strict`: fail if there are any warnings
+  - `ignore`: all errors will be reported as warnings. Concatenation will be performed without checks.
+  - `relaxed`: only fail if there are critical errors. Concatenation will be performed without checks.
+  - `default`: fail if there are any errors.
+  - `strict`: fail if there are any warnings.
 
 To re-use pre-processed files from a previous run of the same recipe, you can
 use
diff --git a/doc/recipe/preprocessor.rst b/doc/recipe/preprocessor.rst
index 8a0c1a54b7..5c4b14e351 100644
--- a/doc/recipe/preprocessor.rst
+++ b/doc/recipe/preprocessor.rst
@@ -7,6 +7,8 @@ Preprocessor
 In this section, each of the preprocessor modules is described,
 roughly following the default order in which preprocessor functions are applied:
 
+* :ref:`Overview`
+* :ref:`stat_preprocs`
 * :ref:`Variable derivation`
 * :ref:`CMOR check and dataset-specific fixes`
 * :ref:`preprocessors_using_supplementary_variables`
@@ -30,6 +32,8 @@ roughly following the default order in which preprocessor functions are applied:
 
 See :ref:`preprocessor_functions` for implementation details and the exact default order.
 
+.. _overview:
+
 Overview
 ========
 
@@ -52,6 +56,136 @@ for instance, for multi-model statistics, which required the model to be on a
 common grid and therefore has to be called after the regridding module.
 
 
+.. _stat_preprocs:
+
+Statistical preprocessors
+=========================
+
+Many preprocessors calculate statistics over data.
+Those preprocessors typically end with ``_statistics``, e.g.,
+:func:`~esmvalcore.preprocessor.area_statistics` or
+:func:`~esmvalcore.preprocessor.multi_model_statistics`.
+All these preprocessors support the options `operator`, which directly
+correspond to :class:`iris.analysis.Aggregator` objects used to perform the
+statistical calculations.
+In addition, arbitrary keyword arguments can be passed which are directly
+passed to the corresponding :class:`iris.analysis.Aggregator` object.
+
+.. note::
+    The preprocessors :func:`~esmvalcore.preprocessor.multi_model_statistics`
+    and :func:`~esmvalcore.preprocessor.ensemble_statistics` support the
+    computation of multiple statistics at the same time.
+    In these cases, they are defined by the option `statistics` (instead of
+    `operator`), which takes a list of possible operators.
+    Each operator can be given as single string or as dictionary.
+    In the latter case, the dictionary needs the keyword `operator`
+    (corresponding to the `operator` as above).
+    All other keywords are interpreted as keyword arguments for the given
+    operator.
+
+Some operators support weights for some preprocessors (see following table),
+which are used by default.
+The following operators are currently fully supported; other operators might be
+supported too if proper keyword arguments are specified:
+
+.. _supported_stat_operator:
+
+============================== ================================================= =====================================
+`operator`                     Corresponding :class:`~iris.analysis.Aggregator`  Weighted? [1]_
+============================== ================================================= =====================================
+``gmean``                      :const:`iris.analysis.GMEAN`                      no
+``hmean``                      :const:`iris.analysis.HMEAN`                      no
+``max``                        :const:`iris.analysis.MAX`                        no
+``mean``                       :const:`iris.analysis.MEAN`                       yes
+``median``                     :const:`iris.analysis.MEDIAN` [2]_                no
+``min``                        :const:`iris.analysis.MIN`                        no
+``peak``                       :const:`iris.analysis.PEAK`                       no
+``percentile``                 :const:`iris.analysis.PERCENTILE`                 no
+``rms``                        :const:`iris.analysis.RMS`                        yes
+``std_dev``                    :const:`iris.analysis.STD_DEV`                    no
+``sum``                        :const:`iris.analysis.SUM`                        yes
+``variance``                   :const:`iris.analysis.VARIANCE`                   no
+``wpercentile``                :const:`iris.analysis.WPERCENTILE`                yes
+============================== ================================================= =====================================
+
+.. [1] The following preprocessor support weighted statistics by default:
+    :func:`~esmvalcore.preprocessor.area_statistics`: weighted by grid cell
+    areas (see also :ref:`preprocessors_using_supplementary_variables`);
+    :func:`~esmvalcore.preprocessor.climate_statistics`: weighted by lengths of
+    time intervals; :func:`~esmvalcore.preprocessor.volume_statistics`:
+    weighted by grid cell volumes (see also
+    :ref:`preprocessors_using_supplementary_variables`);
+    :func:`~esmvalcore.preprocessor.axis_statistics`: weighted by
+    corresponding coordinate bounds.
+.. [2] :const:`iris.analysis.MEDIAN` is not lazy, but much faster than
+    :const:`iris.analysis.PERCENTILE`. For a lazy median, use ``percentile``
+    with the keyword argument ``percent: 50``.
+
+Examples
+--------
+
+Calculate the global (weighted) mean:
+
+.. code-block:: yaml
+
+  preprocessors:
+    global_mean:
+      area_statistics:
+        operator: mean
+
+Calculate zonal maximum.
+
+.. code-block:: yaml
+
+  preprocessors:
+    zonal_max:
+      zonal_statistics:
+        operator: max
+
+Calculate the 95% percentile over each month separately (will result in 12 time
+steps, one for January, one for February, etc.):
+
+.. code-block:: yaml
+
+  preprocessors:
+    monthly_percentiles:
+      climate_statistics:
+        period: monthly
+        operator: percentile
+        percent: 95.0
+
+Calculate multi-model median, 5%, and 95% percentiles:
+
+.. code-block:: yaml
+
+  preprocessors:
+    mm_stats:
+      multi_model_statistics:
+        span: overlap
+        statistics:
+          - operator: percentile
+            percent: 5
+          - operator: median
+          - operator: percentile
+            percent: 95
+
+Calculate the global non-weighted root mean square:
+
+.. code-block:: yaml
+
+  preprocessors:
+    global_mean:
+      area_statistics:
+        operator: rms
+        weighted: false
+
+.. warning::
+
+  The disabling of weights by specifying the keyword argument ``weights:
+  False`` needs to be used with great care; from a scientific standpoint, we
+  strongly recommend to **not** use it!
+
+
 .. _Variable derivation:
 
 Variable derivation
@@ -300,134 +434,6 @@ and cell measure (``areacella``), but do not use ``areacella`` for dataset
           timerange: '1990/2000'
       scripts: null
 
-
-.. _`Fx variables as cell measures or ancillary variables`:
-
-Legacy method of specifying supplementary variables
----------------------------------------------------
-
-.. deprecated:: 2.8.0
-  The legacy method of specifying supplementary variables is deprecated and will
-  be removed in version 2.10.0.
-  To upgrade, remove all occurrences of ``fx_variables`` from your recipes and
-  rely on automatically defining the supplementary variables based on the
-  requirement of the preprocessor functions or specify them using the methods
-  described above.
-  To keep using the legacy behaviour until v2.10.0, set
-  ``use_legacy_supplementaries: true`` in the :ref:`user configuration file` or
-  run the tool with the flag ``--use-legacy-supplementaries=True``.
-
-Prior to version 2.8.0 of the tool, the supplementary variables could not be
-defined at the variable or dataset level in the recipe, but could only be
-defined in the preprocessor function that uses them using the ``fx_variables``
-argument.
-This does not work well because in practice different datasets store their
-supplementary variables under different facets.
-For example, one dataset might only provide the ``areacella`` variable under the
-``1pctCO2`` experiment while another one might only provide it for the
-``historical`` experiment.
-This forced the user to define a preprocessor per dataset, which was
-inconvenient.
-
-============================================================== =====================
-Preprocessor                                                   Default fx variables
-============================================================== =====================
-:ref:`area_statistics<area_statistics>`                        ``areacella``, ``areacello``
-:ref:`mask_landsea<land/sea/ice masking>`                      ``sftlf``, ``sftof``
-:ref:`mask_landseaice<ice masking>`                            ``sftgif``
-:ref:`volume_statistics<volume_statistics>`                    ``volcello``
-:ref:`weighting_landsea_fraction<land/sea fraction weighting>` ``sftlf``, ``sftof``
-============================================================== =====================
-
-If the option ``fx_variables`` is not explicitly specified for these
-preprocessors, the default fx variables in the second column are automatically
-used. If given, the ``fx_variables`` argument specifies the fx variables that
-the user wishes to input to the corresponding preprocessor function. The user
-may specify these by simply adding the names of the variables, e.g.,
-
-.. code-block:: yaml
-
-    fx_variables:
-      areacello:
-      volcello:
-
-or by additionally specifying further keys that are used to define the fx
-datasets, e.g.,
-
-.. code-block:: yaml
-
-    fx_variables:
-      areacello:
-        mip: Ofx
-        exp: piControl
-      volcello:
-        mip: Omon
-
-This might be useful to select fx files from a specific ``mip`` table or from a
-specific ``exp`` in case not all experiments provide the fx variable.
-
-Alternatively, the ``fx_variables`` argument can also be specified as a list:
-
-.. code-block:: yaml
-
-    fx_variables: ['areacello', 'volcello']
-
-or as a list of dictionaries:
-
-.. code-block:: yaml
-
-    fx_variables: [{'short_name': 'areacello', 'mip': 'Ofx', 'exp': 'piControl'}, {'short_name': 'volcello', 'mip': 'Omon'}]
-
-The recipe parser will automatically find the data files that are associated
-with these variables and pass them to the function for loading and processing.
-
-If ``mip`` is not given, ESMValCore will search for the fx variable in all
-available tables of the specified project.
-
-.. warning::
-   Some fx variables exist in more than one table (e.g., ``volcello`` exists in
-   CMIP6's ``Odec``, ``Ofx``, ``Omon``, and ``Oyr`` tables; ``sftgif`` exists
-   in CMIP6's ``fx``, ``IyrAnt`` and ``IyrGre``, and ``LImon`` tables). If (for
-   a given dataset) fx files are found in more than one table, ``mip`` needs to
-   be specified, otherwise an error is raised.
-
-.. note::
-   To explicitly **not** use any fx variables in a preprocessor, use
-   ``fx_variables: null``.  While some of the preprocessors mentioned above do
-   work without fx variables (e.g., ``area_statistics`` or ``mask_landsea``
-   with datasets that have regular latitude/longitude grids), using this option
-   is **not** recommended.
-
-Internally, the required ``fx_variables`` are automatically loaded by the
-preprocessor step ``add_fx_variables`` which also checks them against CMOR
-standards and adds them either as ``cell_measure`` (see `CF conventions on cell
-measures
-<https://cfconventions.org/cf-conventions/cf-conventions.html#cell-measures>`_
-and :class:`iris.coords.CellMeasure`) or ``ancillary_variable`` (see `CF
-conventions on ancillary variables
-<https://cfconventions.org/cf-conventions/cf-conventions.html#ancillary-data>`_
-and :class:`iris.coords.AncillaryVariable`) inside the cube data. This ensures
-that the defined preprocessor chain is applied to both ``variables`` and
-``fx_variables``.
-
-Note that when calling steps that require ``fx_variables`` inside diagnostic
-scripts, the variables are expected to contain the required ``cell_measures`` or
-``Fx variables as cell measures or ancillary variables``. If missing, they can be added using the following functions:
-
-.. code-block::
-
-    from esmvalcore.preprocessor import (add_cell_measure, add_ancillary_variable)
-
-    cube_with_area_measure = add_cell_measure(cube, area_cube, 'area')
-
-    cube_with_volume_measure = add_cell_measure(cube, volume_cube, 'volume)
-
-    cube_with_ancillary_sftlf = add_ancillary_variable(cube, sftlf_cube)
-
-    cube_with_ancillary_sftgif = add_ancillary_variable(cube, sftgif_cube)
-
-  Details on the arguments needed for each step can be found in the following sections.
-
 .. _Vertical interpolation:
 
 Vertical interpolation
@@ -591,11 +597,6 @@ This function requires a land or sea area fraction `ancillary variable`_.
 This supplementary variable, either ``sftlf`` or ``sftof``, should be attached
 to the main dataset as described in :ref:`supplementary_variables`.
 
-.. deprecated:: 2.8.0
-  The optional ``fx_variables`` argument specifies the fx variables that the
-  user wishes to input to the function.
-  More details on this are given in :ref:`Fx variables as cell measures or ancillary variables`.
-
 See also :func:`esmvalcore.preprocessor.weighting_landsea_fraction`.
 
 
@@ -642,12 +643,6 @@ but if it is not available it will compute a mask based on
 This supplementary variable, either ``sftlf`` or ``sftof``, can be attached
 to the main dataset as described in :ref:`supplementary_variables`.
 
-.. deprecated:: 2.8.0
-  The optional ``fx_variables`` argument specifies the fx variables that the
-  user wishes to input to the function.
-  More details on this are given in :ref:`Fx variables as cell measures or ancillary variables`.
-
-
 If the corresponding ancillary variable is not available (which is
 the case for some models and almost all observational datasets), the
 preprocessor attempts to mask the data using Natural Earth mask files (that are
@@ -679,11 +674,6 @@ This function requires a land ice area fraction `ancillary variable`_.
 This supplementary variable ``sftgif`` should be attached to the main dataset as
 described in :ref:`supplementary_variables`.
 
-.. deprecated:: 2.8.0
-  The optional ``fx_variables`` argument specifies the fx variables that the
-  user wishes to input to the function.
-  More details on this are given in :ref:`Fx variables as cell measures or ancillary variables`.
-
 See also :func:`esmvalcore.preprocessor.mask_landseaice`.
 
 Glaciated masking
@@ -754,6 +744,8 @@ After ``mask_multimodel``, all involved datasets have an identical mask.
 
 See also :func:`esmvalcore.preprocessor.mask_multimodel`.
 
+.. _threshold_masking:
+
 Minimum, maximum and interval masking
 -------------------------------------
 
@@ -1031,7 +1023,7 @@ statistics. This grouping is performed taking into account the dataset tags
 However, they should typically be computed earlier in the workflow.
 Moreover, because multiple ensemble members of the same model are typically more
 consistent/homogeneous than datasets from different models, the implementation
-is more straigtforward and can benefit from lazy evaluation and more efficient
+is more straightforward and can benefit from lazy evaluation and more efficient
 computation.
 
 The preprocessor takes a list of statistics as input:
@@ -1043,10 +1035,22 @@ The preprocessor takes a list of statistics as input:
         ensemble_statistics:
           statistics: [mean, median]
 
+Additional keyword arguments can be given by using a dictionary:
+
+.. code-block:: yaml
+
+    preprocessors:
+      example_preprocessor:
+        ensemble_statistics:
+          statistics:
+            - operator: percentile
+              percent: 20
+            - operator: median
+
 This preprocessor function exposes the iris analysis package, and works with all
 (capitalized) statistics from the :mod:`iris.analysis` package
-that can be executed without additional arguments (e.g. percentiles are not
-supported because it requires additional keywords: percentile.).
+that can be executed without additional arguments.
+See :ref:`stat_preprocs` for more details on supported statistics.
 
 Note that ``ensemble_statistics`` will not return the single model and ensemble files,
 only the requested ensemble statistics results.
@@ -1087,11 +1091,12 @@ set-up, initial conditions, forcings and implementation; comparing model data to
 observational data, these biases have a significantly lower statistical impact
 when using a multi-model ensemble. ESMValCore has the capability of computing a
 number of multi-model statistical measures: using the preprocessor module
-``multi_model_statistics`` will enable the user to ask for either a multi-model
-``mean``, ``median``, ``max``, ``min``, ``std_dev``, and / or ``pXX.YY`` with a set
-of argument parameters passed to ``multi_model_statistics``. Percentiles can be
-specified like ``p1.5`` or ``p95``. The decimal point will be replaced by a dash
-in the output file.
+``multi_model_statistics`` will enable the user for example to ask for either a multi-model
+``mean``, ``median``, ``max``, ``min``, ``std_dev``, and / or ``percentile``
+with a set of argument parameters passed to ``multi_model_statistics``.
+See :ref:`stat_preprocs` for more details on supported statistics.
+Percentiles can be specified with additional keyword arguments using the syntax
+``statistics: [{operator: percentile, percent: xx}]``.
 
 Restrictive computation is also available by excluding any set of models that
 the user will not want to include in the statistics (by setting ``exclude:
@@ -1132,6 +1137,14 @@ and `ptop`) are always removed.
           exclude: [NCEP-NCAR-R1]
           keep_input_datasets: false
           ignore_scalar_coords: true
+      multi_model_percentiles_5_95:
+        multi_model_statistics:
+          span: overlap
+          statistics:
+            - operator: percentile
+              percent: 5
+            - operator: percentile
+              percent: 95
 
 Multi-model statistics also supports a ``groupby`` argument. You can group by
 any dataset key (``project``, ``experiment``, etc.) or a combination of keys in a list. You can
@@ -1183,14 +1196,6 @@ Note that those datasets can be excluded if listed in the ``exclude`` option.
 
 See also :func:`esmvalcore.preprocessor.multi_model_statistics`.
 
-.. note::
-
-   The multi-model array operations can be rather memory-intensive (since they
-   are not performed lazily as yet). The Section on :ref:`Memory use` details
-   the memory intake for different run scenarios, but as a thumb rule, for the
-   multi-model preprocessor, the expected maximum memory intake could be
-   approximated as the number of datasets multiplied by the average size in
-   memory for one dataset.
 
 .. _time operations:
 
@@ -1294,11 +1299,14 @@ See also :func:`esmvalcore.preprocessor.extract_month`.
 This function produces statistics at a x-hourly frequency.
 
 Parameters:
-    * every_n_hours: frequency to use to compute the statistics. Must be a divisor of
-      24.
-
-    * operator: operation to apply. Accepted values are 'mean',
-      'median', 'std_dev', 'min', 'max' and 'sum'. Default is 'mean'
+    * `hour`: Number of hours per period.
+      Must be a divisor of 24, i.e., (1, 2, 3, 4, 6, 8, 12).
+    * `operator`: Operation to apply.
+      See :ref:`stat_preprocs` for more details on supported statistics.
+      Default is `mean`.
+    * Other parameters are directly passed to the `operator` as keyword
+      arguments.
+      See :ref:`stat_preprocs` for more details.
 
 See also :func:`esmvalcore.preprocessor.hourly_statistics`.
 
@@ -1310,8 +1318,12 @@ See also :func:`esmvalcore.preprocessor.hourly_statistics`.
 This function produces statistics for each day in the dataset.
 
 Parameters:
-    * operator: operation to apply. Accepted values are 'mean',
-      'median', 'std_dev', 'min', 'max', 'sum' and 'rms'. Default is 'mean'
+    * `operator`: Operation to apply.
+      See :ref:`stat_preprocs` for more details on supported statistics.
+      Default is `mean`.
+    * Other parameters are directly passed to the `operator` as keyword
+      arguments.
+      See :ref:`stat_preprocs` for more details.
 
 See also :func:`esmvalcore.preprocessor.daily_statistics`.
 
@@ -1323,8 +1335,12 @@ See also :func:`esmvalcore.preprocessor.daily_statistics`.
 This function produces statistics for each month in the dataset.
 
 Parameters:
-    * operator: operation to apply. Accepted values are 'mean',
-      'median', 'std_dev', 'min', 'max', 'sum' and 'rms'. Default is 'mean'
+    * `operator`: Operation to apply.
+      See :ref:`stat_preprocs` for more details on supported statistics.
+      Default is `mean`.
+    * Other parameters are directly passed to the `operator` as keyword
+      arguments.
+      See :ref:`stat_preprocs` for more details.
 
 See also :func:`esmvalcore.preprocessor.monthly_statistics`.
 
@@ -1340,14 +1356,17 @@ looking at the DJF field, but your datasets starts on January 1st, the first
 DJF field will only contain data from January and February.
 
 We recommend using the extract_time to start the dataset from the following
-December and remove such biased initial datapoints.
+December and remove such biased initial data points.
 
 Parameters:
-    * operator: operation to apply. Accepted values are 'mean',
-      'median', 'std_dev', 'min', 'max', 'sum' and 'rms'. Default is 'mean'
-
-    * seasons: seasons to build statistics.
-      Default is '[DJF, MAM, JJA, SON]'
+    * `operator`: Operation to apply.
+      See :ref:`stat_preprocs` for more details on supported statistics.
+      Default is `mean`.
+    * `seasons`: Seasons to build statistics.
+      Default is ``'[DJF, MAM, JJA, SON]'``.
+    * Other parameters are directly passed to the `operator` as keyword
+      arguments.
+      See :ref:`stat_preprocs` for more details.
 
 See also :func:`esmvalcore.preprocessor.seasonal_statistics`.
 
@@ -1359,8 +1378,12 @@ See also :func:`esmvalcore.preprocessor.seasonal_statistics`.
 This function produces statistics for each year.
 
 Parameters:
-    * operator: operation to apply. Accepted values are 'mean',
-      'median', 'std_dev', 'min', 'max', 'sum' and 'rms'. Default is 'mean'
+    * `operator`: Operation to apply.
+      See :ref:`stat_preprocs` for more details on supported statistics.
+      Default is `mean`.
+    * Other parameters are directly passed to the `operator` as keyword
+      arguments.
+      See :ref:`stat_preprocs` for more details.
 
 See also :func:`esmvalcore.preprocessor.annual_statistics`.
 
@@ -1372,8 +1395,12 @@ See also :func:`esmvalcore.preprocessor.annual_statistics`.
 This function produces statistics for each decade.
 
 Parameters:
-    * operator: operation to apply. Accepted values are 'mean',
-      'median', 'std_dev', 'min', 'max', 'sum' and 'rms'. Default is 'mean'
+    * `operator`: Operation to apply.
+      See :ref:`stat_preprocs` for more details on supported statistics.
+      Default is `mean`.
+    * Other parameters are directly passed to the `operator` as keyword
+      arguments.
+      See :ref:`stat_preprocs` for more details.
 
 See also :func:`esmvalcore.preprocessor.decadal_statistics`.
 
@@ -1387,16 +1414,25 @@ This function produces statistics for the whole dataset. It can produce scalars
 statistics.
 
 Parameters:
-    * operator: operation to apply. Accepted values are 'mean', 'median',
-      'std_dev', 'min', 'max', 'sum' and 'rms'. Default is 'mean'
-
-    * period: define the granularity of the statistics: get values for the
+    * `operator`: Operation to apply.
+      See :ref:`stat_preprocs` for more details on supported statistics.
+      Default is `mean`.
+    * `period`: Define the granularity of the statistics: get values for the
       full period, for each month, day of year or hour of day.
-      Available periods: 'full', 'season', 'seasonal', 'monthly', 'month',
-      'mon', 'daily', 'day', 'hourly', 'hour', 'hr'. Default is 'full'
+      Available periods: `full`, `season`, `seasonal`, `monthly`, `month`,
+      `mon`, `daily`, `day`, `hourly`, `hour`, `hr`. Default is `full`.
+    * `seasons`: if period 'seasonal' or 'season' allows to set custom seasons.
+      Default is ``'[DJF, MAM, JJA, SON]'``.
+    * Other parameters are directly passed to the `operator` as keyword
+      arguments.
+      See :ref:`stat_preprocs` for more details.
 
-    * seasons: if period 'seasonal' or 'season' allows to set custom seasons.
-      Default is '[DJF, MAM, JJA, SON]'
+.. note::
+   Some operations are weighted by the time coordinate by default, i.e., the
+   length of the time intervals.
+   See :ref:`stat_preprocs` for more details on supported statistics.
+   For `sum`, the units of the resulting cube are multiplied by the
+   corresponding time units (e.g., days).
 
 Examples:
     * Monthly climatology:
@@ -1404,8 +1440,8 @@ Examples:
         .. code-block:: yaml
 
             climate_statistics:
-                operator: mean
-                period: month
+              operator: mean
+              period: month
 
     * Daily maximum for the full period:
 
@@ -1423,6 +1459,15 @@ Examples:
               operator: min
               period: full
 
+    * 80% percentile for each month:
+
+        .. code-block:: yaml
+
+            climate_statistics:
+              period: month
+              operator: percentile
+              percent: 80
+
 See also :func:`esmvalcore.preprocessor.climate_statistics`.
 
 .. _resample_time:
@@ -1653,6 +1698,7 @@ Examples:
 
 See also :func:`esmvalcore.preprocessor.extract_coordinate_points`.
 
+.. _extract_region:
 
 ``extract_region``
 ------------------
@@ -1839,12 +1885,12 @@ but also mountains or other geographical locations.
    Note that this function's geolocator application needs a
    working internet connection.
 
-Parameters
-  * ``cube``: the input dataset cube to extract a point from.
-  * ``location``: the reference location. Examples: 'mount everest',
-    'romania', 'new york, usa'. Raises ValueError if none supplied.
-  * ``scheme`` : interpolation scheme. ``'linear'`` or ``'nearest'``.
-    There is no default, raises ValueError if none supplied.
+Parameters:
+    * `cube`: the input dataset cube to extract a point from.
+    * `location`: the reference location. Examples: 'mount everest',
+      'romania', 'new york, usa'. Raises ValueError if none supplied.
+    * `scheme` : interpolation scheme. `linear` or `nearest`.
+      There is no default, raises ValueError if none supplied.
 
 See also :func:`esmvalcore.preprocessor.extract_location`.
 
@@ -1853,9 +1899,14 @@ See also :func:`esmvalcore.preprocessor.extract_location`.
 --------------------
 
 The function calculates the zonal statistics by applying an operator
-along the longitude coordinate. This function takes one argument:
+along the longitude coordinate.
 
-* ``operator``: Which operation to apply: mean, std_dev, median, min, max, sum or rms.
+Parameters:
+    * `operator`: Operation to apply.
+      See :ref:`stat_preprocs` for more details on supported statistics.
+    * Other parameters are directly passed to the `operator` as keyword
+      arguments.
+      See :ref:`stat_preprocs` for more details.
 
 See also :func:`esmvalcore.preprocessor.zonal_means`.
 
@@ -1867,7 +1918,12 @@ The function calculates the meridional statistics by applying an
 operator along the latitude coordinate. This function takes one
 argument:
 
-* ``operator``: Which operation to apply: mean, std_dev, median, min, max, sum or rms.
+Parameters:
+    * `operator`: Operation to apply.
+      See :ref:`stat_preprocs` for more details on supported statistics.
+    * Other parameters are directly passed to the `operator` as keyword
+      arguments.
+      See :ref:`stat_preprocs` for more details.
 
 See also :func:`esmvalcore.preprocessor.meridional_means`.
 
@@ -1877,28 +1933,27 @@ See also :func:`esmvalcore.preprocessor.meridional_means`.
 ``area_statistics``
 -------------------
 
-This function calculates the average value over a region - weighted by the cell
-areas of the region. This function takes the argument, ``operator``: the name
-of the operation to apply.
+This function calculates statistics over a region.
+It takes one argument, ``operator``, which is the name of the operation to
+apply.
 
 This function can be used to apply several different operations in the
-horizontal plane: mean, standard deviation, median, variance, minimum, maximum and root mean square.
-
-Note that this function is applied over the entire dataset. If only a specific
-region, depth layer or time period is required, then those regions need to be
-removed using other preprocessor operations in advance.
-
-This function requires a cell area `cell measure`_, unless the coordinates of the
-input data are regular 1D latitude and longitude coordinates so the cell areas
-can be computed.
-The required supplementary variable, either ``areacella`` for atmospheric variables
-or ``areacello`` for ocean variables, can be attached to the main dataset
-as described in :ref:`supplementary_variables`.
-
-.. deprecated:: 2.8.0
-  The optional ``fx_variables`` argument specifies the fx variables that the user
-  wishes to input to the function. More details on this are given in :ref:`Fx
-  variables as cell measures or ancillary variables`.
+horizontal plane: for example, mean, sum, standard deviation, median, variance,
+minimum, maximum and root mean square.
+Some operations are grid cell area weighted by default.
+For sums, the units of the resulting cubes are multiplied by m :math:`^2`.
+See :ref:`stat_preprocs` for more details on supported statistics.
+
+Note that this function is applied over the entire dataset.
+If only a specific region, depth layer or time period is required, then those
+regions need to be removed using other preprocessor operations in advance.
+
+For weighted statistics, this function requires a cell area `cell measure`_,
+unless the coordinates of the input data are regular 1D latitude and longitude
+coordinates so the cell areas can be computed internally.
+The required supplementary variable, either ``areacella`` for atmospheric
+variables or ``areacello`` for ocean variables, can be attached to the main
+dataset as described in :ref:`supplementary_variables`.
 
 See also :func:`esmvalcore.preprocessor.area_statistics`.
 
@@ -1987,25 +2042,22 @@ See also :func:`esmvalcore.preprocessor.extract_volume`.
 This function calculates the volume-weighted average across three dimensions,
 but maintains the time dimension.
 
-This function takes the argument: ``operator``, which defines the operation to
+This function takes the argument: `operator`, which defines the operation to
 apply over the volume.
+At the moment, only `mean` is supported.
+By default, the `mean` operation is weighted by the grid cell volumes.
 
-This function requires a cell volume `cell measure`_, unless the coordinates of
-the input data are regular 1D latitude and longitude coordinates so the cell
-volumes can be computed.
-The required supplementary variable ``volcello`` can be attached to the main dataset
-as described in :ref:`supplementary_variables`.
+For weighted statistics, this function requires a cell volume `cell measure`_,
+unless the coordinates of the input data are regular 1D latitude and longitude
+coordinates so the cell volumes can be computed internally.
+The required supplementary variable ``volcello`` can be attached to the main
+dataset as described in :ref:`supplementary_variables`.
 
 No depth coordinate is required as this is determined by Iris.
 
-.. deprecated:: 2.8.0
-  The optional ``fx_variables`` argument specifies the fx variables that the
-  user wishes to input to the function.
-  More details on this are given in
-  :ref:`Fx variables as cell measures or ancillary variables`.
-
 See also :func:`esmvalcore.preprocessor.volume_statistics`.
 
+.. _axis_statistics:
 
 ``axis_statistics``
 ---------------------
@@ -2014,26 +2066,36 @@ This function operates over a given axis, and removes it from the
 output cube.
 
 Takes arguments:
-  * axis: direction over which the statistics will be performed.
-    Possible values for the axis are 'x', 'y', 'z', 't'.
-  * operator: defines the operation to apply over the axis.
-    Available operator are 'mean', 'median', 'std_dev', 'sum', 'variance',
-    'min', 'max', 'rms'.
+    * `axis`: direction over which the statistics will be performed.
+      Possible values for the axis are `x`, `y`, `z`, `t`.
+    * `operator`: Operation to apply.
+      See :ref:`stat_preprocs` for more details on supported statistics.
+    * Other parameters are directly passed to the `operator` as keyword
+      arguments.
+      See :ref:`stat_preprocs` for more details.
 
 .. note::
    The coordinate associated to the axis over which the operation will
    be performed must be one-dimensional, as multidimensional coordinates
    are not supported in this preprocessor.
 
+   Some operations are weighted by the corresponding coordinate bounds by
+   default.
+   For sums, the units of the resulting cubes are multiplied by the
+   corresponding coordinate units.
+   See :ref:`stat_preprocs` for more details on supported statistics.
+
 See also :func:`esmvalcore.preprocessor.axis_statistics`.
 
 
 ``depth_integration``
 ---------------------
 
-This function integrates over the depth dimension. This function does a
-weighted sum along the `z`-coordinate, and removes the `z` direction of the
-output cube. This preprocessor takes no arguments.
+This function integrates over the depth dimension.
+This function does a weighted sum along the `z`-coordinate, and removes the `z`
+direction of the output cube.
+This preprocessor takes no arguments.
+The units of the resulting cube are multiplied by the `z`-coordinate units.
 
 See also :func:`esmvalcore.preprocessor.depth_integration`.
 
@@ -2166,13 +2228,14 @@ One can calculate rolling window statistics using the
 preprocessor function ``rolling_window_statistics``.
 This function takes three parameters:
 
-* ``coordinate``: coordinate over which the rolling-window statistics is
-  calculated.
-
-* ``operator``: operation to apply. Accepted values are 'mean', 'median',
-  'std_dev', 'min', 'max' and 'sum'.
-
-* ``window_length``: size of the rolling window to use (number of points).
+    * `coordinate`: Coordinate over which the rolling-window statistics is
+      calculated.
+    * `operator`: Operation to apply.
+      See :ref:`stat_preprocs` for more details on supported statistics.
+    * `window_length`: size of the rolling window to use (number of points).
+    * Other parameters are directly passed to the `operator` as keyword
+      arguments.
+      See :ref:`stat_preprocs` for more details.
 
 This example applied on daily precipitation data calculates two-day rolling
 precipitation sum.
diff --git a/esmvalcore/_citation.py b/esmvalcore/_citation.py
index 5637f115b3..510aa8cb42 100644
--- a/esmvalcore/_citation.py
+++ b/esmvalcore/_citation.py
@@ -101,7 +101,8 @@ def _save_citation_bibtex(product_name, tags, json_urls):
             entries.add(cmip_citation)
     citation_entries.extend(sorted(entries))
 
-    with open(f'{product_name}_citation.bibtex', 'w') as file:
+    with open(f'{product_name}_citation.bibtex',
+              'w', encoding='utf-8') as file:
         file.write('\n'.join(citation_entries))
 
 
@@ -126,7 +127,8 @@ def _save_citation_info_txt(product_name, info_urls, other_info):
                      for t in sorted(other_info))
 
     if lines:
-        with open(f'{product_name}_data_citation_info.txt', 'w') as file:
+        with open(f'{product_name}_data_citation_info.txt',
+                  'w', encoding='utf-8') as file:
             file.write('\n'.join(lines) + '\n')
 
 
@@ -196,7 +198,7 @@ def _collect_bibtex_citation(tag):
     """Collect information from bibtex files."""
     bibtex_file = DIAGNOSTICS.references / f'{tag}.bibtex'
     if bibtex_file.is_file():
-        entry = bibtex_file.read_text()
+        entry = bibtex_file.read_text(encoding='utf-8')
     else:
         entry = ''
         logger.warning(
diff --git a/esmvalcore/_main.py b/esmvalcore/_main.py
index da5cdd0262..afb0cc0476 100755
--- a/esmvalcore/_main.py
+++ b/esmvalcore/_main.py
@@ -64,10 +64,10 @@ def parse_resume(resume, recipe):
         resume[i] = Path(os.path.expandvars(resume_dir)).expanduser()
 
     # Sanity check resume directories:
-    current_recipe = recipe.read_text()
+    current_recipe = recipe.read_text(encoding='utf-8')
     for resume_dir in resume:
         resume_recipe = resume_dir / 'run' / recipe.name
-        if current_recipe != resume_recipe.read_text():
+        if current_recipe != resume_recipe.read_text(encoding='utf-8'):
             raise ValueError(f'Only identical recipes can be resumed, but '
                              f'{resume_recipe} is different from {recipe}')
     return resume
@@ -319,7 +319,7 @@ def __init__(self):
             self.__setattr__(entry_point.name, entry_point.load()())
 
     def version(self):
-        """Show versions of all packages that conform ESMValTool.
+        """Show versions of all packages that form ESMValTool.
 
         In particular, this command will show the version ESMValCore and
         any other package that adds a subcommand to 'esmvaltool'
@@ -337,7 +337,6 @@ def run(self,
             max_datasets=None,
             max_years=None,
             skip_nonexistent=None,
-            offline=None,
             search_esgf=None,
             diagnostics=None,
             check_level=None,
@@ -365,15 +364,6 @@ def run(self,
             Maximum number of years to use.
         skip_nonexistent: bool, optional
             If True, the run will not fail if some datasets are not available.
-        offline: bool, optional
-            If True, the tool will not download missing data from ESGF.
-
-            .. deprecated:: 2.8.0
-                This option has been deprecated in ESMValCore version 2.8.0 and
-                is scheduled for removal in version 2.10.0. Please use the
-                options `search_esgf=never` (for `offline=True`) or
-                `search_esgf=when_missing` (for `offline=False`). These are
-                exact replacements.
         search_esgf: str, optional
             If `never`, disable automatic download of data from the ESGF. If
             `when_missing`, enable the automatic download of files that are not
@@ -405,8 +395,6 @@ def run(self,
             session['max_datasets'] = max_datasets
         if max_years is not None:
             session['max_years'] = max_years
-        if offline is not None:
-            session['offline'] = offline
         if search_esgf is not None:
             session['search_esgf'] = search_esgf
         if skip_nonexistent is not None:
diff --git a/esmvalcore/_recipe/check.py b/esmvalcore/_recipe/check.py
index 1772884104..4b1b36cb60 100644
--- a/esmvalcore/_recipe/check.py
+++ b/esmvalcore/_recipe/check.py
@@ -3,8 +3,8 @@
 
 import logging
 import os
-import re
 import subprocess
+from inspect import getfullargspec
 from pprint import pformat
 from shutil import which
 from typing import Any, Iterable
@@ -12,10 +12,12 @@
 import isodate
 import yamale
 
+import esmvalcore.preprocessor
 from esmvalcore.exceptions import InputFilesNotFound, RecipeError
 from esmvalcore.local import _get_start_end_year, _parse_period
 from esmvalcore.preprocessor import TIME_PREPROCESSORS, PreprocessingTask
-from esmvalcore.preprocessor._multimodel import STATISTIC_MAPPING
+from esmvalcore.preprocessor._multimodel import _get_operator_and_kwargs
+from esmvalcore.preprocessor._shared import get_iris_aggregator
 from esmvalcore.preprocessor._supplementary_vars import (
     PREPROCESSOR_SUPPLEMENTARIES,
 )
@@ -256,20 +258,6 @@ def extract_shape(settings):
                 "{}".format(', '.join(f"'{k}'".lower() for k in valid[key])))
 
 
-def _verify_statistics(statistics, step):
-    """Raise error if multi-model statistics cannot be verified."""
-    valid_names = ['std'] + list(STATISTIC_MAPPING.keys())
-    valid_patterns = [r"^(p\d{1,2})(\.\d*)?$"]
-
-    for statistic in statistics:
-        if not (statistic in valid_names
-                or re.match(r'|'.join(valid_patterns), statistic)):
-            raise RecipeError(
-                "Invalid value encountered for `statistic` in preprocessor "
-                f"{step}. Valid values are {valid_names} "
-                f"or patterns matching {valid_patterns}. Got '{statistic}'.")
-
-
 def _verify_span_value(span):
     """Raise error if span argument cannot be verified."""
     valid_names = ('overlap', 'full')
@@ -305,26 +293,8 @@ def _verify_ignore_scalar_coords(ignore_scalar_coords):
             f"{ignore_scalar_coords}.")
 
 
-def _verify_arguments(given, expected):
-    """Raise error if arguments cannot be verified."""
-    for key in given:
-        if key not in expected:
-            raise RecipeError(
-                f"Unexpected keyword argument encountered: {key}. Valid "
-                f"keywords are: {expected}.")
-
-
 def multimodel_statistics_preproc(settings):
     """Check that the multi-model settings are valid."""
-    valid_keys = [
-        'groupby',
-        'ignore_scalar_coords',
-        'keep_input_datasets',
-        'span',
-        'statistics',
-    ]
-    _verify_arguments(settings.keys(), valid_keys)
-
     span = settings.get('span', None)  # optional, default: overlap
     if span:
         _verify_span_value(span)
@@ -333,10 +303,6 @@ def multimodel_statistics_preproc(settings):
     if groupby:
         _verify_groupby(groupby)
 
-    statistics = settings.get('statistics', None)  # required
-    if statistics:
-        _verify_statistics(statistics, 'multi_model_statistics')
-
     keep_input_datasets = settings.get('keep_input_datasets', True)
     _verify_keep_input_datasets(keep_input_datasets)
 
@@ -346,21 +312,10 @@ def multimodel_statistics_preproc(settings):
 
 def ensemble_statistics_preproc(settings):
     """Check that the ensemble settings are valid."""
-    valid_keys = [
-        'ignore_scalar_coords',
-        'span',
-        'statistics',
-    ]
-    _verify_arguments(settings.keys(), valid_keys)
-
     span = settings.get('span', 'overlap')  # optional, default: overlap
     if span:
         _verify_span_value(span)
 
-    statistics = settings.get('statistics', None)
-    if statistics:
-        _verify_statistics(statistics, 'ensemble_statistics')
-
     ignore_scalar_coords = settings.get('ignore_scalar_coords', False)
     _verify_ignore_scalar_coords(ignore_scalar_coords)
 
@@ -456,3 +411,65 @@ def reference_for_bias_preproc(products):
             f"{len(reference_products):d}{ref_products_str}Please also "
             f"ensure that the reference dataset is not excluded with the "
             f"'exclude' option")
+
+
+def statistics_preprocessors(settings: dict) -> None:
+    """Check options of statistics preprocessors."""
+    mm_stats = (
+        'multi_model_statistics',
+        'ensemble_statistics',
+    )
+    for (step, step_settings) in settings.items():
+
+        # For multi-model statistics, we need to check each entry of statistics
+        if step in mm_stats:
+            _check_mm_stat(step, step_settings)
+
+        # For other statistics, check optional kwargs for operator
+        elif '_statistics' in step:
+            _check_regular_stat(step, step_settings)
+
+
+def _check_regular_stat(step, step_settings):
+    """Check regular statistics (non-multi-model statistics) step."""
+    step_settings = dict(step_settings)
+
+    # Some preprocessors like climate_statistics use default 'mean' for
+    # operator. If 'operator' is missing for those preprocessors with no
+    # default, this will be detected in PreprocessorFile.check() later.
+    operator = step_settings.pop('operator', 'mean')
+
+    # If preprocessor does not exist, do nothing here; this will be detected in
+    # PreprocessorFile.check() later.
+    try:
+        preproc_func = getattr(esmvalcore.preprocessor, step)
+    except AttributeError:
+        return
+
+    # Ignore other preprocessor arguments, e.g., 'hours' for hourly_statistics
+    other_args = getfullargspec(preproc_func).args[1:]
+    operator_kwargs = {
+        k: v for (k, v) in step_settings.items() if k not in other_args
+    }
+    try:
+        get_iris_aggregator(operator, **operator_kwargs)
+    except ValueError as exc:
+        raise RecipeError(
+            f"Invalid options for {step}: {exc}"
+        )
+
+
+def _check_mm_stat(step, step_settings):
+    """Check multi-model statistic step."""
+    statistics = step_settings.get('statistics', [])
+    for stat in statistics:
+        try:
+            (operator, kwargs) = _get_operator_and_kwargs(stat)
+        except ValueError as exc:
+            raise RecipeError(str(exc))
+        try:
+            get_iris_aggregator(operator, **kwargs)
+        except ValueError as exc:
+            raise RecipeError(
+                f"Invalid options for {step}: {exc}"
+            )
diff --git a/esmvalcore/_recipe/from_datasets.py b/esmvalcore/_recipe/from_datasets.py
index 145c2e95d0..8bd33fd5e9 100644
--- a/esmvalcore/_recipe/from_datasets.py
+++ b/esmvalcore/_recipe/from_datasets.py
@@ -168,11 +168,15 @@ def _group_ensemble_members(dataset_facets: Iterable[Facets]) -> list[Facets]:
     """
 
     def grouper(facets):
-        return tuple((k, facets[k]) for k in sorted(facets) if k != 'ensemble')
+        return sorted(
+            (f, str(v)) for f, v in facets.items() if f != 'ensemble')
 
     result = []
-    for group_facets, group in itertools.groupby(dataset_facets, key=grouper):
+    dataset_facets = sorted(dataset_facets, key=grouper)
+    for _, group_iter in itertools.groupby(dataset_facets, key=grouper):
+        group = list(group_iter)
         ensembles = [f['ensemble'] for f in group if 'ensemble' in f]
+        group_facets = group[0]
         if not ensembles:
             result.append(dict(group_facets))
         else:
diff --git a/esmvalcore/_recipe/recipe.py b/esmvalcore/_recipe/recipe.py
index ed858e0c39..1613f6cf6d 100644
--- a/esmvalcore/_recipe/recipe.py
+++ b/esmvalcore/_recipe/recipe.py
@@ -9,7 +9,6 @@
 from copy import deepcopy
 from itertools import groupby
 from pathlib import Path
-from pprint import pformat
 from typing import Any, Dict, Iterable, Sequence
 
 import yaml
@@ -17,16 +16,10 @@
 from esmvalcore import __version__, esgf
 from esmvalcore._provenance import get_recipe_provenance
 from esmvalcore._task import DiagnosticTask, ResumeTask, TaskSet
-from esmvalcore.cmor.table import CMOR_TABLES, _update_cmor_facets
-from esmvalcore.config import CFG
-from esmvalcore.config._config import TASKSEP, get_project_config
+from esmvalcore.config._config import TASKSEP
 from esmvalcore.config._diagnostics import TAGS
 from esmvalcore.dataset import Dataset
-from esmvalcore.exceptions import (
-    ESMValCoreDeprecationWarning,
-    InputFilesNotFound,
-    RecipeError,
-)
+from esmvalcore.exceptions import InputFilesNotFound, RecipeError
 from esmvalcore.local import (
     _dates_to_timerange,
     _get_multiproduct_filename,
@@ -43,6 +36,7 @@
     PreprocessorFile,
 )
 from esmvalcore.preprocessor._area import _update_shapefile_path
+from esmvalcore.preprocessor._multimodel import _get_stat_identifier
 from esmvalcore.preprocessor._other import _group_products
 from esmvalcore.preprocessor._regrid import (
     _spec_to_latlonvals,
@@ -50,10 +44,6 @@
     get_reference_levels,
     parse_cell_spec,
 )
-from esmvalcore.preprocessor._supplementary_vars import (
-    PREPROCESSOR_SUPPLEMENTARIES,
-)
-from esmvalcore.typing import Facets
 
 from . import check
 from .from_datasets import datasets_to_recipe
@@ -213,9 +203,6 @@ def _get_default_settings(dataset):
 
     settings = {}
 
-    # Configure (deprecated, remove for v2.10.0) load callback
-    settings['load'] = {'callback': 'default'}
-
     if _derive_needed(dataset):
         settings['derive'] = {
             'short_name': facets['short_name'],
@@ -235,177 +222,6 @@ def _get_default_settings(dataset):
     return settings
 
 
-def _guess_fx_mip(facets: dict, dataset: Dataset):
-    """Search mip for fx variable."""
-    project = facets.get('project', dataset.facets['project'])
-    # check if project in config-developer
-    get_project_config(project)
-
-    tables = CMOR_TABLES[project].tables
-
-    # Get all mips that offer that specific fx variable
-    mips_with_fx_var = []
-    for mip in tables:
-        if facets['short_name'] in tables[mip]:
-            mips_with_fx_var.append(mip)
-
-    # List is empty -> no table includes the fx variable
-    if not mips_with_fx_var:
-        raise RecipeError(
-            f"Requested fx variable '{facets['short_name']}' not available "
-            f"in any CMOR table for '{project}'")
-
-    # Iterate through all possible mips and check if files are available; in
-    # case of ambiguity raise an error
-    fx_files_for_mips = {}
-    for mip in mips_with_fx_var:
-        logger.debug("For fx variable '%s', found table '%s'",
-                     facets['short_name'], mip)
-        fx_dataset = dataset.copy(**facets)
-        fx_dataset.supplementaries = []
-        fx_dataset.set_facet('mip', mip)
-        fx_dataset.facets.pop('timerange', None)
-        fx_files = fx_dataset.files
-        if fx_files:
-            logger.debug("Found fx variables '%s':\n%s", facets['short_name'],
-                         pformat(fx_files))
-            fx_files_for_mips[mip] = fx_files
-
-    # Dict contains more than one element -> ambiguity
-    if len(fx_files_for_mips) > 1:
-        raise RecipeError(
-            f"Requested fx variable '{facets['short_name']}' for dataset "
-            f"'{dataset.facets['dataset']}' of project '{project}' is "
-            f"available in more than one CMOR MIP table for "
-            f"'{project}': {sorted(fx_files_for_mips)}")
-
-    # Dict is empty -> no files found -> handled at later stage
-    if not fx_files_for_mips:
-        return mips_with_fx_var[0]
-
-    # Dict contains one element -> ok
-    mip = list(fx_files_for_mips)[0]
-    return mip
-
-
-def _set_default_preproc_fx_variables(
-    dataset: Dataset,
-    settings: PreprocessorSettings,
-) -> None:
-    """Update `fx_variables` key in preprocessor settings with defaults."""
-    default_fx = {
-        'area_statistics': {
-            'areacella': None,
-        },
-        'mask_landsea': {
-            'sftlf': None,
-        },
-        'mask_landseaice': {
-            'sftgif': None,
-        },
-        'volume_statistics': {
-            'volcello': None,
-        },
-        'weighting_landsea_fraction': {
-            'sftlf': None,
-        },
-    }
-    if dataset.facets['project'] != 'obs4MIPs':
-        default_fx['area_statistics']['areacello'] = None
-        default_fx['mask_landsea']['sftof'] = None
-        default_fx['weighting_landsea_fraction']['sftof'] = None
-
-    for step, fx_variables in default_fx.items():
-        if step in settings and 'fx_variables' not in settings[step]:
-            settings[step]['fx_variables'] = fx_variables
-
-
-def _get_supplementaries_from_fx_variables(
-    settings: PreprocessorSettings
-) -> list[Facets]:
-    """Read supplementary facets from `fx_variables` in preprocessor."""
-    supplementaries = []
-    for step, kwargs in settings.items():
-        allowed = PREPROCESSOR_SUPPLEMENTARIES.get(step,
-                                                   {}).get('variables', [])
-        if fx_variables := kwargs.get('fx_variables'):
-
-            if isinstance(fx_variables, list):
-                result: dict[str, Facets] = {}
-                for fx_variable in fx_variables:
-                    if isinstance(fx_variable, str):
-                        # Legacy legacy method of specifying fx variable
-                        short_name = fx_variable
-                        result[short_name] = {}
-                    elif isinstance(fx_variable, dict):
-                        short_name = fx_variable['short_name']
-                        result[short_name] = fx_variable
-                fx_variables = result
-
-            for short_name, facets in fx_variables.items():
-                if short_name not in allowed:
-                    raise RecipeError(
-                        f"Preprocessor function '{step}' does not support "
-                        f"supplementary variable '{short_name}'")
-                if facets is None:
-                    facets = {}
-                facets['short_name'] = short_name
-                supplementaries.append(facets)
-
-    return supplementaries
-
-
-def _get_legacy_supplementary_facets(
-    dataset: Dataset,
-    settings: PreprocessorSettings,
-) -> list[Facets]:
-    """Load the supplementary dataset facets from the preprocessor settings."""
-    # First update `fx_variables` in preprocessor settings with defaults
-    _set_default_preproc_fx_variables(dataset, settings)
-
-    supplementaries = _get_supplementaries_from_fx_variables(settings)
-
-    # Guess the ensemble and mip if they is not specified
-    for facets in supplementaries:
-        if 'ensemble' not in facets and dataset.facets['project'] == 'CMIP5':
-            facets['ensemble'] = 'r0i0p0'
-        if 'mip' not in facets:
-            facets['mip'] = _guess_fx_mip(facets, dataset)
-    return supplementaries
-
-
-def _add_legacy_supplementary_datasets(dataset: Dataset, settings):
-    """Update fx settings depending on the needed method."""
-    if not dataset.session['use_legacy_supplementaries']:
-        return
-    if dataset.supplementaries:
-        # Supplementaries have been defined in the recipe.
-        # Just remove any skipped supplementaries (they have been kept so we
-        # know that supplementaries have been defined in the recipe).
-        dataset.supplementaries = [
-            ds for ds in dataset.supplementaries
-            if not ds.facets.get('skip', False)
-        ]
-        return
-
-    logger.debug("Using legacy method to add supplementaries to %s", dataset)
-
-    legacy_ds = dataset.copy()
-    for facets in _get_legacy_supplementary_facets(dataset, settings):
-        legacy_ds.add_supplementary(**facets)
-
-    for supplementary_ds in legacy_ds.supplementaries:
-        _update_cmor_facets(supplementary_ds.facets, override=True)
-        if supplementary_ds.files:
-            dataset.supplementaries.append(supplementary_ds)
-
-    dataset._fix_fx_exp()
-
-    # Remove preprocessor keyword argument `fx_variables`
-    for kwargs in settings.values():
-        kwargs.pop('fx_variables', None)
-
-
 def _exclude_dataset(settings, facets, step):
     """Exclude dataset from specific preprocessor step if requested."""
     exclude = {
@@ -598,9 +414,11 @@ def _update_multiproduct(input_products, order, preproc_dir, step):
     for identifier, products in _group_products(products, by_key=grouping):
         common_attributes = _get_common_attributes(products, settings)
 
-        for statistic in settings.get('statistics', []):
+        statistics = settings.get('statistics', [])
+        for statistic in statistics:
             statistic_attributes = dict(common_attributes)
-            statistic_attributes[step] = _get_tag(step, identifier, statistic)
+            stat_id = _get_stat_identifier(statistic)
+            statistic_attributes[step] = _get_tag(step, identifier, stat_id)
             statistic_attributes.setdefault('alias',
                                             statistic_attributes[step])
             statistic_attributes.setdefault('dataset',
@@ -614,7 +432,7 @@ def _update_multiproduct(input_products, order, preproc_dir, step):
             )  # Note that ancestors is set when running the preprocessor func.
             output_products.add(statistic_product)
             relevant_settings['output_products'][identifier][
-                statistic] = statistic_product
+                stat_id] = statistic_product
 
     return output_products, relevant_settings
 
@@ -687,7 +505,6 @@ def _get_preprocessor_products(
         _apply_preprocessor_profile(settings, profile)
         _update_multi_dataset_settings(dataset.facets, settings)
         _update_preproc_functions(settings, dataset, datasets, missing_vars)
-        _add_legacy_supplementary_datasets(dataset, settings)
         check.preprocessor_supplementaries(dataset, settings)
         input_datasets = _get_input_datasets(dataset)
         missing = _check_input_files(input_datasets)
@@ -820,6 +637,7 @@ def _update_preproc_functions(settings, dataset, datasets, missing_vars):
     _update_regrid_time(dataset, settings)
     if dataset.facets.get('frequency') == 'fx':
         check.check_for_temporal_preprocs(settings)
+    check.statistics_preprocessors(settings)
 
 
 def _get_preprocessor_task(datasets, profiles, task_name):
@@ -893,7 +711,6 @@ def __init__(self, raw_recipe, session, recipe_file: Path):
         self._preprocessors = raw_recipe.get('preprocessors', {})
         if 'default' not in self._preprocessors:
             self._preprocessors['default'] = {}
-        self._set_use_legacy_supplementaries()
         self.datasets = Dataset.from_recipe(recipe_file, session)
         self.diagnostics = self._initialize_diagnostics(
             raw_recipe['diagnostics'])
@@ -905,42 +722,6 @@ def __init__(self, raw_recipe, session, recipe_file: Path):
             self._log_recipe_errors(exc)
             raise
 
-    def _set_use_legacy_supplementaries(self):
-        """Automatically determine if legacy supplementaries are used."""
-        names = set()
-        steps = set()
-        for name, profile in self._preprocessors.items():
-            for step, kwargs in profile.items():
-                if isinstance(kwargs, dict) and 'fx_variables' in kwargs:
-                    names.add(name)
-                    steps.add(step)
-                    if self.session['use_legacy_supplementaries'] is False:
-                        kwargs.pop('fx_variables')
-        if names:
-            warnings.warn(
-                ESMValCoreDeprecationWarning(
-                    "Encountered 'fx_variables' argument in preprocessor(s) "
-                    f"{sorted(names)}, function(s) {sorted(steps)}. The "
-                    "'fx_variables' argument is deprecated and will stop "
-                    "working in v2.10. Please remove it and if automatic "
-                    "definition of supplementary variables does not work "
-                    "correctly, specify the supplementary variables in the "
-                    "recipe as described in https://docs.esmvaltool.org/"
-                    "projects/esmvalcore/en/latest/recipe/preprocessor.html"
-                    "#ancillary-variables-and-cell-measures"))
-            if self.session['use_legacy_supplementaries'] is None:
-                logger.info("Running with --use-legacy-supplementaries=True")
-                self.session['use_legacy_supplementaries'] = True
-
-        # Also adapt the global config if necessary because it is used to check
-        # if mismatching shapes should be ignored when attaching
-        # supplementary variables in `esmvalcore.preprocessor.
-        # _supplementary_vars.add_supplementary_variables` to avoid having to
-        # introduce a new function argument that is immediately deprecated.
-        session_use_legacy_supp = self.session['use_legacy_supplementaries']
-        if session_use_legacy_supp is not None:
-            CFG['use_legacy_supplementaries'] = session_use_legacy_supp
-
     def _log_recipe_errors(self, exc):
         """Log a message with recipe errors."""
         logger.error(exc.message)
diff --git a/esmvalcore/_recipe/to_datasets.py b/esmvalcore/_recipe/to_datasets.py
index 06423cbed6..56d9d44221 100644
--- a/esmvalcore/_recipe/to_datasets.py
+++ b/esmvalcore/_recipe/to_datasets.py
@@ -288,14 +288,13 @@ def _get_dataset_facets_from_recipe(
         ),
     )
 
-    if not session['use_legacy_supplementaries']:
-        preprocessor = facets.get('preprocessor', 'default')
-        settings = profiles.get(preprocessor, {})
-        _append_missing_supplementaries(supplementaries, facets, settings)
-        supplementaries = [
-            facets for facets in supplementaries
-            if not facets.pop('skip', False)
-        ]
+    preprocessor = facets.get('preprocessor', 'default')
+    settings = profiles.get(preprocessor, {})
+    _append_missing_supplementaries(supplementaries, facets, settings)
+    supplementaries = [
+        facets for facets in supplementaries
+        if not facets.pop('skip', False)
+    ]
 
     return facets, supplementaries
 
diff --git a/esmvalcore/_task.py b/esmvalcore/_task.py
index 01d7861f28..04200371cd 100644
--- a/esmvalcore/_task.py
+++ b/esmvalcore/_task.py
@@ -119,7 +119,7 @@ def _log_resource_usage():
         """Write resource usage to file."""
         process = psutil.Process(pid)
         start_time = time.time()
-        with open(filename, 'w') as file:
+        with open(filename, 'w', encoding='utf-8') as file:
             for msg, max_mem in _get_resource_usage(process, start_time,
                                                     children):
                 file.write(msg)
@@ -219,7 +219,7 @@ def _ncl_type(value):
                          'end if\n'.format(var_name=var_name))
             lines.append(_py2ncl(value, var_name))
 
-    with open(filename, mode) as file:
+    with open(filename, mode, encoding='utf-8') as file:
         file.write('\n'.join(lines))
         file.write('\n')
 
@@ -301,7 +301,7 @@ def __init__(self, prev_preproc_dir, preproc_dir, name):
 
         # Reconstruct output
         prev_metadata_file = prev_preproc_dir / 'metadata.yml'
-        with prev_metadata_file.open('rb') as file:
+        with prev_metadata_file.open('r', encoding='utf-8') as file:
             prev_metadata = yaml.safe_load(file)
 
         products = set()
@@ -323,7 +323,7 @@ def _run(self, _):
 
         # Write metadata to file
         self._metadata_file.parent.mkdir(parents=True)
-        with self._metadata_file.open('w') as file:
+        with self._metadata_file.open('w', encoding='utf-8') as file:
             yaml.safe_dump(metadata, file)
 
         return [str(self._metadata_file)]
@@ -609,7 +609,7 @@ def _collect_provenance(self):
 
         logger.debug("Collecting provenance from %s", provenance_file)
         start = time.time()
-        table = yaml.safe_load(provenance_file.read_text())
+        table = yaml.safe_load(provenance_file.read_text(encoding='utf-8'))
 
         ignore = (
             'auxiliary_data_dir',
diff --git a/esmvalcore/cmor/_fixes/cmip6/iitm_esm.py b/esmvalcore/cmor/_fixes/cmip6/iitm_esm.py
index 6ee5833c26..6ed2108ff7 100644
--- a/esmvalcore/cmor/_fixes/cmip6/iitm_esm.py
+++ b/esmvalcore/cmor/_fixes/cmip6/iitm_esm.py
@@ -3,7 +3,7 @@
 
 import numpy as np
 
-from esmvalcore.cmor.check import _get_time_bounds
+from esmvalcore.cmor.fixes import get_time_bounds
 
 from ..common import OceanFixGrid
 from ..fix import Fix
@@ -33,7 +33,7 @@ def fix_metadata(self, cubes):
         for cube in cubes:
             freq = self.extra_facets["frequency"]
             time = cube.coord("time", dim_coords=True)
-            bounds = _get_time_bounds(time, freq)
+            bounds = get_time_bounds(time, freq)
             if np.any(bounds != time.bounds):
                 time.bounds = bounds
         logger.warning(
diff --git a/esmvalcore/cmor/_fixes/cmip6/kace_1_0_g.py b/esmvalcore/cmor/_fixes/cmip6/kace_1_0_g.py
index f2a0a1b7ac..e4c2cc420e 100644
--- a/esmvalcore/cmor/_fixes/cmip6/kace_1_0_g.py
+++ b/esmvalcore/cmor/_fixes/cmip6/kace_1_0_g.py
@@ -3,7 +3,7 @@
 
 import numpy as np
 
-from esmvalcore.cmor.check import _get_time_bounds
+from esmvalcore.cmor.fixes import get_time_bounds
 
 from ..common import ClFixHybridHeightCoord, OceanFixGrid
 from ..fix import Fix
@@ -39,7 +39,7 @@ def fix_metadata(self, cubes):
         for cube in cubes:
             freq = self.extra_facets["frequency"]
             time = cube.coord("time", dim_coords=True)
-            bounds = _get_time_bounds(time, freq)
+            bounds = get_time_bounds(time, freq)
             if np.any(bounds != time.bounds):
                 time.bounds = bounds
         logger.warning(
diff --git a/esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/cnrm_aladin63.py b/esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/aladin63.py
similarity index 92%
rename from esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/cnrm_aladin63.py
rename to esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/aladin63.py
index af0348767a..01ae2bb942 100644
--- a/esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/cnrm_aladin63.py
+++ b/esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/aladin63.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm CNRM-ALADIN63 driven by CNRM-CERFACS-CNRM-CM5."""
+"""Fixes for rcm ALADIN63 driven by CNRM-CERFACS-CNRM-CM5."""
 import numpy as np
 
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import TimeLongName as BaseFix
diff --git a/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/mohc_hadrem3_ga7_05.py b/esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/hadrem3_ga7_05.py
similarity index 65%
rename from esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/mohc_hadrem3_ga7_05.py
rename to esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/hadrem3_ga7_05.py
index 0abfc3dff1..1806f3f0a0 100644
--- a/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/mohc_hadrem3_ga7_05.py
+++ b/esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/hadrem3_ga7_05.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm MOHC-HadREM3-GA7-05 driven by MPI-M-MPI-ESM-LR."""
+"""Fixes for rcm HadREM3-GA7-05 driven by CNRM-CERFACS-CNRM-CM5."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     MOHCHadREM3GA705 as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/clmcom_cclm4_8_17.py b/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/cclm4_8_17.py
similarity index 63%
rename from esmvalcore/cmor/_fixes/cordex/miroc_miroc5/clmcom_cclm4_8_17.py
rename to esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/cclm4_8_17.py
index 51d645f591..88d2123420 100644
--- a/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/clmcom_cclm4_8_17.py
+++ b/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/cclm4_8_17.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm CLMcom-CCLM4-8-17 driven by MIROC-MIROC5."""
+"""Fixes for rcm CCLM4-8-17 driven by ICHEC-EC-EARTH."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     CLMcomCCLM4817 as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/gerics_remo2015.py b/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/gerics_remo2015.py
deleted file mode 100644
index 2f6b9a4d62..0000000000
--- a/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/gerics_remo2015.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""Fixes for rcm GERICS-REMO2015 driven by ICHEC-EC-EARTH."""
-from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
-    TimeLongName as BaseFix)
-
-Pr = BaseFix
diff --git a/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/mohc_hadrem3_ga7_05.py b/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/hadrem3_ga7_05.py
similarity index 64%
rename from esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/mohc_hadrem3_ga7_05.py
rename to esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/hadrem3_ga7_05.py
index 15b643aa36..2f816ba55e 100644
--- a/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/mohc_hadrem3_ga7_05.py
+++ b/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/hadrem3_ga7_05.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm MOHC-HadREM3-GA7-05 driven by ICHEC-EC-EARTH."""
+"""Fixes for rcm HadREM3-GA7-05 driven by ICHEC-EC-EARTH."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     MOHCHadREM3GA705 as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/knmi_racmo22e.py b/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/racmo22e.py
similarity index 62%
rename from esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/knmi_racmo22e.py
rename to esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/racmo22e.py
index cc2440a2b8..9f4cb7a2bc 100644
--- a/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/knmi_racmo22e.py
+++ b/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/racmo22e.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm KNMI-RACMO22E driven by NCC-NorESM1-M."""
+"""Fixes for rcm RACMO22E driven by ICHEC-EC-EARTH."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     TimeLongName as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/smhi_rca4.py b/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/rca4.py
similarity index 67%
rename from esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/smhi_rca4.py
rename to esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/rca4.py
index 5c9059f74a..114715a5c9 100644
--- a/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/smhi_rca4.py
+++ b/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/rca4.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm SMHI-RCA4 driven by NCC-NorESM1-M."""
+"""Fixes for rcm RCA4 driven by ICHEC-EC-EARTH."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     TimeLongName as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/knmi_racmo22e.py b/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/remo2015.py
similarity index 62%
rename from esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/knmi_racmo22e.py
rename to esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/remo2015.py
index 96fd620afe..c50d9a23e2 100644
--- a/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/knmi_racmo22e.py
+++ b/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/remo2015.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm KNMI-RACMO22E driven by ICHEC-EC-EARTH."""
+"""Fixes for rcm REMO2015 driven by ICHEC-EC-EARTH."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     TimeLongName as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/clmcom_cclm4_8_17.py b/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/cclm4_8_17.py
similarity index 62%
rename from esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/clmcom_cclm4_8_17.py
rename to esmvalcore/cmor/_fixes/cordex/miroc_miroc5/cclm4_8_17.py
index 883e38cecd..ac0460904d 100644
--- a/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/clmcom_cclm4_8_17.py
+++ b/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/cclm4_8_17.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm CLMcom-CCLM4-8-17 driven by ICHEC-EC-EARTH."""
+"""Fixes for rcm CCLM4-8-17 driven by MIROC-MIROC5."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     CLMcomCCLM4817 as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/gerics_remo2015.py b/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/remo2015.py
similarity index 62%
rename from esmvalcore/cmor/_fixes/cordex/miroc_miroc5/gerics_remo2015.py
rename to esmvalcore/cmor/_fixes/cordex/miroc_miroc5/remo2015.py
index 9f75b595f9..fbd13bdfab 100644
--- a/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/gerics_remo2015.py
+++ b/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/remo2015.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm GERICS-REMO2015 driven by MIROC-MIROC5."""
+"""Fixes for rcm REMO2015 driven by MIROC-MIROC5."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     TimeLongName as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/uhoh_wrf361h.py b/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/wrf361h.py
similarity index 93%
rename from esmvalcore/cmor/_fixes/cordex/miroc_miroc5/uhoh_wrf361h.py
rename to esmvalcore/cmor/_fixes/cordex/miroc_miroc5/wrf361h.py
index 3767c653ea..f8a69bca9b 100644
--- a/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/uhoh_wrf361h.py
+++ b/esmvalcore/cmor/_fixes/cordex/miroc_miroc5/wrf361h.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm UHOH-WRF361H driven by MIROC-MIROC5."""
+"""Fixes for rcm WRF361H driven by MIROC-MIROC5."""
 import iris
 from esmvalcore.cmor.fix import Fix
 
diff --git a/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/mohc_hadrem3_ga7_05.py b/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/hadrem3_ga7_05.py
similarity index 63%
rename from esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/mohc_hadrem3_ga7_05.py
rename to esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/hadrem3_ga7_05.py
index 004cbc412f..7964a583e0 100644
--- a/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/mohc_hadrem3_ga7_05.py
+++ b/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/hadrem3_ga7_05.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm MOHC-HadREM3-GA7-05 driven by MOHC-HadGEM2-ES."""
+"""Fixes for rcm HadREM3-GA7-05 driven by MOHC-HadGEM2-ES."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     MOHCHadREM3GA705 as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/dmi_hirham5.py b/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/hirham5.py
similarity index 89%
rename from esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/dmi_hirham5.py
rename to esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/hirham5.py
index fbf5633d13..5dfb91f274 100644
--- a/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/dmi_hirham5.py
+++ b/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/hirham5.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm DMI-HIRHAM driven by MOHC-HadGEM2."""
+"""Fixes for rcm HIRHAM driven by MOHC-HadGEM2."""
 from esmvalcore.cmor.fix import Fix
 
 
diff --git a/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/smhi_rca4.py b/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/rca4.py
similarity index 67%
rename from esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/smhi_rca4.py
rename to esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/rca4.py
index de1d8d6536..740711fcea 100644
--- a/esmvalcore/cmor/_fixes/cordex/ichec_ec_earth/smhi_rca4.py
+++ b/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/rca4.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm SMHI-RCA4 driven by ICHEC-EC-EARTH."""
+"""Fixes for rcm RCA4 driven by MOHC-HadGEM2-ES."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     TimeLongName as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/smhi_rca4.py b/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/remo2015.py
similarity index 66%
rename from esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/smhi_rca4.py
rename to esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/remo2015.py
index 543df3670a..cea145f2d3 100644
--- a/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/smhi_rca4.py
+++ b/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/remo2015.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm SMHI-RCA4 driven by MOHC-HadGEM2-ES."""
+"""Fixes for rcm REMO2015 driven by MOHC-HadGEM2."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     TimeLongName as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/mohc_hadrem3_ga7_05.py b/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/hadrem3_ga7_05.py
similarity index 61%
rename from esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/mohc_hadrem3_ga7_05.py
rename to esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/hadrem3_ga7_05.py
index fd31e9b8a6..4875edfc93 100644
--- a/esmvalcore/cmor/_fixes/cordex/cnrm_cerfacs_cnrm_cm5/mohc_hadrem3_ga7_05.py
+++ b/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/hadrem3_ga7_05.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm MOHC-HadREM3-GA7-05 driven by CNRM-CERFACS-CNRM-CM5."""
+"""Fixes for rcm HadREM3-GA7-05 driven by MPI-M-MPI-ESM-LR."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     MOHCHadREM3GA705 as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/ictp_regcm4_6.py b/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/ictp_regcm4_6.py
deleted file mode 100644
index 9a92874b03..0000000000
--- a/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/ictp_regcm4_6.py
+++ /dev/null
@@ -1,7 +0,0 @@
-"""Fixes for rcm ICTP-RegCM4-6 driven by MPI-M-MPI-ESM-LR."""
-from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
-    TimeLongName as BaseFix)
-
-Pr = BaseFix
-
-Tas = BaseFix
diff --git a/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/knmi_racmo22e.py b/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/knmi_racmo22e.py
deleted file mode 100644
index ab944112b3..0000000000
--- a/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/knmi_racmo22e.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""Fixes for rcm KNMI-RACMO22E driven by MPI-M-MPI-ESM-LR."""
-from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
-    TimeLongName as BaseFix)
-
-Pr = BaseFix
diff --git a/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/gerics_remo2015.py b/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/racmo22e.py
similarity index 62%
rename from esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/gerics_remo2015.py
rename to esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/racmo22e.py
index b1d118cd38..676e0dfc47 100644
--- a/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/gerics_remo2015.py
+++ b/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/racmo22e.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm GERICS-REMO2015 driven by NCC-NorESM1-M."""
+"""Fixes for rcm RACMO22E driven by MPI-M-MPI-ESM-LR."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     TimeLongName as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/gerics_remo2015.py b/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/regcm4_6.py
similarity index 65%
rename from esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/gerics_remo2015.py
rename to esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/regcm4_6.py
index 85bb2e352c..f863ed1712 100644
--- a/esmvalcore/cmor/_fixes/cordex/mohc_hadgem2_es/gerics_remo2015.py
+++ b/esmvalcore/cmor/_fixes/cordex/mpi_m_mpi_esm_lr/regcm4_6.py
@@ -1,4 +1,4 @@
-"""Fixes for rcm GERICS-REMO2015 driven by MOHC-HadGEM2."""
+"""Fixes for rcm RegCM4-6 driven by MPI-M-MPI-ESM-LR."""
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
     TimeLongName as BaseFix)
 
diff --git a/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/mohc_hadrem3_ga7_05.py b/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/hadrem3_ga7_05.py
similarity index 100%
rename from esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/mohc_hadrem3_ga7_05.py
rename to esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/hadrem3_ga7_05.py
diff --git a/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/racmo22e.py b/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/racmo22e.py
new file mode 100644
index 0000000000..e9e2e38734
--- /dev/null
+++ b/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/racmo22e.py
@@ -0,0 +1,5 @@
+"""Fixes for rcm RACMO22E driven by NCC-NorESM1-M."""
+from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
+    TimeLongName as BaseFix)
+
+Pr = BaseFix
diff --git a/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/rca4.py b/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/rca4.py
new file mode 100644
index 0000000000..58d14599da
--- /dev/null
+++ b/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/rca4.py
@@ -0,0 +1,7 @@
+"""Fixes for rcm RCA4 driven by NCC-NorESM1-M."""
+from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
+    TimeLongName as BaseFix)
+
+Pr = BaseFix
+
+Tas = BaseFix
diff --git a/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/remo2015.py b/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/remo2015.py
new file mode 100644
index 0000000000..9722263d70
--- /dev/null
+++ b/esmvalcore/cmor/_fixes/cordex/ncc_noresm1_m/remo2015.py
@@ -0,0 +1,5 @@
+"""Fixes for rcm REMO2015 driven by NCC-NorESM1-M."""
+from esmvalcore.cmor._fixes.cordex.cordex_fixes import (
+    TimeLongName as BaseFix)
+
+Pr = BaseFix
diff --git a/esmvalcore/cmor/_fixes/fix.py b/esmvalcore/cmor/_fixes/fix.py
index 2deeb0d6d3..a6156a231c 100644
--- a/esmvalcore/cmor/_fixes/fix.py
+++ b/esmvalcore/cmor/_fixes/fix.py
@@ -3,17 +3,35 @@
 
 import importlib
 import inspect
+import logging
 import tempfile
+from collections.abc import Sequence
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Optional
 
+import numpy as np
+from cf_units import Unit
+from iris.coords import Coord, CoordExtent
 from iris.cube import Cube, CubeList
-
-from ..table import CMOR_TABLES
+from iris.exceptions import UnitConversionError
+from iris.util import reverse
+
+from esmvalcore.cmor._utils import (
+    _get_alternative_generic_lev_coord,
+    _get_generic_lev_coord_names,
+    _get_new_generic_level_coord,
+    _get_simplified_calendar,
+    _get_single_cube,
+    _is_unstructured_grid,
+)
+from esmvalcore.cmor.fixes import get_time_bounds
+from esmvalcore.cmor.table import get_var_info
 
 if TYPE_CHECKING:
-    from ...config import Session
-    from ..table import VariableInfo
+    from esmvalcore.cmor.table import CoordinateInfo, VariableInfo
+    from esmvalcore.config import Session
+
+logger = logging.getLogger(__name__)
 
 
 class Fix:
@@ -24,19 +42,23 @@ def __init__(
         vardef: VariableInfo,
         extra_facets: Optional[dict] = None,
         session: Optional[Session] = None,
+        frequency: Optional[str] = None,
     ) -> None:
         """Initialize fix object.
 
         Parameters
         ----------
         vardef:
-            CMOR table entry.
+            CMOR table entry of the variable.
         extra_facets:
             Extra facets are mainly used for data outside of the big projects
             like CMIP, CORDEX, obs4MIPs. For details, see :ref:`extra_facets`.
         session:
             Current session which includes configuration and directory
             information.
+        frequency:
+            Expected frequency of the variable. If not given, use the one from
+            the CMOR table entry of the variable.
 
         """
         self.vardef = vardef
@@ -44,6 +66,9 @@ def __init__(
             extra_facets = {}
         self.extra_facets = extra_facets
         self.session = session
+        if frequency is None and self.vardef is not None:
+            frequency = self.vardef.frequency
+        self.frequency = frequency
 
     def fix_file(
         self,
@@ -76,7 +101,7 @@ def fix_file(
         """
         return filepath
 
-    def fix_metadata(self, cubes: CubeList) -> CubeList:
+    def fix_metadata(self, cubes: Sequence[Cube]) -> Sequence[Cube]:
         """Apply fixes to the metadata of the cube.
 
         Changes applied here must not require data loading.
@@ -90,7 +115,7 @@ def fix_metadata(self, cubes: CubeList) -> CubeList:
 
         Returns
         -------
-        iris.cube.CubeList
+        Iterable[iris.cube.Cube]
             Fixed cubes. They can be different instances.
 
         """
@@ -163,6 +188,7 @@ def get_fixes(
         short_name: str,
         extra_facets: Optional[dict] = None,
         session: Optional[Session] = None,
+        frequency: Optional[str] = None,
     ) -> list:
         """Get the fixes that must be applied for a given dataset.
 
@@ -177,6 +203,8 @@ def get_fixes(
         before checking because it is not possible to use the character '-' in
         python names.
 
+        In addition, generic fixes for all datasets are added.
+
         Parameters
         ----------
         project:
@@ -193,6 +221,9 @@ def get_fixes(
         session:
             Current session which includes configuration and directory
             information.
+        frequency:
+            Expected frequency of the variable. If not given, use the one from
+            the CMOR table entry of the variable.
 
         Returns
         -------
@@ -200,8 +231,7 @@ def get_fixes(
             Fixes to apply for the given data.
 
         """
-        cmor_table = CMOR_TABLES[project]
-        vardef = cmor_table.get_variable(mip, short_name)
+        vardef = get_var_info(project, mip, short_name)
 
         project = project.replace('-', '_').lower()
         dataset = dataset.replace('-', '_').lower()
@@ -238,9 +268,24 @@ def get_fixes(
             )
             for fix_name in (short_name, mip.lower(), 'allvars'):
                 if fix_name in classes:
-                    fixes.append(classes[fix_name](
-                        vardef, extra_facets=extra_facets, session=session
-                    ))
+                    fixes.append(
+                        classes[fix_name](
+                            vardef,
+                            extra_facets=extra_facets,
+                            session=session,
+                            frequency=frequency,
+                        )
+                    )
+
+        # Always perform generic fixes for all datasets
+        fixes.append(
+            GenericFix(
+                vardef,  # type: ignore
+                extra_facets=extra_facets,
+                session=session,
+                frequency=frequency,
+            )
+        )
 
         return fixes
 
@@ -277,3 +322,579 @@ def get_fixed_filepath(
         else:
             output_dir.mkdir(parents=True, exist_ok=True)
         return output_dir / Path(filepath).name
+
+
+class GenericFix(Fix):
+    """Class providing generic fixes for all datasets."""
+
+    def fix_metadata(self, cubes: Sequence[Cube]) -> CubeList:
+        """Fix cube metadata.
+
+        Parameters
+        ----------
+        cubes:
+            Cubes to be fixed.
+
+        Returns
+        -------
+        CubeList
+            Fixed cubes.
+
+        """
+        # Make sure the this fix also works when no extra_facets are given
+        if 'project' in self.extra_facets and 'dataset' in self.extra_facets:
+            dataset_str = (
+                f"{self.extra_facets['project']}:"
+                f"{self.extra_facets['dataset']}"
+            )
+        else:
+            dataset_str = None
+
+        # The following fixes are designed to operate on the actual cube that
+        # corresponds to the variable. Thus, it needs to be assured (possibly
+        # by prior dataset-specific fixes) that the cubes here contain only one
+        # relevant cube.
+        cube = _get_single_cube(
+            cubes, self.vardef.short_name, dataset_str=dataset_str
+        )
+
+        cube = self._fix_standard_name(cube)
+        cube = self._fix_long_name(cube)
+        cube = self._fix_psu_units(cube)
+        cube = self._fix_units(cube)
+
+        cube = self._fix_regular_coord_names(cube)
+        cube = self._fix_alternative_generic_level_coords(cube)
+        cube = self._fix_coords(cube)
+        cube = self._fix_time_coord(cube)
+
+        return CubeList([cube])
+
+    def fix_data(self, cube: Cube) -> Cube:
+        """Fix cube data.
+
+        Parameters
+        ----------
+        cube:
+            Cube to be fixed.
+
+        Returns
+        -------
+        Cube
+            Fixed cube.
+
+        """
+        return cube
+
+    @staticmethod
+    def _msg_suffix(cube: Cube) -> str:
+        """Get prefix for log messages."""
+        if 'source_file' in cube.attributes:
+            return f"\n(for file {cube.attributes['source_file']})"
+        return f"\n(for variable {cube.var_name})"
+
+    def _debug_msg(self, cube: Cube, msg: str, *args) -> None:
+        """Print debug message."""
+        msg += self._msg_suffix(cube)
+        logger.debug(msg, *args)
+
+    def _warning_msg(self, cube: Cube, msg: str, *args) -> None:
+        """Print debug message."""
+        msg += self._msg_suffix(cube)
+        logger.warning(msg, *args)
+
+    @staticmethod
+    def _set_range_in_0_360(array: np.ndarray) -> np.ndarray:
+        """Convert longitude coordinate to [0, 360]."""
+        return (array + 360.0) % 360.0
+
+    def _reverse_coord(self, cube: Cube, coord: Coord) -> tuple[Cube, Coord]:
+        """Reverse cube along a given coordinate."""
+        if coord.ndim == 1:
+            cube = reverse(cube, cube.coord_dims(coord))
+            coord = cube.coord(var_name=coord.var_name)
+            if coord.has_bounds():
+                bounds = coord.core_bounds()
+                right_bounds = bounds[:-2, 1]
+                left_bounds = bounds[1:-1, 0]
+                if np.all(right_bounds != left_bounds):
+                    coord.bounds = np.fliplr(bounds)
+            self._debug_msg(
+                cube,
+                "Coordinate %s values have been reversed",
+                coord.var_name,
+            )
+        return (cube, coord)
+
+    def _get_effective_units(self) -> str:
+        """Get effective units."""
+        if self.vardef.units.lower() == 'psu':
+            return '1'
+        return self.vardef.units
+
+    def _fix_units(self, cube: Cube) -> Cube:
+        """Fix cube units."""
+        if self.vardef.units:
+            units = self._get_effective_units()
+
+            # We use str(cube.units) in the following to catch `degrees` !=
+            # `degrees_north`
+            if str(cube.units) != units:
+                old_units = cube.units
+                try:
+                    cube.convert_units(units)
+                except (ValueError, UnitConversionError):
+                    self._warning_msg(
+                        cube,
+                        "Failed to convert cube units from '%s' to '%s'",
+                        old_units,
+                        units,
+                    )
+                else:
+                    self._warning_msg(
+                        cube,
+                        "Converted cube units from '%s' to '%s'",
+                        old_units,
+                        units,
+                    )
+        return cube
+
+    def _fix_standard_name(self, cube: Cube) -> Cube:
+        """Fix standard_name."""
+        # Do not change empty standard names
+        if not self.vardef.standard_name:
+            return cube
+
+        if cube.standard_name != self.vardef.standard_name:
+            self._warning_msg(
+                cube,
+                "Standard name changed from '%s' to '%s'",
+                cube.standard_name,
+                self.vardef.standard_name,
+            )
+            cube.standard_name = self.vardef.standard_name
+
+        return cube
+
+    def _fix_long_name(self, cube: Cube) -> Cube:
+        """Fix long_name."""
+        # Do not change empty long names
+        if not self.vardef.long_name:
+            return cube
+
+        if cube.long_name != self.vardef.long_name:
+            self._warning_msg(
+                cube,
+                "Long name changed from '%s' to '%s'",
+                cube.long_name,
+                self.vardef.long_name,
+            )
+            cube.long_name = self.vardef.long_name
+
+        return cube
+
+    def _fix_psu_units(self, cube: Cube) -> Cube:
+        """Fix psu units."""
+        if cube.attributes.get('invalid_units', '').lower() == 'psu':
+            cube.units = '1'
+            cube.attributes.pop('invalid_units')
+            self._debug_msg(cube, "Units converted from 'psu' to '1'")
+        return cube
+
+    def _fix_regular_coord_names(self, cube: Cube) -> Cube:
+        """Fix regular (non-generic-level) coordinate names."""
+        for cmor_coord in self.vardef.coordinates.values():
+            if cmor_coord.generic_level:
+                continue  # Ignore generic level coordinate in this function
+            if cube.coords(var_name=cmor_coord.out_name):
+                continue  # Coordinate found -> fine here
+            if cube.coords(cmor_coord.standard_name):
+                cube_coord = cube.coord(cmor_coord.standard_name)
+                self._fix_cmip6_multidim_lat_lon_coord(
+                    cube, cmor_coord, cube_coord
+                )
+        return cube
+
+    def _fix_alternative_generic_level_coords(self, cube: Cube) -> Cube:
+        """Fix alternative generic level coordinates."""
+        # Avoid overriding existing variable information
+        cmor_var_coordinates = self.vardef.coordinates.copy()
+        for (coord_name, cmor_coord) in cmor_var_coordinates.items():
+            if not cmor_coord.generic_level:
+                continue  # Ignore non-generic-level coordinates
+            if not cmor_coord.generic_lev_coords:
+                continue  # Cannot fix anything without coordinate info
+
+            # Extract names of the actual generic level coordinates present in
+            # the cube (e.g., `hybrid_height`, `standard_hybrid_sigma`)
+            (standard_name, out_name, name) = _get_generic_lev_coord_names(
+                cube, cmor_coord
+            )
+
+            # Make sure to update variable information with actual generic
+            # level coordinate if one has been found; this is necessary for
+            # subsequent fixes
+            if standard_name:
+                new_generic_level_coord = _get_new_generic_level_coord(
+                    self.vardef, cmor_coord, coord_name, name
+                )
+                self.vardef.coordinates[coord_name] = new_generic_level_coord
+                self._debug_msg(
+                    cube,
+                    "Generic level coordinate %s will be checked against %s "
+                    "coordinate information",
+                    coord_name,
+                    name,
+                )
+
+            # If a generic level coordinate has been found, we don't need to
+            # look for alternatives
+            if standard_name or out_name:
+                continue
+
+            # Search for alternative coordinates (i.e., regular level
+            # coordinates); if none found, do nothing
+            try:
+                (alternative_coord,
+                 cube_coord) = _get_alternative_generic_lev_coord(
+                    cube, coord_name, self.vardef.table_type
+                )
+            except ValueError:  # no alternatives found
+                continue
+
+            # Fix alternative coord
+            (cube, cube_coord) = self._fix_coord(
+                cube, alternative_coord, cube_coord
+            )
+
+        return cube
+
+    def _fix_cmip6_multidim_lat_lon_coord(
+        self,
+        cube: Cube,
+        cmor_coord: CoordinateInfo,
+        cube_coord: Coord,
+    ) -> None:
+        """Fix CMIP6 multidimensional latitude and longitude coordinates."""
+        is_cmip6_multidim_lat_lon = all([
+            'CMIP6' in self.vardef.table_type,
+            cube_coord.ndim > 1,
+            cube_coord.standard_name in ('latitude', 'longitude'),
+        ])
+        if is_cmip6_multidim_lat_lon:
+            self._debug_msg(
+                cube,
+                "Multidimensional %s coordinate is not set in CMOR standard, "
+                "ESMValTool will change the original value of '%s' to '%s' to "
+                "match the one-dimensional case",
+                cube_coord.standard_name,
+                cube_coord.var_name,
+                cmor_coord.out_name,
+            )
+            cube_coord.var_name = cmor_coord.out_name
+
+    def _fix_coord_units(
+        self,
+        cube: Cube,
+        cmor_coord: CoordinateInfo,
+        cube_coord: Coord,
+    ) -> None:
+        """Fix coordinate units."""
+        if not cmor_coord.units:
+            return
+
+        # We use str(cube_coord.units) in the following to catch `degrees` !=
+        # `degrees_north`
+        if str(cube_coord.units) != cmor_coord.units:
+            old_units = cube_coord.units
+            try:
+                cube_coord.convert_units(cmor_coord.units)
+            except (ValueError, UnitConversionError):
+                self._warning_msg(
+                    cube,
+                    "Failed to convert units of coordinate %s from '%s' to "
+                    "'%s'",
+                    cmor_coord.out_name,
+                    old_units,
+                    cmor_coord.units,
+                )
+            else:
+                self._warning_msg(
+                    cube,
+                    "Coordinate %s units '%s' converted to '%s'",
+                    cmor_coord.out_name,
+                    old_units,
+                    cmor_coord.units,
+                )
+
+    def _fix_requested_coord_values(
+        self,
+        cube: Cube,
+        cmor_coord: CoordinateInfo,
+        cube_coord: Coord,
+    ) -> None:
+        """Fix requested coordinate values."""
+        if not cmor_coord.requested:
+            return
+
+        # Cannot fix non-1D points
+        if cube_coord.core_points().ndim != 1:
+            return
+
+        # Get requested CMOR values
+        try:
+            cmor_points = np.array(cmor_coord.requested, dtype=float)
+        except ValueError:
+            return
+
+        # Align coordinate points with CMOR values if possible
+        if cube_coord.core_points().shape != cmor_points.shape:
+            return
+        atol = 1e-7 * np.mean(cmor_points)
+        align_coords = np.allclose(
+            cube_coord.core_points(),
+            cmor_points,
+            rtol=1e-7,
+            atol=atol,
+        )
+        if align_coords:
+            cube_coord.points = cmor_points
+            self._debug_msg(
+                cube,
+                "Aligned %s points with CMOR points",
+                cmor_coord.out_name,
+            )
+
+    def _fix_longitude_0_360(
+        self,
+        cube: Cube,
+        cmor_coord: CoordinateInfo,
+        cube_coord: Coord,
+    ) -> tuple[Cube, Coord]:
+        """Fix longitude coordinate to be in [0, 360]."""
+        if not cube_coord.standard_name == 'longitude':
+            return (cube, cube_coord)
+
+        # Only apply fixes when values are outside of valid range [0, 360]
+        inside_0_360 = all([
+            cube_coord.core_points().min() >= 0.0,
+            cube_coord.core_points().max() <= 360.0,
+        ])
+        if inside_0_360:
+            return (cube, cube_coord)
+
+        # Cannot fix longitudes outside [-360, 720]
+        if np.any(cube_coord.core_points() < -360.0):
+            return (cube, cube_coord)
+        if np.any(cube_coord.core_points() > 720.0):
+            return (cube, cube_coord)
+
+        # cube.intersection only works for cells with 0 or 2 bounds
+        # Note: nbounds==0 means there are no bounds given, nbounds==2
+        # implies a regular grid with bounds in the grid direction,
+        # nbounds>2 implies an irregular grid with bounds given as vertices
+        # of the cell polygon.
+        if cube_coord.ndim == 1 and cube_coord.nbounds in (0, 2):
+            lon_extent = CoordExtent(cube_coord, 0.0, 360., True, False)
+            cube = cube.intersection(lon_extent)
+        else:
+            new_lons = cube_coord.core_points().copy()
+            new_lons = self._set_range_in_0_360(new_lons)
+
+            if cube_coord.core_bounds() is None:
+                new_bounds = None
+            else:
+                new_bounds = cube_coord.core_bounds().copy()
+                new_bounds = self._set_range_in_0_360(new_bounds)
+
+            new_coord = cube_coord.copy(new_lons, new_bounds)
+            dims = cube.coord_dims(cube_coord)
+            cube.remove_coord(cube_coord)
+            cube.add_aux_coord(new_coord, dims)
+        new_coord = cube.coord(var_name=cmor_coord.out_name)
+        self._debug_msg(cube, "Shifted longitude to [0, 360]")
+
+        return (cube, new_coord)
+
+    def _fix_coord_bounds(
+        self,
+        cube: Cube,
+        cmor_coord: CoordinateInfo,
+        cube_coord: Coord,
+    ) -> None:
+        """Fix coordinate bounds."""
+        if cmor_coord.must_have_bounds != 'yes' or cube_coord.has_bounds():
+            return
+
+        # Skip guessing bounds for unstructured grids
+        if _is_unstructured_grid(cube) and cube_coord.standard_name in (
+                'latitude', 'longitude'):
+            self._debug_msg(
+                cube,
+                "Will not guess bounds for coordinate %s of unstructured grid",
+                cube_coord.var_name,
+            )
+            return
+
+        try:
+            cube_coord.guess_bounds()
+            self._warning_msg(
+                cube,
+                "Added guessed bounds to coordinate %s",
+                cube_coord.var_name,
+            )
+        except ValueError as exc:
+            self._warning_msg(
+                cube,
+                "Cannot guess bounds for coordinate %s: %s",
+                cube.var_name,
+                str(exc),
+            )
+
+    def _fix_coord_direction(
+        self,
+        cube: Cube,
+        cmor_coord: CoordinateInfo,
+        cube_coord: Coord,
+    ) -> tuple[Cube, Coord]:
+        """Fix coordinate direction (increasing vs. decreasing)."""
+        # Skip fix for a variety of reasons
+        if cube_coord.ndim > 1:
+            return (cube, cube_coord)
+        if cube_coord.dtype.kind == 'U':
+            return (cube, cube_coord)
+        if _is_unstructured_grid(cube) and cube_coord.standard_name in (
+                'latitude', 'longitude'
+        ):
+            return (cube, cube_coord)
+        if len(cube_coord.core_points()) == 1:
+            return (cube, cube_coord)
+        if not cmor_coord.stored_direction:
+            return (cube, cube_coord)
+
+        # Fix coordinates with wrong direction
+        if cmor_coord.stored_direction == 'increasing':
+            if cube_coord.core_points()[0] > cube_coord.core_points()[1]:
+                (cube, cube_coord) = self._reverse_coord(cube, cube_coord)
+        elif cmor_coord.stored_direction == 'decreasing':
+            if cube_coord.core_points()[0] < cube_coord.core_points()[1]:
+                (cube, cube_coord) = self._reverse_coord(cube, cube_coord)
+
+        return (cube, cube_coord)
+
+    def _fix_time_units(self, cube: Cube, cube_coord: Coord) -> None:
+        """Fix time units in cube and attributes."""
+        # Fix cube units
+        old_units = cube_coord.units
+        cube_coord.convert_units(
+            Unit(
+                'days since 1850-1-1 00:00:00',
+                calendar=cube_coord.units.calendar,
+            )
+        )
+        simplified_cal = _get_simplified_calendar(cube_coord.units.calendar)
+        cube_coord.units = Unit(
+            cube_coord.units.origin, calendar=simplified_cal
+        )
+
+        # Fix units of time-related cube attributes
+        attrs = cube.attributes
+        parent_time = 'parent_time_units'
+        if parent_time in attrs:
+            if attrs[parent_time] in 'no parent':
+                pass
+            else:
+                try:
+                    parent_units = Unit(attrs[parent_time], simplified_cal)
+                except ValueError:
+                    pass
+                else:
+                    attrs[parent_time] = 'days since 1850-1-1 00:00:00'
+
+                    branch_parent = 'branch_time_in_parent'
+                    if branch_parent in attrs:
+                        attrs[branch_parent] = parent_units.convert(
+                            attrs[branch_parent], cube_coord.units)
+
+                    branch_child = 'branch_time_in_child'
+                    if branch_child in attrs:
+                        attrs[branch_child] = old_units.convert(
+                            attrs[branch_child], cube_coord.units)
+
+    def _fix_time_bounds(self, cube: Cube, cube_coord: Coord) -> None:
+        """Fix time bounds."""
+        times = {'time', 'time1', 'time2', 'time3'}
+        key = times.intersection(self.vardef.coordinates)
+        cmor = self.vardef.coordinates[' '.join(key)]
+        if cmor.must_have_bounds == 'yes' and not cube_coord.has_bounds():
+            cube_coord.bounds = get_time_bounds(cube_coord, self.frequency)
+            self._warning_msg(
+                cube,
+                "Added guessed bounds to coordinate %s",
+                cube_coord.var_name,
+            )
+
+    def _fix_time_coord(self, cube: Cube) -> Cube:
+        """Fix time coordinate."""
+        # Make sure to get dimensional time coordinate if possible
+        if cube.coords('time', dim_coords=True):
+            cube_coord = cube.coord('time', dim_coords=True)
+        elif cube.coords('time'):
+            cube_coord = cube.coord('time')
+        else:
+            return cube
+
+        # Cannot fix wrong time that are not references
+        if not cube_coord.units.is_time_reference():
+            return cube
+
+        # Fix time units
+        self._fix_time_units(cube, cube_coord)
+
+        # Remove time_origin from coordinate attributes
+        cube_coord.attributes.pop('time_origin', None)
+
+        # Fix time bounds
+        self._fix_time_bounds(cube, cube_coord)
+
+        return cube
+
+    def _fix_coord(
+        self,
+        cube: Cube,
+        cmor_coord: CoordinateInfo,
+        cube_coord: Coord,
+    ) -> tuple[Cube, Coord]:
+        """Fix non-time coordinate."""
+        self._fix_coord_units(cube, cmor_coord, cube_coord)
+        (cube, cube_coord) = self._fix_longitude_0_360(
+            cube, cmor_coord, cube_coord
+        )
+        self._fix_coord_bounds(cube, cmor_coord, cube_coord)
+        (cube, cube_coord) = self._fix_coord_direction(
+            cube, cmor_coord, cube_coord
+        )
+        self._fix_requested_coord_values(cube, cmor_coord, cube_coord)
+        return (cube, cube_coord)
+
+    def _fix_coords(self, cube: Cube) -> Cube:
+        """Fix non-time coordinates."""
+        for cmor_coord in self.vardef.coordinates.values():
+
+            # Cannot fix generic level coords with no unique CMOR information
+            if cmor_coord.generic_level and not cmor_coord.out_name:
+                continue
+
+            # Try to get coordinate from cube; if it does not exists, skip
+            if not cube.coords(var_name=cmor_coord.out_name):
+                continue
+            cube_coord = cube.coord(var_name=cmor_coord.out_name)
+
+            # Fixes for time coord are done separately
+            if cube_coord.var_name == 'time':
+                continue
+
+            # Fixes
+            (cube, cube_coord) = self._fix_coord(cube, cmor_coord, cube_coord)
+
+        return cube
diff --git a/esmvalcore/cmor/_fixes/shared.py b/esmvalcore/cmor/_fixes/shared.py
index 0e4dfead08..e9ae61499f 100644
--- a/esmvalcore/cmor/_fixes/shared.py
+++ b/esmvalcore/cmor/_fixes/shared.py
@@ -1,6 +1,7 @@
 """Shared functions for fixes."""
 import logging
 import os
+from datetime import datetime
 from functools import lru_cache
 
 import dask.array as da
@@ -9,8 +10,11 @@
 import pandas as pd
 from cf_units import Unit
 from iris import NameConstraint
+from iris.coords import Coord
 from scipy.interpolate import interp1d
 
+from esmvalcore.iris_helpers import date2num
+
 logger = logging.getLogger(__name__)
 
 
@@ -103,7 +107,9 @@ def add_plev_from_altitude(cube):
             )
         pressure_coord = iris.coords.AuxCoord(pressure_points,
                                               bounds=pressure_bounds,
+                                              var_name='plev',
                                               standard_name='air_pressure',
+                                              long_name='pressure',
                                               units='Pa')
         cube.add_aux_coord(pressure_coord, cube.coord_dims(height_coord))
         return
@@ -141,7 +147,9 @@ def add_altitude_from_plev(cube):
             )
         altitude_coord = iris.coords.AuxCoord(altitude_points,
                                               bounds=altitude_bounds,
+                                              var_name='alt',
                                               standard_name='altitude',
+                                              long_name='altitude',
                                               units='m')
         cube.add_aux_coord(altitude_coord, cube.coord_dims(plev_coord))
         return
@@ -411,3 +419,92 @@ def fix_ocean_depth_coord(cube):
     depth_coord.units = 'm'
     depth_coord.long_name = 'ocean depth coordinate'
     depth_coord.attributes = {'positive': 'down'}
+
+
+def get_next_month(month: int, year: int) -> tuple[int, int]:
+    """Get next month and year.
+
+    Parameters
+    ----------
+    month:
+        Current month.
+    year:
+        Current year.
+
+    Returns
+    -------
+    tuple[int, int]
+        Next month and next year.
+
+    """
+    if month != 12:
+        return month + 1, year
+    return 1, year + 1
+
+
+def get_time_bounds(time: Coord, freq: str) -> np.ndarray:
+    """Get bounds for time coordinate.
+
+    For monthly data, use the first day of the current month and the first day
+    of the next month. For yearly or decadal data, use 1 January of the current
+    year and 1 January of the next year or 10 years from the current year. For
+    other frequencies (daily, 6-hourly, 3-hourly, hourly), half of the
+    frequency is subtracted/added from the current point in time to get the
+    bounds.
+
+    Parameters
+    ----------
+    time:
+        Time coordinate.
+    freq:
+        Frequency.
+
+    Returns
+    -------
+    np.ndarray
+        Time bounds
+
+    Raises
+    ------
+    NotImplementedError
+        Non-supported frequency is given.
+
+    """
+    bounds = []
+    dates = time.units.num2date(time.points)
+    for step, date in enumerate(dates):
+        month = date.month
+        year = date.year
+        if freq in ['mon', 'mo']:
+            next_month, next_year = get_next_month(month, year)
+            min_bound = date2num(datetime(year, month, 1, 0, 0),
+                                 time.units, time.dtype)
+            max_bound = date2num(datetime(next_year, next_month, 1, 0, 0),
+                                 time.units, time.dtype)
+        elif freq == 'yr':
+            min_bound = date2num(datetime(year, 1, 1, 0, 0),
+                                 time.units, time.dtype)
+            max_bound = date2num(datetime(year + 1, 1, 1, 0, 0),
+                                 time.units, time.dtype)
+        elif freq == 'dec':
+            min_bound = date2num(datetime(year, 1, 1, 0, 0),
+                                 time.units, time.dtype)
+            max_bound = date2num(datetime(year + 10, 1, 1, 0, 0),
+                                 time.units, time.dtype)
+        else:
+            delta = {
+                'day': 12.0 / 24,
+                '6hr': 3.0 / 24,
+                '3hr': 1.5 / 24,
+                '1hr': 0.5 / 24,
+            }
+            if freq not in delta:
+                raise NotImplementedError(
+                    f"Cannot guess time bounds for frequency '{freq}'"
+                )
+            point = time.points[step]
+            min_bound = point - delta[freq]
+            max_bound = point + delta[freq]
+        bounds.append([min_bound, max_bound])
+
+    return np.array(bounds)
diff --git a/esmvalcore/cmor/_utils.py b/esmvalcore/cmor/_utils.py
new file mode 100644
index 0000000000..4b083f19de
--- /dev/null
+++ b/esmvalcore/cmor/_utils.py
@@ -0,0 +1,219 @@
+"""Utilities for CMOR module."""
+from __future__ import annotations
+
+import logging
+from collections.abc import Sequence
+from typing import Optional
+
+from iris.coords import Coord
+from iris.cube import Cube
+from iris.exceptions import CoordinateNotFoundError
+
+from esmvalcore.cmor.table import CMOR_TABLES, CoordinateInfo, VariableInfo
+
+logger = logging.getLogger(__name__)
+
+_ALTERNATIVE_GENERIC_LEV_COORDS = {
+    'alevel': {
+        'CMIP5': ['alt40', 'plevs'],
+        'CMIP6': ['alt16', 'plev3'],
+        'obs4MIPs': ['alt16', 'plev3'],
+    },
+    'zlevel': {
+        'CMIP3': ['pressure'],
+    },
+}
+
+
+def _get_alternative_generic_lev_coord(
+    cube: Cube,
+    coord_name: str,
+    cmor_table_type: str,
+) -> tuple[CoordinateInfo, Coord]:
+    """Find alternative generic level coordinate in cube.
+
+    Parameters
+    ----------
+    cube:
+        Cube to be checked.
+    coord_name:
+        Name of the generic level coordinate.
+    cmor_table_type:
+        CMOR table type, e.g., CMIP3, CMIP5, CMIP6. Note: This is NOT the
+        project of the dataset, but rather the entry `cmor_type` in
+        `config-developer.yml`.
+
+    Returns
+    -------
+    tuple[CoordinateInfo, Coord]
+        Coordinate information from the CMOR tables and the corresponding
+        coordinate in the cube.
+
+    Raises
+    ------
+    ValueError
+        No valid alternative generic level coordinate present in cube.
+
+    """
+    alternatives_for_coord = _ALTERNATIVE_GENERIC_LEV_COORDS.get(
+        coord_name, {}
+    )
+    allowed_alternatives = alternatives_for_coord.get(cmor_table_type, [])
+
+    # Check if any of the allowed alternative coordinates is present in the
+    # cube
+    for allowed_alternative in allowed_alternatives:
+        cmor_coord = CMOR_TABLES[cmor_table_type].coords[allowed_alternative]
+        if cube.coords(var_name=cmor_coord.out_name):
+            cube_coord = cube.coord(var_name=cmor_coord.out_name)
+            return (cmor_coord, cube_coord)
+
+    raise ValueError(
+        f"Found no valid alternative coordinate for generic level coordinate "
+        f"'{coord_name}'"
+    )
+
+
+def _get_generic_lev_coord_names(
+    cube: Cube,
+    cmor_coord: CoordinateInfo,
+) -> tuple[str | None, str | None, str | None]:
+    """Try to get names of a generic level coordinate.
+
+    Parameters
+    ----------
+    cube:
+        Cube to be checked.
+    cmor_coord:
+        Coordinate information from the CMOR table with a non-emmpty
+        `generic_lev_coords` :obj:`dict`.
+
+    Returns
+    -------
+    tuple[str | None, str | None, str | None]
+        Tuple of `standard_name`, `out_name`, and `name` of the generic level
+        coordinate present in the cube. Values are ``None`` if generic level
+        coordinate has not been found in cube.
+
+    """
+    standard_name = None
+    out_name = None
+    name = None
+
+    # Iterate over all possible generic level coordinates
+    for coord in cmor_coord.generic_lev_coords.values():
+        # First, try to use var_name to find coordinate
+        if cube.coords(var_name=coord.out_name):
+            cube_coord = cube.coord(var_name=coord.out_name)
+            out_name = coord.out_name
+            if cube_coord.standard_name == coord.standard_name:
+                standard_name = coord.standard_name
+                name = coord.name
+
+        # Second, try to use standard_name to find coordinate
+        elif cube.coords(coord.standard_name):
+            standard_name = coord.standard_name
+            name = coord.name
+
+    return (standard_name, out_name, name)
+
+
+def _get_new_generic_level_coord(
+    var_info: VariableInfo,
+    generic_level_coord: CoordinateInfo,
+    generic_level_coord_name: str,
+    new_coord_name: str | None,
+) -> CoordinateInfo:
+    """Get new generic level coordinate.
+
+    There are a variety of possible options for each generic level coordinate
+    (e.g., `alevel`) which is actually present in a cube, for example,
+    `hybrid_height` or `standard_hybrid_sigma`. This function returns the new
+    coordinate (e.g., `new_coord_name=hybrid_height`) with the relevant
+    metadata.
+
+    Note
+    ----
+    This alters the corresponding entry of the original generic level
+    coordinate's `generic_level_coords` attribute (i.e.,
+    ``generic_level_coord.generic_level_coords[new_coord_name]`) in-place!
+
+    Parameters
+    ----------
+    var_info:
+        CMOR variable information.
+    generic_level_coord:
+        Original generic level coordinate.
+    generic_level_coord_name:
+        Original name of the generic level coordinate (e.g., `alevel`).
+    new_coord_name:
+        Name of the new generic level coordinate (e.g., `hybrid_height`).
+
+    Returns
+    -------
+    CoordinateInfo
+        New generic level coordinate.
+
+    """
+    new_coord = generic_level_coord.generic_lev_coords[new_coord_name]
+    new_coord.generic_level = True
+    new_coord.generic_lev_coords = (
+        var_info.coordinates[generic_level_coord_name].generic_lev_coords
+    )
+    return new_coord
+
+
+def _get_simplified_calendar(calendar: str) -> str:
+    """Simplify calendar."""
+    calendar_aliases = {
+        'all_leap': '366_day',
+        'noleap': '365_day',
+        'gregorian': 'standard',
+    }
+    return calendar_aliases.get(calendar, calendar)
+
+
+def _is_unstructured_grid(cube: Cube) -> bool:
+    """Check if cube uses unstructured grid."""
+    try:
+        lat = cube.coord('latitude')
+        lon = cube.coord('longitude')
+    except CoordinateNotFoundError:
+        pass
+    else:
+        if lat.ndim == 1 and (cube.coord_dims(lat) == cube.coord_dims(lon)):
+            return True
+    return False
+
+
+def _get_single_cube(
+    cube_list: Sequence[Cube],
+    short_name: str,
+    dataset_str: Optional[str] = None,
+) -> Cube:
+    if len(cube_list) == 1:
+        return cube_list[0]
+    cube = None
+    for raw_cube in cube_list:
+        if raw_cube.var_name == short_name:
+            cube = raw_cube
+            break
+
+    if dataset_str is None:
+        dataset_str = ''
+    else:
+        dataset_str = f' in {dataset_str}'
+
+    if not cube:
+        raise ValueError(
+            f"More than one cube found for variable {short_name}{dataset_str} "
+            f"but none of their var_names match the expected.\nFull list of "
+            f"cubes encountered: {cube_list}"
+        )
+    logger.warning(
+        "Found variable %s%s, but there were other present in the file. Those "
+        "extra variables are usually metadata (cell area, latitude "
+        "descriptions) that was not saved according to CF-conventions. It is "
+        "possible that errors appear further on because of this.\nFull list "
+        "of cubes encountered: %s", short_name, dataset_str, cube_list)
+    return cube
diff --git a/esmvalcore/cmor/check.py b/esmvalcore/cmor/check.py
index 29f0f74e7e..43214168b8 100644
--- a/esmvalcore/cmor/check.py
+++ b/esmvalcore/cmor/check.py
@@ -1,7 +1,12 @@
 """Module for checking iris cubes against their CMOR definitions."""
+from __future__ import annotations
+
 import logging
-from datetime import datetime
+import warnings
+from collections.abc import Callable
 from enum import IntEnum
+from functools import cached_property
+from typing import Optional
 
 import cf_units
 import iris.coord_categorisation
@@ -9,10 +14,18 @@
 import iris.exceptions
 import iris.util
 import numpy as np
+from iris.cube import Cube
 
-from esmvalcore.iris_helpers import date2num
-
-from .table import CMOR_TABLES
+from esmvalcore.cmor._fixes.fix import GenericFix
+from esmvalcore.cmor._utils import (
+    _get_alternative_generic_lev_coord,
+    _get_generic_lev_coord_names,
+    _get_new_generic_level_coord,
+    _get_simplified_calendar,
+    _is_unstructured_grid,
+)
+from esmvalcore.cmor.table import get_var_info
+from esmvalcore.exceptions import ESMValCoreDeprecationWarning
 
 
 class CheckLevels(IntEnum):
@@ -34,49 +47,6 @@ class CheckLevels(IntEnum):
     """Do not fail for any discrepancy with CMOR standards."""
 
 
-def _get_next_month(month, year):
-    if month != 12:
-        return month + 1, year
-    return 1, year + 1
-
-
-def _get_time_bounds(time, freq):
-    bounds = []
-    dates = time.units.num2date(time.points)
-    for step, date in enumerate(dates):
-        month = date.month
-        year = date.year
-        if freq in ['mon', 'mo']:
-            next_month, next_year = _get_next_month(month, year)
-            min_bound = date2num(datetime(year, month, 1, 0, 0),
-                                 time.units, time.dtype)
-            max_bound = date2num(datetime(next_year, next_month, 1, 0, 0),
-                                 time.units, time.dtype)
-        elif freq == 'yr':
-            min_bound = date2num(datetime(year, 1, 1, 0, 0),
-                                 time.units, time.dtype)
-            max_bound = date2num(datetime(year + 1, 1, 1, 0, 0),
-                                 time.units, time.dtype)
-        elif freq == 'dec':
-            min_bound = date2num(datetime(year, 1, 1, 0, 0),
-                                 time.units, time.dtype)
-            max_bound = date2num(datetime(year + 10, 1, 1, 0, 0),
-                                 time.units, time.dtype)
-        else:
-            delta = {
-                'day': 12 / 24,
-                '6hr': 3 / 24,
-                '3hr': 1.5 / 24,
-                '1hr': 0.5 / 24,
-            }
-            point = time.points[step]
-            min_bound = point - delta[freq]
-            max_bound = point + delta[freq]
-        bounds.append([min_bound, max_bound])
-
-    return np.array(bounds)
-
-
 class CMORCheckError(Exception):
     """Exception raised when a cube does not pass the CMORCheck."""
 
@@ -84,9 +54,6 @@ class CMORCheckError(Exception):
 class CMORCheck():
     """Class used to check the CMOR-compliance of the data.
 
-    It can also fix some minor errors and does some minor data
-    homogeneization:
-
     Parameters
     ----------
     cube: iris.cube.Cube:
@@ -94,13 +61,23 @@ class CMORCheck():
     var_info: variables_info.VariableInfo
         Variable info to check.
     frequency: str
-        Expected frequency for the data.
+        Expected frequency for the data. If not given, use the one from the
+        variable information.
     fail_on_error: bool
         If true, CMORCheck stops on the first error. If false, it collects
         all possible errors before stopping.
     automatic_fixes: bool
         If True, CMORCheck will try to apply automatic fixes for any
         detected error, if possible.
+
+        .. deprecated:: 2.10.0
+            This option has been deprecated in ESMValCore version 2.10.0 and is
+            scheduled for removal in version 2.12.0. Please use the functions
+            :func:`~esmvalcore.preprocessor.fix_metadata`,
+            :func:`~esmvalcore.preprocessor.fix_data`, or
+            :meth:`esmvalcore.dataset.Dataset.load` (which automatically
+            includes the first two functions) instead. Fixes and CMOR checks
+            have been clearly separated in ESMValCore version 2.10.0.
     check_level: CheckLevels
         Level of strictness of the checks.
 
@@ -131,7 +108,6 @@ def __init__(self,
         self._errors = list()
         self._warnings = list()
         self._debug_messages = list()
-        self._unstructured = None
 
         self._cmor_var = var_info
         if not frequency:
@@ -139,47 +115,61 @@ def __init__(self,
         self.frequency = frequency
         self.automatic_fixes = automatic_fixes
 
-    def _is_unstructured_grid(self):
-        if self._unstructured is None:
-            self._unstructured = False
-            try:
-                lat = self._cube.coord('latitude')
-                lon = self._cube.coord('longitude')
-            except iris.exceptions.CoordinateNotFoundError:
-                pass
-            else:
-                if lat.ndim == 1 and (self._cube.coord_dims(lat)
-                                      == self._cube.coord_dims(lon)):
-                    self._unstructured = True
-        return self._unstructured
-
-    def check_metadata(self, logger=None):
+        # Deprecate automatic_fixes (remove in v2.12)
+        if automatic_fixes:
+            msg = (
+                "The option `automatic_fixes` has been deprecated in "
+                "ESMValCore version 2.10.0 and is scheduled for removal in "
+                "version 2.12.0. Please use the functions "
+                "esmvalcore.preprocessor.fix_metadata(), "
+                "esmvalcore.preprocessor.fix_data(), or "
+                "esmvalcore.dataset.Dataset.load() (which automatically "
+                "includes the first two functions) instead. Fixes and CMOR "
+                "checks have been clearly separated in ESMValCore version "
+                "2.10.0."
+            )
+            warnings.warn(msg, ESMValCoreDeprecationWarning)
+
+        # TODO: remove in v2.12
+
+        self._generic_fix = GenericFix(var_info, frequency=frequency)
+
+    @cached_property
+    def _unstructured_grid(self) -> bool:
+        """Cube uses unstructured grid."""
+        return _is_unstructured_grid(self._cube)
+
+    def check_metadata(self, logger: Optional[logging.Logger] = None) -> Cube:
         """Check the cube metadata.
 
-        Perform all the tests that do not require to have the data in memory.
-
-        It will also report some warnings in case of minor errors and
-        homogenize some data:
-
-            - Equivalent calendars will all default to the same name.
-            - Time units will be set to days since 1850-01-01
+        It will also report some warnings in case of minor errors.
 
 
         Parameters
         ----------
-        logger: logging.Logger
+        logger:
             Given logger.
 
+        Returns
+        -------
+        iris.cube.Cube
+            Checked cube.
+
         Raises
         ------
         CMORCheckError
             If errors are found. If fail_on_error attribute is set to True,
             raises as soon as an error is detected. If set to False, it perform
             all checks and then raises.
+
         """
         if logger is not None:
             self._logger = logger
 
+        # TODO: remove in v2.12
+        if self.automatic_fixes:
+            [self._cube] = self._generic_fix.fix_metadata([self._cube])
+
         self._check_var_metadata()
         self._check_fill_value()
         self._check_multiple_coords_same_stdname()
@@ -196,10 +186,9 @@ def check_metadata(self, logger=None):
 
         return self._cube
 
-    def check_data(self, logger=None):
+    def check_data(self, logger: Optional[logging.Logger] = None) -> Cube:
         """Check the cube data.
 
-        Performs all the tests that require to have the data in memory.
         Assumes that metadata is correct, so you must call check_metadata prior
         to this.
 
@@ -207,28 +196,35 @@ def check_data(self, logger=None):
 
         Parameters
         ----------
-        logger: logging.Logger
+        logger:
             Given logger.
 
+        Returns
+        -------
+        iris.cube.Cube
+            Checked cube.
+
         Raises
         ------
         CMORCheckError
             If errors are found. If fail_on_error attribute is set to True,
             raises as soon as an error is detected. If set to False, it perform
             all checks and then raises.
+
         """
         if logger is not None:
             self._logger = logger
 
-        if self._cmor_var.units:
-            units = self._get_effective_units()
-            if str(self._cube.units) != units:
-                self._cube.convert_units(units)
+        # TODO: remove in v2.12
+        if self.automatic_fixes:
+            self._cube = self._generic_fix.fix_data(self._cube)
 
         self._check_coords_data()
 
+        self.report_debug_messages()
         self.report_warnings()
         self.report_errors()
+
         return self._cube
 
     def report_errors(self):
@@ -251,13 +247,7 @@ def report_errors(self):
             raise CMORCheckError(msg)
 
     def report_warnings(self):
-        """Report detected warnings to the given logger.
-
-        Parameters
-        ----------
-        logger: logging.Logger
-            Given logger
-        """
+        """Report detected warnings to the given logger."""
         if self.has_warnings():
             msg = '\n'.join([
                 f'There were warnings in variable {self._cube.var_name}:',
@@ -268,13 +258,7 @@ def report_warnings(self):
             self._logger.warning(msg)
 
     def report_debug_messages(self):
-        """Report detected debug messages to the given logger.
-
-        Parameters
-        ----------
-        logger: logging.Logger
-            Given logger.
-        """
+        """Report detected debug messages to the given logger."""
         if self.has_debug_messages():
             msg = '\n'.join([
                 f'There were metadata changes in variable '
@@ -298,49 +282,24 @@ def _check_var_metadata(self):
         # Check standard_name
         if self._cmor_var.standard_name:
             if self._cube.standard_name != self._cmor_var.standard_name:
-                if self.automatic_fixes:
-                    self.report_warning(
-                        'Standard name for {} changed from {} to {}',
-                        self._cube.var_name, self._cube.standard_name,
-                        self._cmor_var.standard_name)
-                    self._cube.standard_name = self._cmor_var.standard_name
-                else:
-                    self.report_error(self._attr_msg, self._cube.var_name,
-                                      'standard_name',
-                                      self._cmor_var.standard_name,
-                                      self._cube.standard_name)
+                self.report_error(self._attr_msg, self._cube.var_name,
+                                  'standard_name',
+                                  self._cmor_var.standard_name,
+                                  self._cube.standard_name)
         # Check long_name
         if self._cmor_var.long_name:
             if self._cube.long_name != self._cmor_var.long_name:
-                if self.automatic_fixes:
-                    self.report_warning(
-                        'Long name for {} changed from {} to {}',
-                        self._cube.var_name, self._cube.long_name,
-                        self._cmor_var.long_name)
-                    self._cube.long_name = self._cmor_var.long_name
-                else:
-                    self.report_error(self._attr_msg, self._cube.var_name,
-                                      'long_name', self._cmor_var.long_name,
-                                      self._cube.long_name)
+                self.report_error(self._attr_msg, self._cube.var_name,
+                                  'long_name', self._cmor_var.long_name,
+                                  self._cube.long_name)
 
         # Check units
-        if (self.automatic_fixes and self._cube.attributes.get(
-                'invalid_units', '').lower() == 'psu'):
-            self._cube.units = '1.0'
-            del self._cube.attributes['invalid_units']
-
         if self._cmor_var.units:
             units = self._get_effective_units()
             if self._cube.units != units:
-                if not self._cube.units.is_convertible(units):
-                    self.report_error(f'Variable {self._cube.var_name} units '
-                                      f'{self._cube.units} can not be '
-                                      f'converted to {self._cmor_var.units}')
-                else:
-                    self.report_warning(
-                        f'Variable {self._cube.var_name} units '
-                        f'{self._cube.units} will be '
-                        f'converted to {self._cmor_var.units}')
+                self.report_error(self._attr_msg, self._cube.var_name,
+                                  'units', self._cmor_var.units,
+                                  self._cube.units)
 
         # Check other variable attributes that match entries in cube.attributes
         attrs = ('positive', )
@@ -357,6 +316,7 @@ def _check_var_metadata(self):
 
     def _get_effective_units(self):
         """Get effective units."""
+        # TODO: remove entire function in v2.12
         if self._cmor_var.units.lower() == 'psu':
             units = '1.0'
         else:
@@ -423,20 +383,7 @@ def _check_dim_names(self):
                 except iris.exceptions.CoordinateNotFoundError:
                     try:
                         coord = self._cube.coord(coordinate.standard_name)
-                        if self._cmor_var.table_type in 'CMIP6' and \
-                           coord.ndim > 1 and \
-                           coord.standard_name in ['latitude', 'longitude']:
-                            self.report_debug_message(
-                                'Multidimensional {0} coordinate is not set '
-                                'in CMOR standard. ESMValTool will change '
-                                'the original value of  {1} to {2} to match '
-                                'the one-dimensional case.',
-                                coordinate.standard_name,
-                                coord.var_name,
-                                coordinate.out_name,
-                            )
-                            coord.var_name = coordinate.out_name
-                        elif coord.standard_name in ['region', 'area_type']:
+                        if coord.standard_name in ['region', 'area_type']:
                             self.report_debug_message(
                                 'Coordinate {0} has var name {1} '
                                 'instead of {2}. '
@@ -467,33 +414,17 @@ def _check_dim_names(self):
 
     def _check_generic_level_dim_names(self, key, coordinate):
         """Check name of generic level coordinate."""
-        standard_name = None
-        out_name = None
-        name = None
         if coordinate.generic_lev_coords:
-            for coord in coordinate.generic_lev_coords.values():
-                try:
-                    cube_coord = self._cube.coord(var_name=coord.out_name)
-                    out_name = coord.out_name
-                    if cube_coord.standard_name == coord.standard_name:
-                        standard_name = coord.standard_name
-                        name = coord.name
-                except iris.exceptions.CoordinateNotFoundError:
-                    try:
-                        cube_coord = self._cube.coord(
-                            var_name=coord.standard_name)
-                        standard_name = coord.standard_name
-                        name = coord.name
-                    except iris.exceptions.CoordinateNotFoundError:
-                        pass
+            (standard_name, out_name, name) = _get_generic_lev_coord_names(
+                self._cube, coordinate
+            )
             if standard_name:
                 if not out_name:
                     self.report_error(
                         f'Generic level coordinate {key} has wrong var_name.')
-                level = coordinate.generic_lev_coords[name]
-                level.generic_level = True
-                level.generic_lev_coords = self._cmor_var.coordinates[
-                    key].generic_lev_coords
+                level = _get_new_generic_level_coord(
+                    self._cmor_var, coordinate, key, name
+                )
                 self._cmor_var.coordinates[key] = level
                 self.report_debug_message(f'Generic level coordinate {key} '
                                           'will be checked against '
@@ -506,17 +437,6 @@ def _check_generic_level_dim_names(self, key, coordinate):
                 else:
                     self._check_alternative_dim_names(key)
 
-    ALTERNATIVE_GENERIC_LEV_COORDS = {
-        'alevel': {
-            'CMIP5': ['alt40', 'plevs'],
-            'CMIP6': ['alt16', 'plev3'],
-            'obs4MIPs': ['alt16', 'plev3'],
-        },
-        'zlevel': {
-            'CMIP3': ['pressure'],
-        },
-    }
-
     def _check_alternative_dim_names(self, key):
         """Check for viable alternatives to generic level coordinates.
 
@@ -549,42 +469,34 @@ def _check_alternative_dim_names(self, key):
         For ``cmor_strict=False`` project (like OBS) the check for requested
         values might be disabled.
         """
-        table_type = self._cmor_var.table_type
-        alternative_coord = None
-        allowed_alternatives = self.ALTERNATIVE_GENERIC_LEV_COORDS.get(
-            key, {}).get(table_type, [])
-
-        # Check if any of the allowed alternative coordinates is present in the
-        # cube
-        for allowed_alternative in allowed_alternatives:
-            coord_info = CMOR_TABLES[table_type].coords[allowed_alternative]
-            try:
-                cube_coord = self._cube.coord(var_name=coord_info.out_name)
-            except iris.exceptions.CoordinateNotFoundError:
-                pass
-            else:
-                if cube_coord.standard_name == coord_info.standard_name:
-                    alternative_coord = coord_info
-                    break
-                self.report_error(
-                    f"Found alternative coordinate '{coord_info.out_name}' "
-                    f"for generic level coordinate '{key}' with wrong "
-                    f"standard_name '{cube_coord.standard_name}' (expected "
-                    f"'{coord_info.standard_name}')")
-                break
+        try:
+            (alternative_coord,
+             cube_coord) = _get_alternative_generic_lev_coord(
+                self._cube, key, self._cmor_var.table_type
+            )
 
         # No valid alternative coordinate found -> critical error
-        if alternative_coord is None:
+        except ValueError:
             self.report_critical(self._does_msg, key, 'exist')
             return
 
+        # Wrong standard_name -> error
+        if cube_coord.standard_name != alternative_coord.standard_name:
+            self.report_error(
+                f"Found alternative coordinate '{alternative_coord.out_name}' "
+                f"for generic level coordinate '{key}' with wrong "
+                f"standard_name {cube_coord.standard_name}' (expected "
+                f"'{alternative_coord.standard_name}')"
+            )
+            return
+
         # Valid alternative coordinate found -> perform checks on it
         self.report_warning(
             f"Found alternative coordinate '{alternative_coord.out_name}' "
             f"for generic level coordinate '{key}'. Subsequent warnings about "
             f"levels that are not contained in '{alternative_coord.out_name}' "
             f"can be safely ignored.")
-        self._check_coord(alternative_coord, cube_coord, self._cube.var_name)
+        self._check_coord(alternative_coord, cube_coord, cube_coord.var_name)
 
     def _check_coords(self):
         """Check coordinates."""
@@ -616,6 +528,12 @@ def _check_coords_data(self):
             except iris.exceptions.CoordinateNotFoundError:
                 continue
 
+            # TODO: remove in v2.12
+            if self.automatic_fixes:
+                (self._cube, coord) = self._generic_fix._fix_coord_direction(
+                    self._cube, coordinate, coord
+                )
+
             self._check_coord_monotonicity_and_direction(
                 coordinate, coord, var_name)
 
@@ -625,57 +543,24 @@ def _check_coord(self, cmor, coord, var_name):
             return
         if cmor.units:
             if str(coord.units) != cmor.units:
-                fixed = False
-                if self.automatic_fixes:
-                    try:
-                        old_unit = coord.units
-                        new_unit = cf_units.Unit(cmor.units,
-                                                 coord.units.calendar)
-                        coord.convert_units(new_unit)
-                        fixed = True
-                        self.report_warning(
-                            f'Coordinate {coord.var_name} units '
-                            f'{str(old_unit)} '
-                            f'converted to {cmor.units}')
-                    except ValueError:
-                        pass
-                if not fixed:
-                    self.report_critical(self._attr_msg, var_name, 'units',
-                                         cmor.units, coord.units)
+                self.report_critical(self._attr_msg, var_name, 'units',
+                                     cmor.units, coord.units)
         self._check_coord_points(cmor, coord, var_name)
 
     def _check_coord_bounds(self, cmor, coord, var_name):
         if cmor.must_have_bounds == 'yes' and not coord.has_bounds():
-            if self.automatic_fixes:
-                try:
-                    coord.guess_bounds()
-                except ValueError as ex:
-                    self.report_warning(
-                        'Can not guess bounds for coordinate {0} '
-                        'from var {1}: {2}', coord.var_name, var_name, ex)
-                else:
-                    self.report_warning(
-                        'Added guessed bounds to coordinate {0} from var {1}',
-                        coord.var_name, var_name)
-            else:
-                self.report_warning(
-                    'Coordinate {0} from var {1} does not have bounds',
-                    coord.var_name, var_name)
+            self.report_warning(
+                'Coordinate {0} from var {1} does not have bounds',
+                coord.var_name, var_name)
 
-    def _check_time_bounds(self, freq, time):
+    def _check_time_bounds(self, time):
         times = {'time', 'time1', 'time2', 'time3'}
         key = times.intersection(self._cmor_var.coordinates)
         cmor = self._cmor_var.coordinates[" ".join(key)]
         if cmor.must_have_bounds == 'yes' and not time.has_bounds():
-            if self.automatic_fixes:
-                time.bounds = _get_time_bounds(time, freq)
-                self.report_warning(
-                    'Added guessed bounds to coordinate {0} from var {1}',
-                    time.var_name, self._cmor_var.short_name)
-            else:
-                self.report_warning(
-                    'Coordinate {0} from var {1} does not have bounds',
-                    time.var_name, self._cmor_var.short_name)
+            self.report_warning(
+                'Coordinate {0} from var {1} does not have bounds',
+                time.var_name, self._cmor_var.short_name)
 
     def _check_coord_monotonicity_and_direction(self, cmor, coord, var_name):
         """Check monotonicity and direction of coordinate."""
@@ -684,8 +569,8 @@ def _check_coord_monotonicity_and_direction(self, cmor, coord, var_name):
         if coord.dtype.kind == 'U':
             return
 
-        if self._is_unstructured_grid() and \
-           coord.standard_name in ['latitude', 'longitude']:
+        if (self._unstructured_grid and
+                coord.standard_name in ['latitude', 'longitude']):
             self.report_debug_message(
                 f'Coordinate {coord.standard_name} appears to belong to '
                 'an unstructured grid. Skipping monotonicity and '
@@ -694,118 +579,42 @@ def _check_coord_monotonicity_and_direction(self, cmor, coord, var_name):
 
         if not coord.is_monotonic():
             self.report_critical(self._is_msg, var_name, 'monotonic')
+
         if len(coord.core_points()) == 1:
             return
+
         if cmor.stored_direction:
             if cmor.stored_direction == 'increasing':
                 if coord.core_points()[0] > coord.core_points()[1]:
-                    if not self.automatic_fixes or coord.ndim > 1:
-                        self.report_critical(self._is_msg, var_name,
-                                             'increasing')
-                    else:
-                        self._reverse_coord(coord)
+                    self.report_critical(self._is_msg, var_name, 'increasing')
             elif cmor.stored_direction == 'decreasing':
                 if coord.core_points()[0] < coord.core_points()[1]:
-                    if not self.automatic_fixes or coord.ndim > 1:
-                        self.report_critical(self._is_msg, var_name,
-                                             'decreasing')
-                    else:
-                        self._reverse_coord(coord)
-
-    def _reverse_coord(self, coord):
-        """Reverse coordinate."""
-        if coord.ndim == 1:
-            self._cube = iris.util.reverse(self._cube,
-                                           self._cube.coord_dims(coord))
-            reversed_coord = self._cube.coord(var_name=coord.var_name)
-            if reversed_coord.has_bounds():
-                bounds = reversed_coord.bounds
-                right_bounds = bounds[:-2, 1]
-                left_bounds = bounds[1:-1, 0]
-                if np.all(right_bounds != left_bounds):
-                    reversed_coord.bounds = np.fliplr(bounds)
-                    coord = reversed_coord
-            self.report_debug_message(f'Coordinate {coord.var_name} values'
-                                      'have been reversed.')
+                    self.report_critical(self._is_msg, var_name, 'decreasing')
 
     def _check_coord_points(self, coord_info, coord, var_name):
         """Check coordinate points: values, bounds and monotonicity."""
         # Check requested coordinate values exist in coord.points
         self._check_requested_values(coord, coord_info, var_name)
 
-        l_fix_coord_value = False
-
         # Check coordinate value ranges
         if coord_info.valid_min:
             valid_min = float(coord_info.valid_min)
             if np.any(coord.core_points() < valid_min):
-                if coord_info.standard_name == 'longitude' and \
-                        self.automatic_fixes:
-                    l_fix_coord_value = self._check_longitude_min(
-                        coord, var_name)
-                else:
-                    self.report_critical(self._vals_msg, var_name,
-                                         '< {} ='.format('valid_min'),
-                                         valid_min)
+                self.report_critical(self._vals_msg, var_name,
+                                     '< {} ='.format('valid_min'),
+                                     valid_min)
 
         if coord_info.valid_max:
             valid_max = float(coord_info.valid_max)
             if np.any(coord.core_points() > valid_max):
-                if coord_info.standard_name == 'longitude' and \
-                        self.automatic_fixes:
-                    l_fix_coord_value = self._check_longitude_max(
-                        coord, var_name)
-                else:
-                    self.report_critical(self._vals_msg, var_name,
-                                         '> {} ='.format('valid_max'),
-                                         valid_max)
-
-        if l_fix_coord_value:
-            # cube.intersection only works for cells with 0 or 2 bounds
-            # Note: nbounds==0 means there are no bounds given, nbounds==2
-            # implies a regular grid with bounds in the grid direction,
-            # nbounds>2 implies an irregular grid with bounds given as vertices
-            # of the cell polygon.
-            if coord.ndim == 1 and coord.nbounds in (0, 2):
-                lon_extent = iris.coords.CoordExtent(coord, 0.0, 360., True,
-                                                     False)
-                self._cube = self._cube.intersection(lon_extent)
-            else:
-                new_lons = coord.core_points().copy()
-                new_lons = self._set_range_in_0_360(new_lons)
-                if coord.bounds is not None:
-                    new_bounds = coord.bounds.copy()
-                    new_bounds = self._set_range_in_0_360(new_bounds)
-                else:
-                    new_bounds = None
-                new_coord = coord.copy(new_lons, new_bounds)
-                dims = self._cube.coord_dims(coord)
-                self._cube.remove_coord(coord)
-                self._cube.add_aux_coord(new_coord, dims)
-            coord = self._cube.coord(var_name=var_name)
+                self.report_critical(self._vals_msg, var_name,
+                                     '> {} ='.format('valid_max'),
+                                     valid_max)
+
         self._check_coord_bounds(coord_info, coord, var_name)
         self._check_coord_monotonicity_and_direction(coord_info, coord,
                                                      var_name)
 
-    def _check_longitude_max(self, coord, var_name):
-        if np.any(coord.core_points() > 720):
-            self.report_critical(
-                f'{var_name} longitude coordinate has values > 720 degrees')
-            return False
-        return True
-
-    def _check_longitude_min(self, coord, var_name):
-        if np.any(coord.core_points() < -360):
-            self.report_critical(
-                f'{var_name} longitude coordinate has values < -360 degrees')
-            return False
-        return True
-
-    @staticmethod
-    def _set_range_in_0_360(array):
-        """Convert longitude coordinate to [0, 360]."""
-        return (array + 360.0) % 360.0
-
     def _check_requested_values(self, coord, coord_info, var_name):
         """Check requested values."""
         if coord_info.requested:
@@ -818,17 +627,6 @@ def _check_requested_values(self, coord, coord_info, var_name):
                 cmor_points = np.array(coord_info.requested, dtype=float)
             except ValueError:
                 cmor_points = coord_info.requested
-            else:
-                atol = 1e-7 * np.mean(cmor_points)
-                if (self.automatic_fixes
-                        and coord.core_points().shape == cmor_points.shape
-                        and np.allclose(
-                            coord.core_points(),
-                            cmor_points,
-                            rtol=1e-7,
-                            atol=atol,
-                        )):
-                    coord.points = cmor_points
             for point in cmor_points:
                 if point not in coord.core_points():
                     self.report_warning(self._contain_msg, var_name,
@@ -853,12 +651,7 @@ def _check_time_coord(self):
             self.report_critical(self._does_msg, var_name,
                                  'have time reference units')
         else:
-            old_units = coord.units
-            coord.convert_units(
-                cf_units.Unit('days since 1850-1-1 00:00:00',
-                              calendar=coord.units.calendar))
-            simplified_cal = self._simplify_calendar(coord.units.calendar)
-            coord.units = cf_units.Unit(coord.units.origin, simplified_cal)
+            simplified_cal = _get_simplified_calendar(coord.units.calendar)
             attrs = self._cube.attributes
             parent_time = 'parent_time_units'
             if parent_time in attrs:
@@ -866,8 +659,7 @@ def _check_time_coord(self):
                     pass
                 else:
                     try:
-                        parent_units = cf_units.Unit(attrs[parent_time],
-                                                     simplified_cal)
+                        cf_units.Unit(attrs[parent_time], simplified_cal)
                     except ValueError:
                         self.report_warning('Attribute parent_time_units has '
                                             'a wrong format and cannot be '
@@ -875,17 +667,8 @@ def _check_time_coord(self):
                                             'be added to convert properly '
                                             'attributes branch_time_in_parent '
                                             'and branch_time_in_child.')
-                    else:
-                        attrs[parent_time] = 'days since 1850-1-1 00:00:00'
-                        branch_parent = 'branch_time_in_parent'
-                        if branch_parent in attrs:
-                            attrs[branch_parent] = parent_units.convert(
-                                attrs[branch_parent], coord.units)
-                        branch_child = 'branch_time_in_child'
-                        if branch_child in attrs:
-                            attrs[branch_child] = old_units.convert(
-                                attrs[branch_child], coord.units)
 
+        # Check frequency
         tol = 0.001
         intervals = {'dec': (3600, 3660), 'day': (1, 1)}
         freq = self.frequency
@@ -941,18 +724,8 @@ def _check_time_coord(self):
                     msg = '{}: Frequency {} does not match input data'
                     self.report_error(msg, var_name, freq)
                     break
-        self._check_time_bounds(freq, coord)
-        # remove time_origin from attributes
-        coord.attributes.pop('time_origin', None)
-
-    @staticmethod
-    def _simplify_calendar(calendar):
-        calendar_aliases = {
-            'all_leap': '366_day',
-            'noleap': '365_day',
-            'gregorian': 'standard',
-        }
-        return calendar_aliases.get(calendar, calendar)
+
+        self._check_time_bounds(coord)
 
     def has_errors(self):
         """Check if there are reported errors.
@@ -1071,30 +844,19 @@ def report_debug_message(self, message, *args):
         self.report(CheckLevels.DEBUG, message, *args)
 
 
-def _get_cmor_checker(table,
-                      mip,
-                      short_name,
-                      frequency,
-                      fail_on_error=False,
-                      check_level=CheckLevels.DEFAULT,
-                      automatic_fixes=False):
-    """Get a CMOR checker/fixer."""
-    if table not in CMOR_TABLES:
-        raise NotImplementedError(
-            "No CMOR checker implemented for table {}."
-            "\nThe following options are available: {}".format(
-                table, ', '.join(CMOR_TABLES)))
-
-    cmor_table = CMOR_TABLES[table]
-    if table == 'CORDEX' and mip.endswith('hr'):
-        # CORDEX X-hourly tables define the mip
-        # as ending in 'h' instead of 'hr'.
-        mip = mip.replace('hr', 'h')
-    var_info = cmor_table.get_variable(mip, short_name)
-    if var_info is None:
-        var_info = CMOR_TABLES['custom'].get_variable(mip, short_name)
-
-    def _checker(cube):
+def _get_cmor_checker(
+    project: str,
+    mip: str,
+    short_name: str,
+    frequency: None | str = None,
+    fail_on_error: bool = False,
+    check_level: CheckLevels = CheckLevels.DEFAULT,
+    automatic_fixes: bool = False,  # TODO: remove in v2.12
+) -> Callable[[Cube], CMORCheck]:
+    """Get a CMOR checker."""
+    var_info = get_var_info(project, mip, short_name)
+
+    def _checker(cube: Cube) -> CMORCheck:
         return CMORCheck(cube,
                          var_info,
                          frequency=frequency,
@@ -1105,105 +867,143 @@ def _checker(cube):
     return _checker
 
 
-def cmor_check_metadata(cube,
-                        cmor_table,
-                        mip,
-                        short_name,
-                        frequency,
-                        check_level=CheckLevels.DEFAULT):
+def cmor_check_metadata(
+    cube: Cube,
+    cmor_table: str,
+    mip: str,
+    short_name: str,
+    frequency: Optional[str] = None,
+    check_level: CheckLevels = CheckLevels.DEFAULT,
+) -> Cube:
     """Check if metadata conforms to variable's CMOR definition.
 
     None of the checks at this step will force the cube to load the data.
 
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Data cube to check.
-    cmor_table: str
-        CMOR definitions to use.
+    cmor_table:
+        CMOR definitions to use (i.e., the variable's project).
     mip:
-        Variable's mip.
-    short_name: str
+        Variable's MIP.
+    short_name:
         Variable's short name.
-    frequency: str
-        Data frequency.
-    check_level: CheckLevels
+    frequency:
+        Data frequency. If not given, use the one from the CMOR table of the
+        variable.
+    check_level:
         Level of strictness of the checks.
+
+    Returns
+    -------
+    iris.cube.Cube
+        Checked cube.
+
     """
-    checker = _get_cmor_checker(cmor_table,
-                                mip,
-                                short_name,
-                                frequency,
-                                check_level=check_level)
-    checker(cube).check_metadata()
+    checker = _get_cmor_checker(
+        cmor_table,
+        mip,
+        short_name,
+        frequency=frequency,
+        check_level=check_level,
+    )
+    cube = checker(cube).check_metadata()
     return cube
 
 
-def cmor_check_data(cube,
-                    cmor_table,
-                    mip,
-                    short_name,
-                    frequency,
-                    check_level=CheckLevels.DEFAULT):
+def cmor_check_data(
+    cube: Cube,
+    cmor_table: str,
+    mip: str,
+    short_name: str,
+    frequency: Optional[str] = None,
+    check_level: CheckLevels = CheckLevels.DEFAULT,
+) -> Cube:
     """Check if data conforms to variable's CMOR definition.
 
-    The checks performed at this step require the data in memory.
-
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Data cube to check.
-    cmor_table: str
-        CMOR definitions to use.
+    cmor_table:
+        CMOR definitions to use (i.e., the variable's project).
     mip:
-        Variable's mip.
-    short_name: str
+        Variable's MIP.
+    short_name:
         Variable's short name
-    frequency: str
-        Data frequency
-    check_level: CheckLevels
+    frequency:
+        Data frequency. If not given, use the one from the CMOR table of the
+        variable.
+    check_level:
         Level of strictness of the checks.
+
+    Returns
+    -------
+    iris.cube.Cube
+        Checked cube.
+
     """
-    checker = _get_cmor_checker(cmor_table,
-                                mip,
-                                short_name,
-                                frequency,
-                                check_level=check_level)
-    checker(cube).check_data()
+    checker = _get_cmor_checker(
+        cmor_table,
+        mip,
+        short_name,
+        frequency=frequency,
+        check_level=check_level,
+    )
+    cube = checker(cube).check_data()
     return cube
 
 
-def cmor_check(cube, cmor_table, mip, short_name, frequency, check_level):
+def cmor_check(
+    cube: Cube,
+    cmor_table: str,
+    mip: str,
+    short_name: str,
+    frequency: Optional[str] = None,
+    check_level: CheckLevels = CheckLevels.DEFAULT,
+) -> Cube:
     """Check if cube conforms to variable's CMOR definition.
 
-    Equivalent to calling cmor_check_metadata and cmor_check_data
-    consecutively.
+    Equivalent to calling :func:`cmor_check_metadata` and
+    :func:`cmor_check_data` consecutively.
 
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Data cube to check.
-    cmor_table: str
-        CMOR definitions to use.
+    cmor_table:
+        CMOR definitions to use (i.e., the variable's project).
     mip:
-        Variable's mip.
-    short_name: str
+        Variable's MIP.
+    short_name:
         Variable's short name.
-    frequency: str
-        Data frequency.
-    check_level: enum.IntEnum
+    frequency:
+        Data frequency. If not given, use the one from the CMOR table of the
+        variable.
+    check_level:
         Level of strictness of the checks.
+
+    Returns
+    -------
+    iris.cube.Cube
+        Checked cube.
+
     """
-    cmor_check_metadata(cube,
-                        cmor_table,
-                        mip,
-                        short_name,
-                        frequency,
-                        check_level=check_level)
-    cmor_check_data(cube,
-                    cmor_table,
-                    mip,
-                    short_name,
-                    frequency,
-                    check_level=check_level)
+    cube = cmor_check_metadata(
+        cube,
+        cmor_table,
+        mip,
+        short_name,
+        frequency=frequency,
+        check_level=check_level,
+    )
+    cube = cmor_check_data(
+        cube,
+        cmor_table,
+        mip,
+        short_name,
+        frequency=frequency,
+        check_level=check_level,
+    )
     return cube
diff --git a/esmvalcore/cmor/fix.py b/esmvalcore/cmor/fix.py
index 1034435f92..d05af5ef64 100644
--- a/esmvalcore/cmor/fix.py
+++ b/esmvalcore/cmor/fix.py
@@ -7,14 +7,17 @@
 from __future__ import annotations
 
 import logging
+import warnings
 from collections import defaultdict
+from collections.abc import Sequence
 from pathlib import Path
 from typing import TYPE_CHECKING, Optional
 
-from iris.cube import CubeList
+from iris.cube import Cube, CubeList
 
-from ._fixes.fix import Fix
-from .check import CheckLevels, _get_cmor_checker
+from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor.check import CheckLevels, _get_cmor_checker
+from esmvalcore.exceptions import ESMValCoreDeprecationWarning
 
 if TYPE_CHECKING:
     from ..config import Session
@@ -31,11 +34,12 @@ def fix_file(
     output_dir: Path,
     add_unique_suffix: bool = False,
     session: Optional[Session] = None,
+    frequency: Optional[str] = None,
     **extra_facets,
 ) -> str | Path:
     """Fix files before ESMValTool can load them.
 
-    This fixes are only for issues that prevent iris from loading the cube or
+    These fixes are only for issues that prevent iris from loading the cube or
     that cannot be fixed after the cube is loaded.
 
     Original files are not overwritten.
@@ -58,6 +62,8 @@ def fix_file(
         Adds a unique suffix to `output_dir` for thread safety.
     session:
         Current session which includes configuration and directory information.
+    frequency:
+        Variable's data frequency, if available.
     **extra_facets:
         Extra facets are mainly used for data outside of the big projects like
         CMIP, CORDEX, obs4MIPs. For details, see :ref:`extra_facets`.
@@ -75,6 +81,7 @@ def fix_file(
         'project': project,
         'dataset': dataset,
         'mip': mip,
+        'frequency': frequency,
     })
 
     for fix in Fix.get_fixes(project=project,
@@ -82,61 +89,81 @@ def fix_file(
                              mip=mip,
                              short_name=short_name,
                              extra_facets=extra_facets,
-                             session=session):
+                             session=session,
+                             frequency=frequency):
         file = fix.fix_file(
             file, output_dir, add_unique_suffix=add_unique_suffix
         )
     return file
 
 
-def fix_metadata(cubes,
-                 short_name,
-                 project,
-                 dataset,
-                 mip,
-                 frequency=None,
-                 check_level=CheckLevels.DEFAULT,
-                 session: Optional[Session] = None,
-                 **extra_facets):
-    """Fix cube metadata if fixes are required and check it anyway.
+def fix_metadata(
+    cubes: Sequence[Cube],
+    short_name: str,
+    project: str,
+    dataset: str,
+    mip: str,
+    frequency: Optional[str] = None,
+    check_level: CheckLevels = CheckLevels.DEFAULT,
+    session: Optional[Session] = None,
+    **extra_facets,
+) -> CubeList:
+    """Fix cube metadata if fixes are required.
 
-    This method collects all the relevant fixes for a given variable, applies
-    them and checks the resulting cube (or the original if no fixes were
-    needed) metadata to ensure that it complies with the standards of its
-    project CMOR tables.
+    This method collects all the relevant fixes (including generic ones) for a
+    given variable and applies them.
 
     Parameters
     ----------
-    cubes: iris.cube.CubeList
+    cubes:
         Cubes to fix.
-    short_name: str
+    short_name:
         Variable's short name.
-    project: str
+    project:
         Project of the dataset.
-    dataset: str
+    dataset:
         Name of the dataset.
-    mip: str
+    mip:
         Variable's MIP.
-    frequency: str, optional
+    frequency:
         Variable's data frequency, if available.
-    check_level: CheckLevels
-        Level of strictness of the checks. Set to default.
-    session: Session, optional
+    check_level:
+        Level of strictness of the checks.
+
+        .. deprecated:: 2.10.0
+            This option has been deprecated in ESMValCore version 2.10.0 and is
+            scheduled for removal in version 2.12.0. Please use the functions
+            :func:`~esmvalcore.preprocessor.cmor_check_metadata`,
+            :func:`~esmvalcore.preprocessor.cmor_check_data`, or
+            :meth:`~esmvalcore.cmor.check.cmor_check` instead. This function
+            will no longer perform CMOR checks. Fixes and CMOR checks have been
+            clearly separated in ESMValCore version 2.10.0.
+    session:
         Current session which includes configuration and directory information.
-    **extra_facets: dict, optional
+    **extra_facets:
         Extra facets are mainly used for data outside of the big projects like
         CMIP, CORDEX, obs4MIPs. For details, see :ref:`extra_facets`.
 
     Returns
     -------
-    iris.cube.Cube:
-        Fixed and checked cube.
+    iris.cube.CubeList
+        Fixed cubes.
 
-    Raises
-    ------
-    CMORCheckError
-        If the checker detects errors in the metadata that it can not fix.
     """
+    # Deprecate CMOR checks (remove in v2.12)
+    if check_level != CheckLevels.DEFAULT:
+        msg = (
+            "The option `check_level` has been deprecated in ESMValCore "
+            "version 2.10.0 and is scheduled for removal in version 2.12.0. "
+            "Please use the functions "
+            "esmvalcore.preprocessor.cmor_check_metadata, "
+            "esmvalcore.preprocessor.cmor_check_data, or "
+            "esmvalcore.cmor.check.cmor_check instead. This function will no "
+            "longer perform CMOR checks. Fixes and CMOR checks have been "
+            "clearly separated in ESMValCore version 2.10.0."
+        )
+        warnings.warn(msg, ESMValCoreDeprecationWarning)
+
     # Update extra_facets with variable information given as regular arguments
     # to this function
     extra_facets.update({
@@ -152,8 +179,12 @@ def fix_metadata(cubes,
                           mip=mip,
                           short_name=short_name,
                           extra_facets=extra_facets,
-                          session=session)
-    fixed_cubes = []
+                          session=session,
+                          frequency=frequency)
+    fixed_cubes = CubeList()
+
+    # Group cubes by input file and apply all fixes to each group element
+    # (i.e., each file) individually
     by_file = defaultdict(list)
     for cube in cubes:
         by_file[cube.attributes.get('source_file', '')].append(cube)
@@ -163,94 +194,97 @@ def fix_metadata(cubes,
         for fix in fixes:
             cube_list = fix.fix_metadata(cube_list)
 
-        cube = _get_single_cube(cube_list, short_name, project, dataset)
-        checker = _get_cmor_checker(frequency=frequency,
-                                    table=project,
-                                    mip=mip,
-                                    short_name=short_name,
-                                    check_level=check_level,
-                                    fail_on_error=False,
-                                    automatic_fixes=True)
+        # The final fix is always GenericFix, whose fix_metadata method always
+        # returns a single cube
+        cube = cube_list[0]
+
+        # Perform CMOR checks
+        # TODO: remove in v2.12
+        checker = _get_cmor_checker(
+            project,
+            mip,
+            short_name,
+            frequency,
+            fail_on_error=False,
+            check_level=check_level,
+        )
         cube = checker(cube).check_metadata()
+
         cube.attributes.pop('source_file', None)
         fixed_cubes.append(cube)
-    return fixed_cubes
 
-
-def _get_single_cube(cube_list, short_name, project, dataset):
-    if len(cube_list) == 1:
-        return cube_list[0]
-    cube = None
-    for raw_cube in cube_list:
-        if raw_cube.var_name == short_name:
-            cube = raw_cube
-            break
-    if not cube:
-        raise ValueError(
-            f'More than one cube found for variable {short_name} in '
-            f'{project}:{dataset} but none of their var_names match the '
-            f'expected.\nFull list of cubes encountered: {cube_list}'
-        )
-    logger.warning(
-        'Found variable %s in %s:%s, but there were other present in '
-        'the file. Those extra variables are usually metadata '
-        '(cell area, latitude descriptions) that was not saved '
-        'according to CF-conventions. It is possible that errors appear '
-        'further on because of this. \nFull list of cubes encountered: %s',
-        short_name, project, dataset, cube_list)
-    return cube
+    return fixed_cubes
 
 
-def fix_data(cube,
-             short_name,
-             project,
-             dataset,
-             mip,
-             frequency=None,
-             check_level=CheckLevels.DEFAULT,
-             session: Optional[Session] = None,
-             **extra_facets):
-    """Fix cube data if fixes add present and check it anyway.
+def fix_data(
+    cube: Cube,
+    short_name: str,
+    project: str,
+    dataset: str,
+    mip: str,
+    frequency: Optional[str] = None,
+    check_level: CheckLevels = CheckLevels.DEFAULT,
+    session: Optional[Session] = None,
+    **extra_facets,
+) -> Cube:
+    """Fix cube data if fixes are required.
 
     This method assumes that metadata is already fixed and checked.
 
-    This method collects all the relevant fixes for a given variable, applies
-    them and checks resulting cube (or the original if no fixes were
-    needed) metadata to ensure that it complies with the standards of its
-    project CMOR tables.
+    This method collects all the relevant fixes (including generic ones) for a
+    given variable and applies them.
 
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Cube to fix.
-    short_name: str
+    short_name:
         Variable's short name.
-    project: str
+    project:
         Project of the dataset.
-    dataset: str
+    dataset:
         Name of the dataset.
-    mip: str
+    mip:
         Variable's MIP.
-    frequency: str, optional
+    frequency:
         Variable's data frequency, if available.
-    check_level: CheckLevels
-        Level of strictness of the checks. Set to default.
-    session: Session, optional
+    check_level:
+        Level of strictness of the checks.
+
+        .. deprecated:: 2.10.0
+            This option has been deprecated in ESMValCore version 2.10.0 and is
+            scheduled for removal in version 2.12.0. Please use the functions
+            :func:`~esmvalcore.preprocessor.cmor_check_metadata`,
+            :func:`~esmvalcore.preprocessor.cmor_check_data`, or
+            :meth:`~esmvalcore.cmor.check.cmor_check` instead. This function
+            will no longer perform CMOR checks. Fixes and CMOR checks have been
+            clearly separated in ESMValCore version 2.10.0.
+    session:
         Current session which includes configuration and directory information.
-    **extra_facets: dict, optional
+    **extra_facets:
         Extra facets are mainly used for data outside of the big projects like
         CMIP, CORDEX, obs4MIPs. For details, see :ref:`extra_facets`.
 
     Returns
     -------
-    iris.cube.Cube:
-        Fixed and checked cube.
+    iris.cube.Cube
+        Fixed cube.
 
-    Raises
-    ------
-    CMORCheckError
-        If the checker detects errors in the data that it can not fix.
     """
+    # Deprecate CMOR checks (remove in v2.12)
+    if check_level != CheckLevels.DEFAULT:
+        msg = (
+            "The option `check_level` has been deprecated in ESMValCore "
+            "version 2.10.0 and is scheduled for removal in version 2.12.0. "
+            "Please use the functions "
+            "esmvalcore.preprocessor.cmor_check_metadata, "
+            "esmvalcore.preprocessor.cmor_check_data, or "
+            "esmvalcore.cmor.check.cmor_check instead. This function will no "
+            "longer perform CMOR checks. Fixes and CMOR checks have been "
+            "clearly separated in ESMValCore version 2.10.0."
+        )
+        warnings.warn(msg, ESMValCoreDeprecationWarning)
+
     # Update extra_facets with variable information given as regular arguments
     # to this function
     extra_facets.update({
@@ -266,14 +300,20 @@ def fix_data(cube,
                              mip=mip,
                              short_name=short_name,
                              extra_facets=extra_facets,
-                             session=session):
+                             session=session,
+                             frequency=frequency):
         cube = fix.fix_data(cube)
-    checker = _get_cmor_checker(frequency=frequency,
-                                table=project,
-                                mip=mip,
-                                short_name=short_name,
-                                fail_on_error=False,
-                                automatic_fixes=True,
-                                check_level=check_level)
+
+    # Perform CMOR checks
+    # TODO: remove in v2.12
+    checker = _get_cmor_checker(
+        project,
+        mip,
+        short_name,
+        frequency,
+        fail_on_error=False,
+        check_level=check_level,
+    )
     cube = checker(cube).check_data()
+
     return cube
diff --git a/esmvalcore/cmor/fixes.py b/esmvalcore/cmor/fixes.py
index e5931b0f0f..534aa3bd94 100644
--- a/esmvalcore/cmor/fixes.py
+++ b/esmvalcore/cmor/fixes.py
@@ -1,8 +1,15 @@
 """Functions for fixing specific issues with datasets."""
 
-from ._fixes.shared import add_altitude_from_plev, add_plev_from_altitude
+from ._fixes.shared import (
+    add_altitude_from_plev,
+    add_plev_from_altitude,
+    get_next_month,
+    get_time_bounds,
+)
 
 __all__ = [
     'add_altitude_from_plev',
     'add_plev_from_altitude',
+    'get_time_bounds',
+    'get_next_month',
 ]
diff --git a/esmvalcore/cmor/table.py b/esmvalcore/cmor/table.py
index 680e7289a1..ebce5431ae 100644
--- a/esmvalcore/cmor/table.py
+++ b/esmvalcore/cmor/table.py
@@ -11,8 +11,6 @@
 import json
 import logging
 import os
-import tempfile
-import warnings
 from collections import Counter
 from functools import lru_cache, total_ordering
 from pathlib import Path
@@ -20,7 +18,7 @@
 
 import yaml
 
-from esmvalcore.exceptions import ESMValCoreDeprecationWarning, RecipeError
+from esmvalcore.exceptions import RecipeError
 
 logger = logging.getLogger(__name__)
 
@@ -72,18 +70,50 @@ def _get_mips(project: str, short_name: str) -> list[str]:
     return mips
 
 
-def get_var_info(project, mip, short_name):
+def get_var_info(
+    project: str,
+    mip: str,
+    short_name: str,
+) -> VariableInfo | None:
     """Get variable information.
 
+    Note
+    ----
+    If `project=CORDEX` and the `mip` ends with 'hr', it is cropped to 'h'
+    since CORDEX X-hourly tables define the `mip` as ending in 'h' instead of
+    'hr'.
+
     Parameters
     ----------
-    project : str
+    project:
         Dataset's project.
-    mip : str
-        Variable's cmor table.
-    short_name : str
+    mip:
+        Variable's CMOR table, i.e., MIP.
+    short_name:
         Variable's short name.
+
+    Returns
+    -------
+    VariableInfo | None
+        `VariableInfo` object for the requested variable if found, ``None``
+        otherwise.
+
+    Raises
+    ------
+    KeyError
+        No CMOR tables available for `project`.
+
     """
+    if project not in CMOR_TABLES:
+        raise KeyError(
+            f"No CMOR tables available for project '{project}'. The following "
+            f"tables are available: {', '.join(CMOR_TABLES)}."
+        )
+
+    # CORDEX X-hourly tables define the mip as ending in 'h' instead of 'hr'
+    if project == 'CORDEX' and mip.endswith('hr'):
+        mip = mip.replace('hr', 'h')
+
     return CMOR_TABLES[project].get_variable(mip, short_name)
 
 
@@ -95,34 +125,18 @@ def read_cmor_tables(cfg_developer: Optional[Path] = None) -> None:
     cfg_developer:
         Path to config-developer.yml file.
 
-        Prior to v2.8.0 `cfg_developer` was an :obj:`dict` with the contents
-        of config-developer.yml. This is deprecated and support will be
-        removed in v2.10.0.
+    Raises
+    ------
+    TypeError
+        If `cfg_developer` is not a Path-like object
     """
-    if isinstance(cfg_developer, dict):
-        warnings.warn(
-            "Using the `read_cmor_tables` file with a dictionary as argument "
-            "has been deprecated in ESMValCore version 2.8.0 and is "
-            "scheduled for removal in version 2.10.0. "
-            "Please use the path to the config-developer.yml file instead.",
-            ESMValCoreDeprecationWarning,
-        )
-        with tempfile.NamedTemporaryFile(
-            mode='w',
-            encoding='utf-8',
-            delete=False,
-        ) as file:
-            yaml.safe_dump(cfg_developer, file)
-            cfg_file = Path(file.name)
-    else:
-        cfg_file = cfg_developer
-    if cfg_file is None:
-        cfg_file = Path(__file__).parents[1] / 'config-developer.yml'
-    mtime = cfg_file.stat().st_mtime
-    cmor_tables = _read_cmor_tables(cfg_file, mtime)
-    if isinstance(cfg_developer, dict):
-        # clean up the temporary file
-        cfg_file.unlink()
+    if cfg_developer is None:
+        cfg_developer = Path(__file__).parents[1] / 'config-developer.yml'
+    elif not isinstance(cfg_developer, Path):
+        raise TypeError("cfg_developer is not a Path-like object, got ",
+                        cfg_developer)
+    mtime = cfg_developer.stat().st_mtime
+    cmor_tables = _read_cmor_tables(cfg_developer, mtime)
     CMOR_TABLES.clear()
     CMOR_TABLES.update(cmor_tables)
 
@@ -144,7 +158,7 @@ def _read_cmor_tables(cfg_file: Path, mtime: float) -> dict[str, CMORTable]:
         cfg_developer = yaml.safe_load(file)
     cwd = os.path.dirname(os.path.realpath(__file__))
     var_alt_names_file = os.path.join(cwd, 'variable_alt_names.yml')
-    with open(var_alt_names_file, 'r') as yfile:
+    with open(var_alt_names_file, 'r', encoding='utf-8') as yfile:
         alt_names = yaml.safe_load(yfile)
 
     cmor_tables: dict[str, CMORTable] = {}
@@ -219,6 +233,7 @@ class InfoBase():
         If False, will look for a variable in other tables if it can not be
         found in the requested one
     """
+
     def __init__(self, default, alt_names, strict):
         if alt_names is None:
             alt_names = ""
@@ -243,28 +258,35 @@ def get_table(self, table):
         """
         return self.tables.get(table)
 
-    def get_variable(self, table_name, short_name, derived=False):
-        """Search and return the variable info.
+    def get_variable(
+        self,
+        table_name: str,
+        short_name: str,
+        derived: Optional[bool] = False,
+    ) -> VariableInfo | None:
+        """Search and return the variable information.
 
         Parameters
         ----------
-        table_name: str
-            Table name
-        short_name: str
-            Variable's short name
-        derived: bool, optional
-            Variable is derived. Info retrieval for derived variables always
-            look on the default tables if variable is not find in the
-            requested table
+        table_name:
+            Table name, i.e., the variable's MIP.
+        short_name:
+            Variable's short name.
+        derived:
+            Variable is derived. Information retrieval for derived variables
+            always looks in the default tables (usually, the custom tables) if
+            variable is not found in the requested table.
 
         Returns
         -------
-        VariableInfo
-            Return the VariableInfo object for the requested variable if
-            found, returns None if not
+        VariableInfo | None
+            `VariableInfo` object for the requested variable if found, ``None``
+            otherwise.
+
         """
         alt_names_list = self._get_alt_names_list(short_name)
 
+        # First, look in requested table
         table = self.get_table(table_name)
         if table:
             for alt_names in alt_names_list:
@@ -273,10 +295,19 @@ def get_variable(self, table_name, short_name, derived=False):
                 except KeyError:
                     pass
 
+        # If that didn't work, look in all tables (i.e., other MIPs) if
+        # cmor_strict=False
         var_info = self._look_in_all_tables(alt_names_list)
+
+        # If that didn' work either, look in default table if cmor_strict=False
+        # or derived=True
         if not var_info:
             var_info = self._look_in_default(derived, alt_names_list,
                                              table_name)
+
+        # If necessary, adapt frequency of variable (set it to the one from the
+        # requested MIP). E.g., if the user asked for table `Amon`, but the
+        # variable has been found in `day`, use frequency `mon`.
         if var_info:
             var_info = var_info.copy()
             var_info = self._update_frequency_from_mip(table_name, var_info)
@@ -284,6 +315,7 @@ def get_variable(self, table_name, short_name, derived=False):
         return var_info
 
     def _look_in_default(self, derived, alt_names_list, table_name):
+        """Look for variable in default table."""
         var_info = None
         if (not self.strict or derived):
             for alt_names in alt_names_list:
@@ -293,6 +325,7 @@ def _look_in_default(self, derived, alt_names_list, table_name):
         return var_info
 
     def _look_in_all_tables(self, alt_names_list):
+        """Look for variable in all tables."""
         var_info = None
         if not self.strict:
             for alt_names in alt_names_list:
@@ -302,6 +335,7 @@ def _look_in_all_tables(self, alt_names_list):
         return var_info
 
     def _get_alt_names_list(self, short_name):
+        """Get list of alternative variable names."""
         alt_names_list = [short_name]
         for alt_names in self.alt_names:
             if short_name in alt_names:
@@ -312,12 +346,14 @@ def _get_alt_names_list(self, short_name):
         return alt_names_list
 
     def _update_frequency_from_mip(self, table_name, var_info):
+        """Update frequency information of var_info from table."""
         mip_info = self.get_table(table_name)
         if mip_info:
             var_info.frequency = mip_info.frequency
         return var_info
 
     def _look_all_tables(self, alt_names):
+        """Look for variable in all tables."""
         for table_vars in sorted(self.tables.values()):
             if alt_names in table_vars:
                 return table_vars[alt_names]
@@ -341,6 +377,7 @@ class CMIP6Info(InfoBase):
         If False, will look for a variable in other tables if it can not be
         found in the requested one
     """
+
     def __init__(self,
                  cmor_tables_path,
                  default=None,
@@ -386,7 +423,7 @@ def _get_cmor_path(cmor_tables_path):
             'CMOR tables not found in {}'.format(cmor_tables_path))
 
     def _load_table(self, json_file):
-        with open(json_file) as inf:
+        with open(json_file, encoding='utf-8') as inf:
             raw_data = json.loads(inf.read())
             if not self._is_table(raw_data):
                 return
@@ -436,7 +473,7 @@ def _load_coordinates(self):
         self.coords = {}
         for json_file in glob.glob(
                 os.path.join(self._cmor_folder, '*coordinate*.json')):
-            with open(json_file) as inf:
+            with open(json_file, encoding='utf-8') as inf:
                 table_data = json.loads(inf.read())
                 for coord_name in table_data['axis_entry'].keys():
                     coord = CoordinateInfo(coord_name)
@@ -448,7 +485,7 @@ def _load_controlled_vocabulary(self):
         self.institutes = {}
         for json_file in glob.glob(os.path.join(self._cmor_folder,
                                                 '*_CV.json')):
-            with open(json_file) as inf:
+            with open(json_file, encoding='utf-8') as inf:
                 table_data = json.loads(inf.read())
                 try:
                     exps = table_data['CV']['experiment_id']
@@ -497,6 +534,7 @@ def _is_table(table_data):
 @total_ordering
 class TableInfo(dict):
     """Container class for storing a CMOR table."""
+
     def __init__(self, *args, **kwargs):
         """Create a new TableInfo object for storing VariableInfo objects."""
         super(TableInfo, self).__init__(*args, **kwargs)
@@ -522,6 +560,7 @@ class JsonInfo(object):
 
     Provides common utility methods to read json variables
     """
+
     def __init__(self):
         self._json_data = {}
 
@@ -562,6 +601,7 @@ def _read_json_list_variable(self, parameter):
 
 class VariableInfo(JsonInfo):
     """Class to read and store variable information."""
+
     def __init__(self, table_type, short_name):
         """Class to read and store variable information.
 
@@ -673,6 +713,7 @@ def has_coord_with_standard_name(self, standard_name: str) -> bool:
 
 class CoordinateInfo(JsonInfo):
     """Class to read and store coordinate information."""
+
     def __init__(self, name):
         """Class to read and store coordinate information.
 
@@ -760,6 +801,7 @@ class CMIP5Info(InfoBase):
         If False, will look for a variable in other tables if it can not be
         found in the requested one
     """
+
     def __init__(self,
                  cmor_tables_path,
                  default=None,
@@ -812,7 +854,7 @@ def _load_table(self, table_file, table_name=''):
         self._read_table_file(table_file, table)
 
     def _read_table_file(self, table_file, table=None):
-        with open(table_file) as self._current_table:
+        with open(table_file, 'r', encoding='utf-8') as self._current_table:
             self._read_line()
             while True:
                 key, value = self._last_line_read
@@ -918,6 +960,7 @@ class CMIP3Info(CMIP5Info):
         If False, will look for a variable in other tables if it can not be
         found in the requested one
     """
+
     def _read_table_file(self, table_file, table=None):
         for dim in ('zlevel', ):
             coord = CoordinateInfo(dim)
@@ -1022,7 +1065,7 @@ def get_variable(self, table, short_name, derived=False):
         return self.tables['custom'].get(short_name, None)
 
     def _read_table_file(self, table_file, table=None):
-        with open(table_file) as self._current_table:
+        with open(table_file, 'r', encoding='utf-8') as self._current_table:
             self._read_line()
             while True:
                 key, value = self._last_line_read
diff --git a/esmvalcore/config-developer.yml b/esmvalcore/config-developer.yml
index 69dfe9658d..745626339b 100644
--- a/esmvalcore/config-developer.yml
+++ b/esmvalcore/config-developer.yml
@@ -145,11 +145,13 @@ EMAC:
 CORDEX:
   input_dir:
     default: '/'
-    spec: '{domain}/{institute}/{driver}/{exp}/{ensemble}/{dataset}/{rcm_version}/{mip}/{short_name}'
-    BADC: '{domain}/{institute}/{driver}/{exp}/{ensemble}/{dataset}/{rcm_version}/{mip}/{short_name}/{version}'
+    spec: '{domain}/{institute}/{driver}/{exp}/{ensemble}/{institute}-{dataset}/{rcm_version}/{mip}/{short_name}'
+    BADC: '{domain}/{institute}/{driver}/{exp}/{ensemble}/{institute}-{dataset}/{rcm_version}/{mip}/{short_name}/{version}'
+    DKRZ: '{domain}/{institute}/{driver}/{exp}/{ensemble}/{institute}-{dataset}/{rcm_version}/{mip}/{short_name}/{version}'
     ESGF: '{project.lower}/output/{domain}/{institute}/{driver}/{exp}/{ensemble}/{dataset}/{rcm_version}/{frequency}/{short_name}/{version}'
-  input_file: '{short_name}_{domain}_{driver}_{exp}_{ensemble}_{dataset}_{rcm_version}_{mip}*.nc'
-  output_file: '{project}_{dataset}_{rcm_version}_{driver}_{domain}_{mip}_{exp}_{ensemble}_{short_name}'
+    SYNDA: '{domain}/{institute}/{driver}/{exp}/{ensemble}/{dataset}/{rcm_version}/{frequency}/{short_name}/{version}'
+  input_file: '{short_name}_{domain}_{driver}_{exp}_{ensemble}_{institute}-{dataset}_{rcm_version}_{mip}*.nc'
+  output_file: '{project}_{institute}_{dataset}_{rcm_version}_{driver}_{domain}_{mip}_{exp}_{ensemble}_{short_name}'
   cmor_type: 'CMIP5'
   cmor_path: 'cordex'
 
diff --git a/esmvalcore/config/_config.py b/esmvalcore/config/_config.py
index 85f8f1f1c2..5dcad80e05 100644
--- a/esmvalcore/config/_config.py
+++ b/esmvalcore/config/_config.py
@@ -43,7 +43,7 @@ def _load_extra_facets(project, extra_facets_dir):
         config_file_paths = config_path.glob(f"{project.lower()}-*.yml")
         for config_file_path in sorted(config_file_paths):
             logger.debug("Loading extra facets from %s", config_file_path)
-            with config_file_path.open() as config_file:
+            with config_file_path.open(encoding='utf-8') as config_file:
                 config_piece = yaml.safe_load(config_file)
             if config_piece:
                 _deep_update(config, config_piece)
diff --git a/esmvalcore/config/_config_object.py b/esmvalcore/config/_config_object.py
index a0fd23e90b..0b9c596177 100644
--- a/esmvalcore/config/_config_object.py
+++ b/esmvalcore/config/_config_object.py
@@ -225,7 +225,7 @@ def _read_config_file(config_file):
     if not config_file.exists():
         raise IOError(f'Config file `{config_file}` does not exist.')
 
-    with open(config_file, 'r') as file:
+    with open(config_file, 'r', encoding='utf-8') as file:
         cfg = yaml.safe_load(file)
 
     return cfg
diff --git a/esmvalcore/config/_config_validators.py b/esmvalcore/config/_config_validators.py
index 736a6ba689..867370ae77 100644
--- a/esmvalcore/config/_config_validators.py
+++ b/esmvalcore/config/_config_validators.py
@@ -7,7 +7,7 @@
 from collections.abc import Callable, Iterable
 from functools import lru_cache, partial
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import Any, Optional, Union
 
 from packaging import version
 
@@ -23,9 +23,6 @@
     InvalidConfigParameter,
 )
 
-if TYPE_CHECKING:
-    from ._validated_config import ValidatedConfig
-
 logger = logging.getLogger(__name__)
 
 
@@ -288,7 +285,6 @@ def validate_diagnostics(
     'extra_facets_dir': validate_pathtuple,
     'log_level': validate_string,
     'max_parallel_tasks': validate_int_or_none,
-    'offline': validate_bool,
     'output_dir': validate_path,
     'output_file_type': validate_string,
     'profile_diagnostic': validate_bool,
@@ -297,7 +293,6 @@ def validate_diagnostics(
     'run_diagnostic': validate_bool,
     'save_intermediary_cubes': validate_bool,
     'search_esgf': validate_search_esgf,
-    'use_legacy_supplementaries': validate_bool_or_none,
 
     # From CLI
     'check_level': validate_check_level,
@@ -340,70 +335,12 @@ def _handle_deprecation(
     warnings.warn(deprecation_msg, ESMValCoreDeprecationWarning)
 
 
-def deprecate_offline(
-    validated_config: ValidatedConfig,
-    value: Any,
-    validated_value: Any,
-) -> None:
-    """Deprecate ``offline`` option.
-
-    Parameters
-    ----------
-    validated_config: ValidatedConfig
-        ``ValidatedConfig`` instance which will be modified in place.
-    value: Any
-        Raw input value for ``offline`` option.
-    validated_value: Any
-        Validated value for ``offline`` option.
-
-    """
-    option = 'offline'
-    deprecated_version = '2.8.0'
-    remove_version = '2.10.0'
-    more_info = (
-        " Please use the options `search_esgf=never` (for `offline=True`) or "
-        "`search_esgf=when_missing` (for `offline=False`) instead. These are "
-        "exact replacements."
-    )
-    _handle_deprecation(option, deprecated_version, remove_version, more_info)
-    if validated_value:
-        validated_config['search_esgf'] = 'never'
-    else:
-        validated_config['search_esgf'] = 'when_missing'
-
-
-def deprecate_use_legacy_supplementaries(
-    validated_config: ValidatedConfig,
-    value: Any,
-    validated_value: Any,
-) -> None:
-    """Deprecate ``use_legacy_supplementaries`` option.
-
-    Parameters
-    ----------
-    validated_config: ValidatedConfig
-        ``ValidatedConfig`` instance which will be modified in place.
-    value: Any
-        Raw input value for ``use_legacy_supplementaries`` option.
-    validated_value: Any
-        Validated value for ``use_legacy_supplementaries`` option.
-
-    """
-    option = 'use_legacy_supplementaries'
-    deprecated_version = '2.8.0'
-    remove_version = '2.10.0'
-    more_info = ''
-    _handle_deprecation(option, deprecated_version, remove_version, more_info)
-
-
-_deprecators: dict[str, Callable] = {
-    'offline': deprecate_offline,
-    'use_legacy_supplementaries': deprecate_use_legacy_supplementaries,
-}
+# Example usage: see removed files in
+# https://github.com/ESMValGroup/ESMValCore/pull/2213
+_deprecators: dict[str, Callable] = {}
 
 
 # Default values for deprecated options
-_deprecated_options_defaults: dict[str, Any] = {
-    'offline': True,
-    'use_legacy_supplementaries': None,
-}
+# Example usage: see removed files in
+# https://github.com/ESMValGroup/ESMValCore/pull/2213
+_deprecated_options_defaults: dict[str, Any] = {}
diff --git a/esmvalcore/config/_diagnostics.py b/esmvalcore/config/_diagnostics.py
index e54dba87a6..c8f0869c9e 100644
--- a/esmvalcore/config/_diagnostics.py
+++ b/esmvalcore/config/_diagnostics.py
@@ -83,7 +83,7 @@ def from_file(cls, filename: str):
         """Load the reference tags used for provenance recording."""
         if os.path.exists(filename):
             logger.debug("Loading tags from %s", filename)
-            with open(filename) as file:
+            with open(filename, 'r', encoding='utf-8') as file:
                 tags = cls(yaml.safe_load(file))
                 tags.source_file = filename
                 return tags
diff --git a/esmvalcore/config/_esgf_pyclient.py b/esmvalcore/config/_esgf_pyclient.py
index 7e80cc4892..1d473068e6 100644
--- a/esmvalcore/config/_esgf_pyclient.py
+++ b/esmvalcore/config/_esgf_pyclient.py
@@ -110,7 +110,7 @@ def read_config_file():
         if mode & stat.S_IRWXG or mode & stat.S_IRWXO:
             logger.warning("Correcting unsafe permissions on %s", CONFIG_FILE)
             os.chmod(CONFIG_FILE, stat.S_IRUSR | stat.S_IWUSR)
-        with CONFIG_FILE.open() as file:
+        with CONFIG_FILE.open(encoding='utf-8') as file:
             cfg = yaml.safe_load(file)
     else:
         logger.info(
diff --git a/esmvalcore/config/_logging.py b/esmvalcore/config/_logging.py
index 674fad953d..3763c3b688 100644
--- a/esmvalcore/config/_logging.py
+++ b/esmvalcore/config/_logging.py
@@ -87,7 +87,7 @@ def configure_logging(
 
     cfg_file = Path(cfg_file).absolute()
 
-    with open(cfg_file) as file_handler:
+    with open(cfg_file, 'r', encoding='utf-8') as file_handler:
         cfg = yaml.safe_load(file_handler)
 
     if output_dir is None:
diff --git a/esmvalcore/dataset.py b/esmvalcore/dataset.py
index 35c8588404..d4bd665aa6 100644
--- a/esmvalcore/dataset.py
+++ b/esmvalcore/dataset.py
@@ -677,19 +677,15 @@ def load(self) -> Cube:
         iris.cube.Cube
             An :mod:`iris` cube with the data corresponding the the dataset.
         """
-        return self._load_with_callback(callback='default')
-
-    def _load_with_callback(self, callback):
-        # TODO: Remove the callback argument for v2.10.0.
         input_files = list(self.files)
         for supplementary_dataset in self.supplementaries:
             input_files.extend(supplementary_dataset.files)
         esgf.download(input_files, self.session['download_dir'])
 
-        cube = self._load(callback)
+        cube = self._load()
         supplementary_cubes = []
         for supplementary_dataset in self.supplementaries:
-            supplementary_cube = supplementary_dataset._load(callback)
+            supplementary_cube = supplementary_dataset._load()
             supplementary_cubes.append(supplementary_cube)
 
         output_file = _get_output_file(self.facets, self.session.preproc_dir)
@@ -704,7 +700,7 @@ def _load_with_callback(self, callback):
 
         return cubes[0]
 
-    def _load(self, callback) -> Cube:
+    def _load(self) -> Cube:
         """Load self.files into an iris cube and return it."""
         if not self.files:
             lines = [
@@ -731,7 +727,6 @@ def _load(self, callback) -> Cube:
             **self.facets,
         }
         settings['load'] = {
-            'callback': callback,
             'ignore_warnings': get_ignored_warnings(
                 self.facets['project'], 'load'
             ),
@@ -741,7 +736,9 @@ def _load(self, callback) -> Cube:
             'session': self.session,
             **self.facets,
         }
-        settings['concatenate'] = {}
+        settings['concatenate'] = {
+            'check_level': self.session['check_level']
+        }
         settings['cmor_check_metadata'] = {
             'check_level': self.session['check_level'],
             'cmor_table': self.facets['project'],
@@ -862,7 +859,7 @@ def _update_timerange(self):
             dataset.facets.pop('timerange')
             dataset.supplementaries = []
             check.data_availability(dataset)
-            intervals = [_get_start_end_date(f.name) for f in dataset.files]
+            intervals = [_get_start_end_date(f) for f in dataset.files]
 
             min_date = min(interval[0] for interval in intervals)
             max_date = max(interval[1] for interval in intervals)
diff --git a/esmvalcore/esgf/_download.py b/esmvalcore/esgf/_download.py
index 7efe389293..551aacceed 100644
--- a/esmvalcore/esgf/_download.py
+++ b/esmvalcore/esgf/_download.py
@@ -52,7 +52,7 @@ def compute_speed(size, duration):
 def load_speeds():
     """Load average download speeds from HOSTS_FILE."""
     try:
-        content = HOSTS_FILE.read_text()
+        content = HOSTS_FILE.read_text(encoding='utf-8')
     except FileNotFoundError:
         content = '{}'
     speeds = yaml.safe_load(content)
@@ -94,7 +94,7 @@ def atomic_write(filename):
     filename.parent.mkdir(parents=True, exist_ok=True)
     with NamedTemporaryFile(prefix=f"{filename}.") as file:
         tmp_file = file.name
-    with open(tmp_file, 'w') as file:
+    with open(tmp_file, 'w', encoding='utf-8') as file:
         yield file
     shutil.move(tmp_file, filename)
 
diff --git a/esmvalcore/esgf/_search.py b/esmvalcore/esgf/_search.py
index 87d4cdf095..62882a5345 100644
--- a/esmvalcore/esgf/_search.py
+++ b/esmvalcore/esgf/_search.py
@@ -168,7 +168,7 @@ def select_by_time(files, timerange):
     for file in files:
         start_date, end_date = _parse_period(timerange)
         try:
-            start, end = _get_start_end_date(file.name)
+            start, end = _get_start_end_date(file)
         except ValueError:
             # If start and end year cannot be read from the filename
             # just select everything.
diff --git a/esmvalcore/experimental/recipe.py b/esmvalcore/experimental/recipe.py
index 5839d72df8..18e520324b 100644
--- a/esmvalcore/experimental/recipe.py
+++ b/esmvalcore/experimental/recipe.py
@@ -70,7 +70,8 @@ def name(self):
     def data(self) -> dict:
         """Return dictionary representation of the recipe."""
         if self._data is None:
-            self._data = yaml.safe_load(open(self.path, 'r'))
+            with open(self.path, 'r', encoding='utf-8') as yaml_file:
+                self._data = yaml.safe_load(yaml_file)
         return self._data
 
     def _load(self, session: Session) -> RecipeEngine:
diff --git a/esmvalcore/experimental/recipe_info.py b/esmvalcore/experimental/recipe_info.py
index 0e00ea3667..cb0fd32f95 100644
--- a/esmvalcore/experimental/recipe_info.py
+++ b/esmvalcore/experimental/recipe_info.py
@@ -72,7 +72,7 @@ def _repr_html_(self) -> str:
     @classmethod
     def from_yaml(cls, path: str):
         """Return instance of 'RecipeInfo' from a recipe in yaml format."""
-        data = yaml.safe_load(open(path, 'r'))
+        data = yaml.safe_load(Path(path).read_text(encoding='utf-8'))
         return cls(data, filename=path)
 
     @property
diff --git a/esmvalcore/experimental/recipe_output.py b/esmvalcore/experimental/recipe_output.py
index bcb38c019a..9765d15c77 100644
--- a/esmvalcore/experimental/recipe_output.py
+++ b/esmvalcore/experimental/recipe_output.py
@@ -2,7 +2,7 @@
 import base64
 import logging
 import os.path
-from collections.abc import Mapping
+from collections.abc import Mapping, Sequence
 from pathlib import Path
 from typing import Optional, Tuple, Type
 
@@ -123,6 +123,13 @@ class RecipeOutput(Mapping):
         The session used to run the recipe.
     """
 
+    FILTER_ATTRS: list = [
+        "realms",
+        "plot_type",  # Used by several diagnostics
+        "plot_types",
+        "long_names",
+    ]
+
     def __init__(self, task_output: dict, session=None, info=None):
         self._raw_task_output = task_output
         self._task_output = {}
@@ -141,6 +148,7 @@ def __init__(self, task_output: dict, session=None, info=None):
             diagnostics[name].append(task)
 
         # Create diagnostic output
+        filters: dict = {}
         for name, tasks in diagnostics.items():
             diagnostic_info = info.data['diagnostics'][name]
             self.diagnostics[name] = DiagnosticOutput(
@@ -150,6 +158,36 @@ def __init__(self, task_output: dict, session=None, info=None):
                 description=diagnostic_info.get('description'),
             )
 
+            # Add data to filters
+            for task in tasks:
+                for file in task.files:
+                    RecipeOutput._add_to_filters(filters, file.attributes)
+
+        # Sort at the end because sets are unordered
+        self.filters = RecipeOutput._sort_filters(filters)
+
+    @classmethod
+    def _add_to_filters(cls, filters, attributes):
+        """Add valid values to the HTML output filters."""
+        for attr in RecipeOutput.FILTER_ATTRS:
+            if attr not in attributes:
+                continue
+            values = attributes[attr]
+            # `set()` to avoid duplicates
+            attr_list = filters.get(attr, set())
+            if (isinstance(values, str) or not isinstance(values, Sequence)):
+                attr_list.add(values)
+            else:
+                attr_list.update(values)
+            filters[attr] = attr_list
+
+    @classmethod
+    def _sort_filters(cls, filters):
+        """Sort the HTML output filters."""
+        for _filter, _attrs in filters.items():
+            filters[_filter] = sorted(_attrs)
+        return filters
+
     def __repr__(self):
         """Return canonical string representation."""
         string = '\n'.join(repr(item) for item in self._task_output.values())
@@ -200,7 +238,7 @@ def write_html(self):
         template = get_template('recipe_output_page.j2')
         html_dump = self.render(template=template)
 
-        with open(filename, 'w') as file:
+        with open(filename, 'w', encoding='utf-8') as file:
             file.write(html_dump)
 
         logger.info("Wrote recipe output to:\nfile://%s", filename)
@@ -218,6 +256,7 @@ def render(self, template=None):
             diagnostics=self.diagnostics.values(),
             session=self.session,
             info=self.info,
+            filters=self.filters,
             relpath=os.path.relpath,
         )
 
@@ -225,11 +264,11 @@ def render(self, template=None):
 
     def read_main_log(self) -> str:
         """Read log file."""
-        return self.session.main_log.read_text()
+        return self.session.main_log.read_text(encoding='utf-8')
 
     def read_main_log_debug(self) -> str:
         """Read debug log file."""
-        return self.session.main_log_debug.read_text()
+        return self.session.main_log_debug.read_text(encoding='utf-8')
 
 
 class OutputFile():
diff --git a/esmvalcore/experimental/templates/RecipeOutput.j2 b/esmvalcore/experimental/templates/RecipeOutput.j2
index c502c39a33..cde84362f9 100644
--- a/esmvalcore/experimental/templates/RecipeOutput.j2
+++ b/esmvalcore/experimental/templates/RecipeOutput.j2
@@ -1,12 +1,72 @@
+
+<!-- Tab links -->
+<ul class="nav nav-tabs sticky-top bg-light" id="tabDiagnostics" role="tablist">
+  <li class="nav-item">
+    <!-- Filter -->
+    <div class="dropdown" style="position: static">
+      <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" data-bs-auto-close="outside">
+        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-filter" viewBox="0 0 16 16">
+          <path d="M6 10.5a.5.5 0 0 1 .5-.5h3a.5.5 0 0 1 0 1h-3a.5.5 0 0 1-.5-.5zm-2-3a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7a.5.5 0 0 1-.5-.5zm-2-3a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11a.5.5 0 0 1-.5-.5z"/>
+        </svg>
+        Filters
+      </button>
+      <div class="dropdown-menu w-100">
+        <div class="container div_filter">
+          <div class="row justify-content-center">
+            {% for filter_name, filter_values in filters.items() %}
+            {% set filter_loop = loop %}
+            <div class="col-xl-3 col-lg-4 col-sm-6 col-12 filter_category" id="filter_{{ filter_name|replace(' ', '_') }}">
+                <h4>{{ filter_name|replace('_', ' ')|title }}</h4>
+                {% for value in filter_values %}
+                <div class="form-check">
+                  <input class="form-check-input filter_cb" type="checkbox" value="" id="cb_{{ filter_loop.index }}_{{ loop.index }}" rel="f_{{ filter_name|replace(' ', '_') }}_{{ value|replace(' ', '_') }}">
+                  <label class="form-check-label" for="cb_{{ filter_loop.index }}_{{ loop.index }}">
+                    {{ value|replace('_', ' ')|title }}
+                  </label>
+                </div>
+                {% endfor %}
+            </div>
+            {% endfor %}
+          </div>
+          <div class="d-flex justify-content-center align-items-center gap-3">
+            <div class="d-inline-block">
+              <button class="btn btn-primary" id="b_deleteFilters" disabled>Delete Filters</button>
+            </div>
+            <div class="form-check form-switch d-inline-block">
+              <input class="form-check-input" type="checkbox" value="" id="cb_hideEmptyDiagnostics" rel="" checked>
+              <label class="form-check-label" for="cb_hideEmptyDiagnostics">
+                Hide empty diagnostics
+              </label>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </li>
+  <li class="nav-item" role="presentation">
+    <button class="nav-link active diagnostics-tab" id="tabAll" data-bs-toggle="tab" data-bs-target="#" type="button" role="tab" aria-controls="" aria-selected="true">All</button>
+  </li>
+  {% for diagnostic in diagnostics %}
+    <li class="nav-item" role="presentation">
+      <button class="nav-link diagnostics-tab" id="tab_{{ loop.index }}" data-bs-toggle="tab" data-bs-target="#tabPane_{{ loop.index }}" type="button" role="tab" aria-controls="tabPane_{{ loop.index }}" aria-selected="true">{{ diagnostic.title }}</button>
+    </li>
+  {% endfor %}
+</ul>
+
+<div class="tab-content" id="tabContentDiagnostics">
 {% for diagnostic in diagnostics %}
 
-  <h2>{{ diagnostic.title }}</h2>
-  <p>{{ diagnostic.description }}</p>
+  <div id="tabPane_{{ loop.index }}" class="tab-pane show active diagnostics-tab-pane" role="tabpanel" aria-labelledby="tab_{{ loop.index }}">
+    <h2>{{ diagnostic.title }}</h2>
+    <p>{{ diagnostic.description }}</p>
 
-  {% for task in diagnostic.task_output %}
+    {% set diagnostic_loop = loop %}
+    {% for task in diagnostic.task_output %}
 
-    {% include 'TaskOutput.j2' %}
+      {% include 'TaskOutput.j2' %}
 
-  {% endfor %}
+    {% endfor %}
+  </div>
 
 {% endfor %}
+</div>
diff --git a/esmvalcore/experimental/templates/TaskOutput.j2 b/esmvalcore/experimental/templates/TaskOutput.j2
index 48d259ea7c..43753418b2 100644
--- a/esmvalcore/experimental/templates/TaskOutput.j2
+++ b/esmvalcore/experimental/templates/TaskOutput.j2
@@ -2,11 +2,23 @@
 
 {% for file in task.image_files %}
 
-    <figure>
+<div class="div_figure d-inline-flex
+{% for filter_name in filters.keys() %}
+    {% if filter_name in file.attributes %}
+        {% set attribute = file.attributes[filter_name] %}
+        {% if attribute is string or not (attribute is iterable) %}
+            f_{{ filter_name|replace(' ', '_') }}_{{ attribute | replace(' ', '_') }}
+        {% else %}
+            {% for attr in attribute %} f_{{ filter_name|replace(' ', '_') }}_{{ attr | replace(' ', '_') }} {% endfor %}
+        {% endif %}
+    {% endif %}
+{% endfor %}
+">
+    <figure class="figure">
         <a href='{{ relpath(file.path, session.session_dir) }}'>
-        <img src='{{ relpath(file.path, session.session_dir) }}' alt='{{ file.caption }}'/>
+        <img class="figure-img img-fluid" src='{{ relpath(file.path, session.session_dir) }}' alt='{{ file.caption }}'/>
         </a>
-        <figcaption>
+        <figcaption class="figure-caption">
             {{ file.caption }}
             <br>
             <br>
@@ -16,21 +28,28 @@
             <a href='{{ relpath(file.provenance_xml_file, session.session_dir) }}'>provenance</a>
         </figcaption>
     </figure>
+</div>
 
 {% endfor %}
 
-<h4>Data files</h4>
+{% if task.data_files|length > 0 %}
+<h4>Data files <button class="btn btn-primary" data-bs-toggle="collapse" data-bs-target="#df_{{ diagnostic_loop.index }}_{{ loop.index }}" aria-expanded="false" aria-controls="df_{{ diagnostic_loop.index }}_{{ loop.index }}">Show/Hide</button></h4>
 
-<ul>
-{% for file in task.data_files %}
+<div id="df_{{ diagnostic_loop.index }}_{{ loop.index }}" class="collapse">
+    <div class="card card-body">
+        <ul>
+        {% for file in task.data_files %}
 
-    <li>
-        {{ file.caption }} |
-        <a href='{{ relpath(file.path, session.session_dir) }}'>download</a> |
-        <a href='{{ relpath(file.citation_file, session.session_dir) }}'>references</a> |
-        <a href='{{ relpath(file.data_citation_file, session.session_dir) }}'>extra data citation</a> |
-        <a href='{{ relpath(file.provenance_xml_file, session.session_dir) }}'>provenance</a>
-    </li>
+            <li>
+                {{ file.caption }} |
+                <a href='{{ relpath(file.path, session.session_dir) }}'>download</a> |
+                <a href='{{ relpath(file.citation_file, session.session_dir) }}'>references</a> |
+                <a href='{{ relpath(file.data_citation_file, session.session_dir) }}'>extra data citation</a> |
+                <a href='{{ relpath(file.provenance_xml_file, session.session_dir) }}'>provenance</a>
+            </li>
 
-{% endfor %}
-</ul>
+        {% endfor %}
+        </ul>
+    </div>
+</div>
+{% endif %}
diff --git a/esmvalcore/experimental/templates/head.j2 b/esmvalcore/experimental/templates/head.j2
index e6ec19d5ee..0306620f8a 100644
--- a/esmvalcore/experimental/templates/head.j2
+++ b/esmvalcore/experimental/templates/head.j2
@@ -2,6 +2,9 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>{{ title }}</title>
+  <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.7.0/jquery.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js" integrity="sha384-HwwvtgBNo3bZJJLYd8oVXjrBZt8cqVSpeBNS5n7C8IVInixGAoxmnlMuBnhbgrkm" crossorigin="anonymous"></script>
   <style>
     html {
       font-size: medium;
diff --git a/esmvalcore/experimental/templates/recipe_output_page.j2 b/esmvalcore/experimental/templates/recipe_output_page.j2
index 10dc041caf..a970409e41 100644
--- a/esmvalcore/experimental/templates/recipe_output_page.j2
+++ b/esmvalcore/experimental/templates/recipe_output_page.j2
@@ -7,20 +7,34 @@
 
   <body>
 
+    <div class="text-center">
+      <figure class="figure">
+        <img
+          class="figure-img img-fluid"
+          src='https://raw.githubusercontent.com/ESMValGroup/ESMValTool/main/doc/sphinx/source/figures/ESMValTool-logo-2.png'
+          alt='ESMValTool logo.'
+        />
+      </figure>
+    </div>
+
     {% include 'RecipeInfo.j2' %}
 
     {% include 'RecipeOutput.j2' %}
 
-  </body>
+    <h2>Files</h2>
 
-  <h2>Files</h2>
+    <p>
+      <a href='{{ session.relative_main_log }}'>{{ session.main_log.name }}</a> |
+      <a href='{{ session.relative_main_log_debug }}'>{{ session.main_log_debug.name }}</a> |
+      <a href='{{ session.relative_run_dir / info.filename }}'>{{ info.filename }}</a> |
+      <a href='{{ session.relative_plot_dir }}'>figures</a> |
+      <a href='{{ session.relative_work_dir }}'>data</a>
+    </p>
 
-  <p>
-    <a href='{{ session.relative_main_log }}'>{{ session.main_log.name }}</a> |
-    <a href='{{ session.relative_main_log_debug }}'>{{ session.main_log_debug.name }}</a> |
-    <a href='{{ session.relative_run_dir / info.filename }}'>{{ info.filename }}</a> |
-    <a href='{{ session.relative_plot_dir }}'>figures</a> |
-    <a href='{{ session.relative_work_dir }}'>data</a>
-  </p>
+  <script>
+    {% include 'scripts.js' %}
+  </script>
+
+  </body>
 
 </html>
diff --git a/esmvalcore/experimental/templates/scripts.js b/esmvalcore/experimental/templates/scripts.js
new file mode 100644
index 0000000000..d2fa981c09
--- /dev/null
+++ b/esmvalcore/experimental/templates/scripts.js
@@ -0,0 +1,122 @@
+function filterFigures(){
+    /**
+     * Update visibility of filtered figures.
+     */
+    let allFigures = $(".div_figure");
+    let selectedFigures = allFigures;
+    $(".filter_category").each(function() {
+        let selection = $(this).find(":checked").map(function() {
+            // Returns the figures that the checkbox relates to.
+            return $("."+$(this).attr("rel")).get();
+        });
+        if (selection.length !== 0){
+            selectedFigures = selectedFigures.filter(selection);
+        }
+    });
+    selectedFigures.addClass("selected") // affects the div
+    .find("figure").show(); // affects figure inside the div
+    allFigures.not(selectedFigures).removeClass("selected") // affects the div
+    .find("figure").hide(); // affects figure inside the div
+}
+
+function filterTabs(){
+    /**
+     * Disable tab buttons for empty diagnostics and
+     * mark empty tabPanes.
+     */
+    $(".diagnostics-tab").not("#tabAll").each(function() {
+        let tabPane = $($(this).attr("data-bs-target"));
+        if (tabPane.find(".div_figure.selected").length === 0){
+            $(this).addClass("disabled");
+            tabPane.addClass("filtered");
+        } else {
+            $(this).removeClass("disabled");
+            tabPane.removeClass("filtered");
+        }
+
+        // If the active tab is disabled, change to "All"
+        if($(".diagnostics-tab.active").hasClass("disabled")){
+            $("#tabAll").click();
+        }
+    });
+}
+
+function hideEmptyTabPanes(){
+    /**
+     * Hide empty tab panes. It's separated from "filterTabs()"
+     * to reuse on the "Hide empty diagnostics" checkbox
+     */
+    if($("#tabAll").hasClass("active")){
+        let panes = $(".diagnostics-tab-pane");
+        panes.addClass("active").addClass("show");
+        if ($("#cb_hideEmptyDiagnostics").prop("checked")){
+            panes.filter(".filtered").removeClass("active").removeClass("show");
+        }
+    }
+}
+
+function applyFilters(){
+    /**
+     * Updates visibility according to filters.
+     */
+    filterFigures();
+    filterTabs();
+    hideEmptyTabPanes();
+}
+
+// Set up events with jQuery
+// Specific events are defined as anonymous functions
+$(document).ready(function() {
+
+    $("#tabAll").on("click", function() {
+        /**
+         * Functionality for tab "All", as it is not supported
+         * by Bootstrap.
+         */
+
+        // Both activate this tab
+        $(this).addClass("active")
+        // and deactivate other tabs
+        .parent("li").siblings().find("button").removeClass("active");
+
+        // Show all non-filtered tab panes
+        let tabPanes = $(".diagnostics-tab-pane");
+        if ($("#cb_hideEmptyDiagnostics").prop("checked")){
+            tabPanes = tabPanes.not(".filtered");
+        }
+        tabPanes.addClass("active").addClass("show");
+    });
+
+    $(".diagnostics-tab").not("#tabAll").on("click", function() {
+        /**
+         * Upgrades Bootstrap tab functionality to deactivate
+         * tab "All" by hiding all non-selected panes, as
+         * Bootstrap hides only one pane.
+         */
+        $(".diagnostics-tab-pane").not($(this).attr("data-bs-target"))
+        .removeClass("active").removeClass("show");
+    });
+
+    // Checkbox "Hide empty diagnostics"
+    $("#cb_hideEmptyDiagnostics").on("click", hideEmptyTabPanes);
+
+    $("#b_deleteFilters").on("click", function(){
+        /**
+         * Unchecks all filters and disables "Delete filters" button.
+         */
+        $(".filter_cb").prop("checked", false);
+        applyFilters();
+        $(this).prop("disabled", true);
+    });
+
+    $(".filter_cb").on("click", function(){
+        /**
+         * Update visibility of figures and panes when filters
+         * are applied, and set up disable filters button.
+         */
+        applyFilters();
+
+        let areFiltersClear = $(".filter_cb:checked").length === 0;
+        $("#b_deleteFilters").prop("disabled", areFiltersClear);
+    });
+});
diff --git a/esmvalcore/local.py b/esmvalcore/local.py
index 67007e9608..5cb499dbbb 100644
--- a/esmvalcore/local.py
+++ b/esmvalcore/local.py
@@ -7,7 +7,7 @@
 import re
 from glob import glob
 from pathlib import Path
-from typing import Any, Union
+from typing import TYPE_CHECKING, Any, Union
 
 import iris
 import isodate
@@ -17,17 +17,19 @@
 from .exceptions import RecipeError
 from .typing import Facets, FacetValue
 
+if TYPE_CHECKING:
+    from .esgf import ESGFFile
+
 logger = logging.getLogger(__name__)
 
 
 def _get_from_pattern(pattern, date_range_pattern, stem, group):
     """Get time, date or datetime from date range patterns in file names."""
-    #
     # Next string allows to test that there is an allowed delimiter (or
     # string start or end) close to date range (or to single date)
     start_point = end_point = None
     context = r"(?:^|[-_]|$)"
-    #
+
     # First check for a block of two potential dates
     date_range_pattern_with_context = context + date_range_pattern + context
     daterange = re.search(date_range_pattern_with_context, stem)
@@ -37,6 +39,7 @@ def _get_from_pattern(pattern, date_range_pattern, stem, group):
         date_range_pattern_with_context = (context + date_range_pattern +
                                            context)
         daterange = re.search(date_range_pattern_with_context, stem)
+
     if daterange:
         start_point = daterange.group(group)
         end_group = '_'.join([group, 'end'])
@@ -59,41 +62,69 @@ def _get_from_pattern(pattern, date_range_pattern, stem, group):
     return start_point, end_point
 
 
-def _get_start_end_date(filename):
+def _get_start_end_date(
+        file: str | Path | LocalFile | ESGFFile) -> tuple[str, str]:
     """Get the start and end dates as a string from a file name.
 
-    Examples of allowed dates : 1980, 198001, 19801231,
-    1980123123, 19801231T23, 19801231T2359, 19801231T235959,
-    19801231T235959Z (ISO 8601).
+    Examples of allowed dates: 1980, 198001, 1980-01, 19801231, 1980-12-31,
+    1980123123, 19801231T23, 19801231T2359, 19801231T235959, 19801231T235959Z
+    (ISO 8601).
 
-    Dates must be surrounded by - or _ or string start or string end
-    (after removing filename suffix).
+    Dates must be surrounded by '-', '_' or '.' (the latter is used by CMIP3
+    data), or string start or string end (after removing filename suffix).
 
-    Look first for two dates separated by - or _, then for one single
-    date, and if they are multiple, for one date at start or end.
+    Look first for two dates separated by '-', '_' or '_cat_' (the latter is
+    used by CMIP3 data), then for one single date, and if there are multiple,
+    for one date at start or end.
+
+    Parameters
+    ----------
+    file:
+        The file to read the start and end data from.
+
+    Returns
+    -------
+    tuple[str, str]
+        The start and end date.
+
+    Raises
+    ------
+    ValueError
+        Start or end date cannot be determined.
     """
-    stem = Path(filename).stem
+    if hasattr(file, 'name'):  # Path, LocalFile, ESGFFile
+        stem = Path(file.name).stem
+    else:  # str
+        stem = Path(file).stem
+
     start_date = end_date = None
-    #
+
+    # Build regex
     time_pattern = (r"(?P<hour>[0-2][0-9]"
                     r"(?P<minute>[0-5][0-9]"
                     r"(?P<second>[0-5][0-9])?)?Z?)")
     date_pattern = (r"(?P<year>[0-9]{4})"
-                    r"(?P<month>[01][0-9]"
-                    r"(?P<day>[0-3][0-9]"
+                    r"(?P<month>-?[01][0-9]"
+                    r"(?P<day>-?[0-3][0-9]"
                     rf"(T?{time_pattern})?)?)?")
     datetime_pattern = (rf"(?P<datetime>{date_pattern})")
-    #
     end_datetime_pattern = datetime_pattern.replace(">", "_end>")
-    date_range_pattern = datetime_pattern + r"[-_]" + end_datetime_pattern
+
+    # Dates can either be delimited by '-', '_', or '_cat_' (the latter for
+    # CMIP3)
+    date_range_pattern = (datetime_pattern + r"[-_](?:cat_)?" +
+                          end_datetime_pattern)
+
+    # Find dates using the regex
     start_date, end_date = _get_from_pattern(datetime_pattern,
                                              date_range_pattern, stem,
                                              'datetime')
 
     # As final resort, try to get the dates from the file contents
-    if (start_date is None or end_date is None) and Path(filename).exists():
-        logger.debug("Must load file %s for daterange ", filename)
-        cubes = iris.load(filename)
+    if ((start_date is None or end_date is None)
+            and isinstance(file, (str, Path)) and Path(file).exists()):
+        logger.debug("Must load file %s for daterange ", file)
+        cubes = iris.load(file)
 
         for cube in cubes:
             logger.debug(cube)
@@ -109,12 +140,27 @@ def _get_start_end_date(filename):
             break
 
     if start_date is None or end_date is None:
-        raise ValueError(f'File {filename} dates do not match a recognized '
-                         'pattern and time can not be read from the file')
+        raise ValueError(
+            f"File {file} datetimes do not match a recognized pattern and "
+            f"time coordinate can not be read from the file")
+
+    # Remove potential '-' characters from datetimes
+    start_date = start_date.replace('-', '')
+    end_date = end_date.replace('-', '')
 
     return start_date, end_date
 
 
+def _get_start_end_year(
+        file: str | Path | LocalFile | ESGFFile) -> tuple[int, int]:
+    """Get the start and end year as int from a file name.
+
+    See :func:`_get_start_end_date`.
+    """
+    (start_date, end_date) = _get_start_end_date(file)
+    return (int(start_date[:4]), int(end_date[:4]))
+
+
 def _dates_to_timerange(start_date, end_date):
     """Convert ``start_date`` and ``end_date`` to ``timerange``.
 
@@ -162,72 +208,6 @@ def _replace_years_with_timerange(variable):
     variable.pop('end_year', None)
 
 
-def _get_start_end_year(file):
-    """Get the start and end year from a file name.
-
-    Examples of allowed dates : 1980, 198001, 19801231,
-    1980123123, 19801231T23, 19801231T2359, 19801231T235959,
-    19801231T235959Z (ISO 8601).
-
-    Dates must be surrounded by - or _ or string start or string end
-    (after removing filename suffix).
-
-    Look first for two dates separated by - or _, then for one single
-    date, and if they are multiple, for one date at start or end.
-
-    Parameters
-    ----------
-    file: LocalFile or esmvalcore.esgf.ESGFFile
-        The file to read the start and end year from.
-
-    Returns
-    -------
-    tuple[int, int]
-        The start and end year.
-
-    Raises
-    ------
-    ValueError
-        When start or end year cannot be determined.
-
-    """
-    start_year = end_year = None
-
-    time_pattern = (r"(?P<hour>[0-2][0-9]"
-                    r"(?P<minute>[0-5][0-9]"
-                    r"(?P<second>[0-5][0-9])?)?Z?)")
-    date_pattern = (r"(?P<year>[0-9]{4})"
-                    r"(?P<month>[01][0-9]"
-                    r"(?P<day>[0-3][0-9]"
-                    rf"(T?{time_pattern})?)?)?")
-
-    end_date_pattern = date_pattern.replace(">", "_end>")
-    date_range_pattern = date_pattern + r"[-_]" + end_date_pattern
-    start_year, end_year = _get_from_pattern(date_pattern, date_range_pattern,
-                                             Path(file.name).stem, 'year')
-    # As final resort, try to get the dates from the file contents
-    if ((start_year is None or end_year is None) and isinstance(file, Path)
-            and file.exists()):
-        logger.debug("Must load file %s for daterange ", file)
-        cubes = iris.load(file)
-
-        for cube in cubes:
-            logger.debug(cube)
-            try:
-                time = cube.coord('time')
-            except iris.exceptions.CoordinateNotFoundError:
-                continue
-            start_year = time.cell(0).point.year
-            end_year = time.cell(-1).point.year
-            break
-
-    if start_year is None or end_year is None:
-        raise ValueError(f'File {file} dates do not match a recognized '
-                         'pattern and time can not be read from the file')
-
-    return int(start_year), int(end_year)
-
-
 def _parse_period(timerange):
     """Parse `timerange` values given as duration periods.
 
@@ -238,8 +218,8 @@ def _parse_period(timerange):
     start_date = None
     end_date = None
     time_format = None
-    datetime_format = (
-        isodate.DATE_BAS_COMPLETE + 'T' + isodate.TIME_BAS_COMPLETE)
+    datetime_format = (isodate.DATE_BAS_COMPLETE + 'T' +
+                       isodate.TIME_BAS_COMPLETE)
     if timerange.split('/')[0].startswith('P'):
         try:
             end_date = isodate.parse_datetime(timerange.split('/')[1])
@@ -260,13 +240,13 @@ def _parse_period(timerange):
         end_date = start_date + delta
 
     if time_format == datetime_format:
-        start_date = str(isodate.datetime_isoformat(
-            start_date, format=datetime_format))
-        end_date = str(isodate.datetime_isoformat(
-            end_date, format=datetime_format))
-    elif time_format == isodate.DATE_BAS_COMPLETE:
         start_date = str(
-            isodate.date_isoformat(start_date, format=time_format))
+            isodate.datetime_isoformat(start_date, format=datetime_format))
+        end_date = str(
+            isodate.datetime_isoformat(end_date, format=datetime_format))
+    elif time_format == isodate.DATE_BAS_COMPLETE:
+        start_date = str(isodate.date_isoformat(start_date,
+                                                format=time_format))
         end_date = str(isodate.date_isoformat(end_date, format=time_format))
 
     if start_date is None and end_date is None:
@@ -303,11 +283,11 @@ def _truncate_dates(date, file_date):
 def _select_files(filenames, timerange):
     """Select files containing data between a given timerange.
 
-    If the timerange is given as a period, the file selection
-    occurs taking only the years into account.
+    If the timerange is given as a period, the file selection occurs
+    taking only the years into account.
 
-    Otherwise, the file selection occurs taking into account
-    the time resolution of the file.
+    Otherwise, the file selection occurs taking into account the time
+    resolution of the file.
     """
     if '*' in timerange:
         # TODO: support * combined with a period
@@ -428,7 +408,8 @@ def _get_rootpath(project):
                     key, ', '.join(str(p) for p in nonexistent))
                 _ROOTPATH_WARNED.add((key, nonexistent))
             return rootpath[key]
-    raise KeyError('default rootpath must be specified in config-user file')
+    raise KeyError(f'The "{project}" option is missing from the "rootpath" '
+                   'section in the config-user.yml file.')
 
 
 def _get_globs(variable):
@@ -509,8 +490,7 @@ def _get_multiproduct_filename(attributes: dict, preproc_dir: Path) -> Path:
     filename_segments = list(dict.fromkeys(filename_segments))
 
     # Add period and extension
-    filename_segments.append(
-        f"{attributes['timerange'].replace('/', '-')}.nc")
+    filename_segments.append(f"{attributes['timerange'].replace('/', '-')}.nc")
 
     outfile = Path(
         preproc_dir,
@@ -525,18 +505,29 @@ def _get_multiproduct_filename(attributes: dict, preproc_dir: Path) -> Path:
 def _path2facets(path: Path, drs: str) -> dict[str, str]:
     """Extract facets from a path using a DRS like '{facet1}/{facet2}'."""
     keys = []
-    for key in re.findall(r"{(.*?)}", drs):
+    for key in re.findall(r'{(.*?)}[^-]', f'{drs} '):
         key = key.split('.')[0]  # Remove trailing .lower and .upper
         keys.append(key)
     start, end = -len(keys) - 1, -1
     values = path.parts[start:end]
-    facets = {key: values[idx] for idx, key in enumerate(keys)}
+    facets = {
+        key: values[idx]
+        for idx, key in enumerate(keys) if "{" not in key
+    }
+
+    if len(facets) != len(keys):
+        # Extract hyphen separated facet: {facet1}-{facet2},
+        # where facet1 is already known.
+        for idx, key in enumerate(keys):
+            if key not in facets:
+                facet1, facet2 = key.split("}-{")
+                facets[facet2] = values[idx].replace(f'{facets[facet1]}-', '')
+
     return facets
 
 
 def _filter_versions_called_latest(
-    files: list['LocalFile'],
-) -> list['LocalFile']:
+        files: list['LocalFile']) -> list['LocalFile']:
     """Filter out versions called 'latest' if they are duplicates.
 
     On compute clusters it is usual to have a symbolic link to the
diff --git a/esmvalcore/preprocessor/__init__.py b/esmvalcore/preprocessor/__init__.py
index 736ed02156..4a5027bce5 100644
--- a/esmvalcore/preprocessor/__init__.py
+++ b/esmvalcore/preprocessor/__init__.py
@@ -29,7 +29,6 @@
 from ._io import (
     _get_debug_filename,
     _sort_products,
-    cleanup,
     concatenate,
     load,
     save,
@@ -57,9 +56,7 @@
 )
 from ._rolling_window import rolling_window_statistics
 from ._supplementary_vars import (
-    add_fx_variables,
     add_supplementary_variables,
-    remove_fx_variables,
     remove_supplementary_variables,
 )
 from ._time import (
@@ -110,7 +107,6 @@
     'fix_data',
     'cmor_check_data',
     # Attach ancillary variables and cell measures
-    'add_fx_variables',
     'add_supplementary_variables',
     # Derive variable
     'derive',
@@ -189,10 +185,8 @@
     'bias',
     # Remove supplementary variables from cube
     'remove_supplementary_variables',
-    'remove_fx_variables',
     # Save to file
     'save',
-    'cleanup',
 ]
 
 TIME_PREPROCESSORS = [
@@ -371,6 +365,10 @@ def preprocess(
     function = globals()[step]
     itype = _get_itype(step)
 
+    for item in items:
+        if isinstance(item, Cube) and item.has_lazy_data():
+            item.data = item.core_data().rechunk()
+
     result = []
     if itype.endswith('s'):
         result.append(_run_preproc_function(function, items, settings,
@@ -478,10 +476,7 @@ def apply(self, step: str, debug: bool = False):
     def cubes(self):
         """Cubes."""
         if self._cubes is None:
-            callback = self.settings.get('load', {}).get('callback')
-            self._cubes = [
-                ds._load_with_callback(callback) for ds in self.datasets
-            ]
+            self._cubes = [ds.load() for ds in self.datasets]
         return self._cubes
 
     @cubes.setter
@@ -494,11 +489,6 @@ def save(self):
                    'save',
                    input_files=self._input_files,
                    **self.settings['save'])
-        if 'cleanup' in self.settings:
-            preprocess([],
-                       'cleanup',
-                       input_files=self._input_files,
-                       **self.settings['cleanup'])
 
     def close(self):
         """Close the file."""
diff --git a/esmvalcore/preprocessor/_area.py b/esmvalcore/preprocessor/_area.py
index 9477811415..ae78526a2d 100644
--- a/esmvalcore/preprocessor/_area.py
+++ b/esmvalcore/preprocessor/_area.py
@@ -8,7 +8,7 @@
 import logging
 import warnings
 from pathlib import Path
-from typing import TYPE_CHECKING, Optional
+from typing import TYPE_CHECKING, Iterable, Optional
 
 import fiona
 import iris
@@ -16,15 +16,11 @@
 import shapely
 import shapely.ops
 from dask import array as da
-from iris.coords import AuxCoord
+from iris.coords import AuxCoord, CellMeasure
 from iris.cube import Cube, CubeList
-from iris.exceptions import CoordinateNotFoundError
+from iris.exceptions import CoordinateMultiDimError, CoordinateNotFoundError
 
-from ._shared import (
-    get_iris_analysis_operation,
-    guess_bounds,
-    operator_accept_weights,
-)
+from ._shared import get_iris_aggregator, guess_bounds, update_weights_kwargs
 from ._supplementary_vars import (
     add_ancillary_variable,
     add_cell_measure,
@@ -40,30 +36,36 @@
 SHAPE_ID_KEYS: tuple[str, ...] = ('name', 'NAME', 'Name', 'id', 'ID')
 
 
-def extract_region(cube, start_longitude, end_longitude, start_latitude,
-                   end_latitude):
+def extract_region(
+    cube: Cube,
+    start_longitude: float,
+    end_longitude: float,
+    start_latitude: float,
+    end_latitude: float,
+) -> Cube:
     """Extract a region from a cube.
 
     Function that subsets a cube on a box (start_longitude, end_longitude,
-    start_latitude, end_latitude)
+    start_latitude, end_latitude).
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input data cube.
-    start_longitude: float
+    cube:
+        Input data cube.
+    start_longitude:
         Western boundary longitude.
-    end_longitude: float
+    end_longitude:
         Eastern boundary longitude.
-    start_latitude: float
+    start_latitude:
         Southern Boundary latitude.
-    end_latitude: float
+    end_latitude:
         Northern Boundary Latitude.
 
     Returns
     -------
     iris.cube.Cube
-        smaller cube.
+        Smaller cube.
+
     """
     # first examine if any cell_measures are present
     cell_measures = cube.cell_measures()
@@ -183,18 +185,24 @@ def _extract_irregular_region(cube, start_longitude, end_longitude,
     return cube
 
 
-def zonal_statistics(cube, operator):
+def zonal_statistics(
+    cube: Cube,
+    operator: str,
+    **operator_kwargs
+) -> Cube:
     """Compute zonal statistics.
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-
-    operator: str, optional
-        Select operator to apply.
-        Available operators: 'mean', 'median', 'std_dev', 'sum', 'min',
-        'max', 'rms'.
+    cube:
+        Input cube.
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
@@ -206,28 +214,36 @@ def zonal_statistics(cube, operator):
     ValueError
         Error raised if computation on irregular grids is attempted.
         Zonal statistics not yet implemented for irregular grids.
+
     """
-    if cube.coord('longitude').points.ndim < 2:
-        operation = get_iris_analysis_operation(operator)
-        cube = cube.collapsed('longitude', operation)
-        cube.data = cube.core_data().astype(np.float32, casting='same_kind')
-        return cube
-    msg = ("Zonal statistics on irregular grids not yet implemnted")
-    raise ValueError(msg)
+    if cube.coord('longitude').points.ndim >= 2:
+        raise ValueError(
+            "Zonal statistics on irregular grids not yet implemented"
+        )
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+    cube = cube.collapsed('longitude', agg, **agg_kwargs)
+    cube.data = cube.core_data().astype(np.float32, casting='same_kind')
+    return cube
 
 
-def meridional_statistics(cube, operator):
+def meridional_statistics(
+    cube: Cube,
+    operator: str,
+    **operator_kwargs,
+) -> Cube:
     """Compute meridional statistics.
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-
-    operator: str, optional
-        Select operator to apply.
-        Available operators: 'mean', 'median', 'std_dev', 'sum', 'min',
-        'max', 'rms'.
+    cube:
+        Input cube.
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
@@ -239,14 +255,16 @@ def meridional_statistics(cube, operator):
     ValueError
         Error raised if computation on irregular grids is attempted.
         Zonal statistics not yet implemented for irregular grids.
+
     """
-    if cube.coord('latitude').points.ndim < 2:
-        operation = get_iris_analysis_operation(operator)
-        cube = cube.collapsed('latitude', operation)
-        cube.data = cube.core_data().astype(np.float32, casting='same_kind')
-        return cube
-    msg = ("Meridional statistics on irregular grids not yet implemented")
-    raise ValueError(msg)
+    if cube.coord('latitude').points.ndim >= 2:
+        raise ValueError(
+            "Meridional statistics on irregular grids not yet implemented"
+        )
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+    cube = cube.collapsed('latitude', agg, **agg_kwargs)
+    cube.data = cube.core_data().astype(np.float32, casting='same_kind')
+    return cube
 
 
 def compute_area_weights(cube):
@@ -266,125 +284,138 @@ def compute_area_weights(cube):
     return weights
 
 
+def _try_adding_calculated_cell_area(cube: Cube) -> None:
+    """Try to add calculated cell measure 'cell_area' to cube (in-place)."""
+    if cube.cell_measures('cell_area'):
+        return
+
+    logger.debug(
+        "Found no cell measure 'cell_area' in cube %s. Check availability of "
+        "supplementary variables",
+        cube.summary(shorten=True),
+    )
+    logger.debug("Attempting to calculate grid cell area")
+
+    regular_grid = all([
+        cube.coord('latitude').points.ndim == 1,
+        cube.coord('longitude').points.ndim == 1,
+        cube.coord_dims('latitude') != cube.coord_dims('longitude'),
+    ])
+    rotated_pole_grid = all([
+        cube.coord('latitude').points.ndim == 2,
+        cube.coord('longitude').points.ndim == 2,
+        cube.coords('grid_latitude'),
+        cube.coords('grid_longitude'),
+    ])
+
+    # For regular grids, calculate grid cell areas with iris function
+    if regular_grid:
+        cube = guess_bounds(cube, ['latitude', 'longitude'])
+        logger.debug("Calculating grid cell areas for regular grid")
+        cell_areas = compute_area_weights(cube)
+
+    # For rotated pole grids, use grid_latitude and grid_longitude to calculate
+    # grid cell areas
+    elif rotated_pole_grid:
+        cube = guess_bounds(cube, ['grid_latitude', 'grid_longitude'])
+        cube_tmp = cube.copy()
+        cube_tmp.remove_coord('latitude')
+        cube_tmp.coord('grid_latitude').rename('latitude')
+        cube_tmp.remove_coord('longitude')
+        cube_tmp.coord('grid_longitude').rename('longitude')
+        logger.debug("Calculating grid cell areas for rotated pole grid")
+        cell_areas = compute_area_weights(cube_tmp)
+
+    # For all other cases, grid cell areas cannot be calculated
+    else:
+        logger.error(
+            "Supplementary variables are needed to calculate grid cell "
+            "areas for irregular or unstructured grid of cube %s",
+            cube.summary(shorten=True),
+        )
+        raise CoordinateMultiDimError(cube.coord('latitude'))
+
+    # Add new cell measure
+    cell_measure = CellMeasure(
+        cell_areas, standard_name='cell_area', units='m2', measure='area',
+    )
+    cube.add_cell_measure(cell_measure, np.arange(cube.ndim))
+
+
 @register_supplementaries(
     variables=['areacella', 'areacello'],
     required='prefer_at_least_one',
 )
-def area_statistics(cube, operator):
-    """Apply a statistical operator in the horizontal direction.
-
-    The average in the horizontal direction. We assume that the
-    horizontal directions are ['longitude', 'latutude'].
-
-    This function can be used to apply
-    several different operations in the horizontal plane: mean, standard
-    deviation, median variance, minimum and maximum. These options are
-    specified using the `operator` argument and the following key word
-    arguments:
-
-    +------------+--------------------------------------------------+
-    | `mean`     | Area weighted mean.                              |
-    +------------+--------------------------------------------------+
-    | `median`   | Median (not area weighted)                       |
-    +------------+--------------------------------------------------+
-    | `std_dev`  | Standard Deviation (not area weighted)           |
-    +------------+--------------------------------------------------+
-    | `sum`      | Area weighted sum.                               |
-    +------------+--------------------------------------------------+
-    | `variance` | Variance (not area weighted)                     |
-    +------------+--------------------------------------------------+
-    | `min`:     | Minimum value                                    |
-    +------------+--------------------------------------------------+
-    | `max`      | Maximum value                                    |
-    +------------+--------------------------------------------------+
-    | `rms`      | Area weighted root mean square.                  |
-    +------------+--------------------------------------------------+
+def area_statistics(
+    cube: Cube,
+    operator: str,
+    **operator_kwargs,
+) -> Cube:
+    """Apply a statistical operator in the horizontal plane.
+
+    We assume that the horizontal directions are ['longitude', 'latitude'].
+
+    :ref:`This table <supported_stat_operator>` shows a list of supported
+    operators. All operators that support weights are by default weighted with
+    the grid cell areas. Note that for area-weighted sums, the units of the
+    resulting cube will be multiplied by m :math:`^2`.
 
     Parameters
     ----------
-        cube: iris.cube.Cube
-            Input cube. The input cube should have a
-            :class:`iris.coords.CellMeasure` named ``'cell_area'``, unless it
-            has regular 1D latitude and longitude coordinates so the cell areas
-            can be computed using
-            :func:`iris.analysis.cartography.area_weights`.
-        operator: str
-            The operation, options: mean, median, min, max, std_dev, sum,
-            variance, rms.
+    cube:
+        Input cube. The input cube should have a
+        :class:`iris.coords.CellMeasure` named ``'cell_area'``, unless it has
+        regular 1D latitude and longitude coordinates so the cell areas can be
+        computed using :func:`iris.analysis.cartography.area_weights`.
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
     iris.cube.Cube
-        collapsed cube.
+        Collapsed cube.
 
     Raises
     ------
     iris.exceptions.CoordinateMultiDimError
-        Exception for latitude axis with dim > 2.
-    ValueError
-        if input data cube has different shape than grid area weights
+        Cube has irregular or unstructured grid but supplementary variable
+        `cell_area` is not available.
+
     """
     original_dtype = cube.dtype
-    grid_areas = None
-    try:
-        grid_areas = cube.cell_measure('cell_area').core_data()
-    except iris.exceptions.CellMeasureNotFoundError:
-        logger.debug(
-            'Cell measure "cell_area" not found in cube %s. '
-            'Check fx_file availability.', cube.summary(shorten=True))
-        logger.debug('Attempting to calculate grid cell area...')
-    else:
-        grid_areas = da.broadcast_to(grid_areas, cube.shape)
-
-    if grid_areas is None and cube.coord('latitude').points.ndim == 2:
-        coord_names = [coord.standard_name for coord in cube.coords()]
-        if 'grid_latitude' in coord_names and 'grid_longitude' in coord_names:
-            cube = guess_bounds(cube, ['grid_latitude', 'grid_longitude'])
-            cube_tmp = cube.copy()
-            cube_tmp.remove_coord('latitude')
-            cube_tmp.coord('grid_latitude').rename('latitude')
-            cube_tmp.remove_coord('longitude')
-            cube_tmp.coord('grid_longitude').rename('longitude')
-            grid_areas = compute_area_weights(cube_tmp)
-            logger.debug('Calculated grid area shape: %s', grid_areas.shape)
-        else:
-            logger.error(
-                'fx_file needed to calculate grid cell area for irregular '
-                'grids.')
-            raise iris.exceptions.CoordinateMultiDimError(
-                cube.coord('latitude'))
-
-    coord_names = ['longitude', 'latitude']
-    if grid_areas is None:
-        cube = guess_bounds(cube, coord_names)
-        grid_areas = compute_area_weights(cube)
-        logger.debug('Calculated grid area shape: %s', grid_areas.shape)
-
-    if cube.shape != grid_areas.shape:
-        raise ValueError('Cube shape ({}) doesn`t match grid area shape '
-                         '({})'.format(cube.shape, grid_areas.shape))
-
-    operation = get_iris_analysis_operation(operator)
+    has_cell_measure = bool(cube.cell_measures('cell_area'))
 
-    # TODO: implement weighted stdev, median, s var when available in iris.
-    # See iris issue: https://github.com/SciTools/iris/issues/3208
+    # Get aggregator and correct kwargs (incl. weights)
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+    agg_kwargs = update_weights_kwargs(
+        agg, agg_kwargs, 'cell_area', cube, _try_adding_calculated_cell_area
+    )
 
-    if operator_accept_weights(operator):
-        result = cube.collapsed(coord_names, operation, weights=grid_areas)
-    else:
-        # Many IRIS analysis functions do not accept weights arguments.
-        result = cube.collapsed(coord_names, operation)
+    result = cube.collapsed(['latitude', 'longitude'], agg, **agg_kwargs)
 
+    # Make sure to preserve dtype
     new_dtype = result.dtype
     if original_dtype != new_dtype:
         logger.debug(
-            "area_statistics changed dtype from "
-            "%s to %s, changing back", original_dtype, new_dtype)
+            "area_statistics changed dtype from %s to %s, changing back",
+            original_dtype,
+            new_dtype,
+        )
         result.data = result.core_data().astype(original_dtype)
+
+    # Make sure input cube has not been modified
+    if not has_cell_measure and cube.cell_measures('cell_area'):
+        cube.remove_cell_measure('cell_area')
+
     return result
 
 
-def extract_named_regions(cube, regions):
+def extract_named_regions(cube: Cube, regions: str | Iterable[str]) -> Cube:
     """Extract a specific named region.
 
     The region coordinate exist in certain CMIP datasets.
@@ -392,15 +423,15 @@ def extract_named_regions(cube, regions):
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-       input cube.
-    regions: str, list
+    cube:
+       Input cube.
+    regions:
         A region or list of regions to extract.
 
     Returns
     -------
     iris.cube.Cube
-        collapsed cube.
+        Smaller cube.
 
     Raises
     ------
@@ -408,6 +439,7 @@ def extract_named_regions(cube, regions):
         regions is not list or tuple or set.
     ValueError
         region not included in cube.
+
     """
     # Make sure regions is a list of strings
     if isinstance(regions, str):
@@ -671,7 +703,7 @@ def fix_coordinate_ordering(cube: Cube) -> Cube:
 
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Input cube.
 
     Returns
@@ -756,9 +788,9 @@ def extract_shape(
 
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Input cube.
-    shapefile: str or Path
+    shapefile:
         A shapefile defining the region(s) to extract. Also accepts the
         following strings to load special shapefiles:
 
@@ -766,19 +798,19 @@ def extract_shape(
           6 (https://doi.org/10.5281/zenodo.5176260). Should be used in
           combination with a :obj:`dict` for the argument `ids`, e.g.,
           ``ids={'Acronym': ['GIC', 'WNA']}``.
-    method: str, optional
+    method:
         Select all points contained by the shape or select a single
         representative point. Choose either `'contains'` or `'representative'`.
         If `'contains'` is used, but not a single grid point is contained by
         the shape, a representative point will be selected.
-    crop: bool, optional
+    crop:
         In addition to masking, crop the resulting cube using
         :func:`~esmvalcore.preprocessor.extract_region`. Data on irregular
         grids will not be cropped.
-    decomposed: bool, optional
+    decomposed:
         If set to `True`, the output cube will have an additional dimension
         `shape_id` describing the requested regions.
-    ids: list or dict or None, optional
+    ids:
         Shapes to be read from the shapefile. Can be given as:
 
         * :obj:`list`: IDs are assigned from the attributes `name`, `NAME`,
diff --git a/esmvalcore/preprocessor/_io.py b/esmvalcore/preprocessor/_io.py
index 62eb52853e..f1586a9f17 100644
--- a/esmvalcore/preprocessor/_io.py
+++ b/esmvalcore/preprocessor/_io.py
@@ -4,26 +4,24 @@
 import copy
 import logging
 import os
-import shutil
-import warnings
-from collections.abc import Callable
 from itertools import groupby
 from pathlib import Path
-from typing import Optional
+from typing import Optional, NamedTuple
 from warnings import catch_warnings, filterwarnings
 
+import cftime
 import iris
 import iris.aux_factory
 import iris.exceptions
+import numpy as np
 import yaml
 from cf_units import suppress_errors
 from iris.cube import CubeList
 
-from esmvalcore.exceptions import ESMValCoreDeprecationWarning
+from esmvalcore.cmor.check import CheckLevels
 from esmvalcore.iris_helpers import merge_cube_attributes
 
 from .._task import write_ncl_settings
-from ._time import extract_time
 
 logger = logging.getLogger(__name__)
 
@@ -96,13 +94,11 @@ def _get_attr_from_field_coord(ncfield, coord_name, attr):
     return None
 
 
-def concatenate_callback(raw_cube, field, _):
+def _load_callback(raw_cube, field, _):
     """Use this callback to fix anything Iris tries to break."""
     # Remove attributes that cause issues with merging and concatenation
-    _delete_attributes(
-        raw_cube,
-        ('creation_date', 'tracking_id', 'history', 'comment')
-    )
+    _delete_attributes(raw_cube,
+                       ('creation_date', 'tracking_id', 'history', 'comment'))
     for coord in raw_cube.coords():
         # Iris chooses to change longitude and latitude units to degrees
         # regardless of value in file, so reinstating file value
@@ -122,7 +118,6 @@ def _delete_attributes(iris_object, atts):
 
 def load(
     file: str | Path,
-    callback: Optional[Callable] = None,
     ignore_warnings: Optional[list[dict]] = None,
 ) -> CubeList:
     """Load iris cubes from string or Path objects.
@@ -131,11 +126,6 @@ def load(
     ----------
     file:
         File to be loaded. Could be string or POSIX Path object.
-    callback:
-        Callback function passed to :func:`iris.load_raw`.
-
-        .. deprecated:: 2.8.0
-            This argument will be removed in 2.10.0.
     ignore_warnings:
         Keyword arguments passed to :func:`warnings.filterwarnings` used to
         ignore warnings issued by :func:`iris.load_raw`. Each list element
@@ -150,16 +140,7 @@ def load(
     ------
     ValueError
         Cubes are empty.
-
     """
-    if not (callback is None or callback == 'default'):
-        msg = ("The argument `callback` has been deprecated in "
-               "ESMValCore version 2.8.0 and is scheduled for removal in "
-               "version 2.10.0.")
-        warnings.warn(msg, ESMValCoreDeprecationWarning)
-    if callback == 'default':
-        callback = concatenate_callback
-
     file = Path(file)
     logger.debug("Loading:\n%s", file)
 
@@ -191,7 +172,7 @@ def load(
         # warnings.filterwarnings
         # (see https://github.com/SciTools/cf-units/issues/240)
         with suppress_errors():
-            raw_cubes = iris.load_raw(file, callback=callback)
+            raw_cubes = iris.load_raw(file, callback=_load_callback)
     logger.debug("Done with loading %s", file)
 
     if not raw_cubes:
@@ -203,17 +184,136 @@ def load(
     return raw_cubes
 
 
-def _by_two_concatenation(cubes):
-    """Perform a by-2 concatenation to avoid gaps."""
-    concatenated = iris.cube.CubeList(cubes).concatenate()
-    if len(concatenated) == 1:
-        return concatenated[0]
+def _concatenate_cubes(cubes, check_level):
+    """Concatenate cubes according to the check_level."""
+    kwargs = {
+        'check_aux_coords': True,
+        'check_cell_measures': True,
+        'check_ancils': True,
+        'check_derived_coords': True
+    }
 
-    concatenated = _concatenate_overlapping_cubes(concatenated)
-    if len(concatenated) == 2:
-        _get_concatenation_error(concatenated)
-    else:
-        return concatenated[0]
+    if check_level > CheckLevels.DEFAULT:
+        kwargs = dict.fromkeys(kwargs, False)
+        logger.debug(
+            'Concatenation will be performed without checking '
+            'auxiliary coordinates, cell measures, ancillaries '
+            'and derived coordinates present in the cubes.', )
+
+    concatenated = iris.cube.CubeList(cubes).concatenate(**kwargs)
+
+    return concatenated
+
+
+class _TimesHelper:
+
+    def __init__(self, time):
+        self.times = time.core_points()
+        self.units = str(time.units)
+
+    def __getattr__(self, name):
+        return getattr(self.times, name)
+
+    def __len__(self):
+        return len(self.times)
+
+    def __getitem__(self, key):
+        return self.times[key]
+
+
+def _check_time_overlaps(cubes: iris.cube.CubeList) -> iris.cube.CubeList:
+    """Handle time overlaps.
+
+    Parameters
+    ----------
+    cubes : iris.cube.CubeList
+        A list of cubes belonging to a single timeseries,
+        ordered by starting point with possible overlaps.
+
+    Returns
+    -------
+    iris.cube.CubeList
+        A list of cubes belonging to a single timeseries,
+        ordered by starting point with no overlaps.
+    """
+    if len(cubes) < 2:
+        return cubes
+
+    class _TrackedCube(NamedTuple):
+        cube: iris.cube.Cube
+        times: iris.coords.DimCoord
+        start: float
+        end: float
+
+        @classmethod
+        def from_cube(cls, cube):
+            """Construct tracked cube."""
+            times = cube.coord("time")
+            start, end = times.core_points()[[0, -1]]
+            return cls(cube, times, start, end)
+
+    new_cubes = iris.cube.CubeList()
+    current_cube = _TrackedCube.from_cube(cubes[0])
+    for new_cube in map(_TrackedCube.from_cube, cubes[1:]):
+        if new_cube.start > current_cube.end:
+            # no overlap, use current cube and start again from new cube
+            logger.debug("Using %s", current_cube.cube)
+            new_cubes.append(current_cube.cube)
+            current_cube = new_cube
+            continue
+        # overlap
+        if current_cube.end > new_cube.end:
+            # current cube ends after new one, just forget new cube
+            logger.debug(
+                "Discarding %s because the time range "
+                "is already covered by %s", new_cube.cube, current_cube.cube)
+            continue
+        if new_cube.start == current_cube.start:
+            # new cube completely covers current one
+            # forget current cube
+            current_cube = new_cube
+            logger.debug(
+                "Discarding %s because the time range is covered by %s",
+                current_cube.cube, new_cube.cube)
+            continue
+        # new cube ends after current one,
+        # use all of new cube, and shorten current cube to
+        # eliminate overlap with new cube
+        cut_index = cftime.time2index(
+            new_cube.start,
+            _TimesHelper(current_cube.times),
+            current_cube.times.units.calendar,
+            select="before",
+        ) + 1
+        logger.debug("Using %s shortened to %s due to overlap",
+                     current_cube.cube,
+                     current_cube.times.cell(cut_index).point)
+        new_cubes.append(current_cube.cube[:cut_index])
+        current_cube = new_cube
+
+    logger.debug("Using %s", current_cube.cube)
+    new_cubes.append(current_cube.cube)
+
+    return new_cubes
+
+
+def _fix_calendars(cubes):
+    """Check and homogenise calendars, if possible."""
+    calendars = [cube.coord('time').units.calendar for cube in cubes]
+    unique_calendars = np.unique(calendars)
+
+    calendar_ocurrences = np.array(
+        [calendars.count(calendar) for calendar in unique_calendars])
+    calendar_index = int(
+        np.argwhere(calendar_ocurrences == calendar_ocurrences.max()))
+
+    for cube in cubes:
+        time_coord = cube.coord('time')
+        old_calendar = time_coord.units.calendar
+        if old_calendar != unique_calendars[calendar_index]:
+            new_unit = time_coord.units.change_calendar(
+                unique_calendars[calendar_index])
+            time_coord.units = new_unit
 
 
 def _get_concatenation_error(cubes):
@@ -233,28 +333,56 @@ def _get_concatenation_error(cubes):
     raise ValueError(f'Can not concatenate cubes: {msg}')
 
 
-def concatenate(cubes):
-    """Concatenate all cubes after fixing metadata."""
+def _sort_cubes_by_time(cubes):
+    """Sort CubeList by time coordinate."""
+    try:
+        cubes = sorted(cubes, key=lambda c: c.coord("time").cell(0).point)
+    except iris.exceptions.CoordinateNotFoundError as exc:
+        msg = "One or more cubes {} are missing".format(cubes) + \
+              " time coordinate: {}".format(str(exc))
+        raise ValueError(msg)
+    except TypeError as error:
+        msg = ("Cubes cannot be sorted "
+               f"due to differing time units: {str(error)}")
+        raise TypeError(msg) from error
+    return cubes
+
+
+def concatenate(cubes, check_level=CheckLevels.DEFAULT):
+    """Concatenate all cubes after fixing metadata.
+
+    Parameters
+    ----------
+    cubes: iterable of iris.cube.Cube
+        Data cubes to be concatenated
+    check_level: CheckLevels
+        Level of strictness of the checks in the concatenation.
+
+    Returns
+    -------
+    cube: iris.cube.Cube
+        Resulting concatenated cube.
+
+    Raises
+    ------
+    ValueError
+        Concatenation was not possible.
+    """
     if not cubes:
         return cubes
     if len(cubes) == 1:
         return cubes[0]
 
     merge_cube_attributes(cubes)
+    cubes = _sort_cubes_by_time(cubes)
+    _fix_calendars(cubes)
+    cubes = _check_time_overlaps(cubes)
+    result = _concatenate_cubes(cubes, check_level=check_level)
 
-    if len(cubes) > 1:
-        # order cubes by first time point
-        try:
-            cubes = sorted(cubes, key=lambda c: c.coord("time").cell(0).point)
-        except iris.exceptions.CoordinateNotFoundError as exc:
-            msg = "One or more cubes {} are missing".format(cubes) + \
-                  " time coordinate: {}".format(str(exc))
-            raise ValueError(msg)
-
-        # iteratively concatenate starting with first cube
-        result = cubes[0]
-        for cube in cubes[1:]:
-            result = _by_two_concatenation([result, cube])
+    if len(result) == 1:
+        result = result[0]
+    else:
+        _get_concatenation_error(result)
 
     _fix_aux_factories(result)
 
@@ -364,48 +492,6 @@ def _get_debug_filename(filename, step):
     return filename
 
 
-def cleanup(files, remove=None):
-    """Clean up after running the preprocessor.
-
-    Warning
-    -------
-    .. deprecated:: 2.8.0
-        This function is no longer used and has been deprecated since
-        ESMValCore version 2.8.0. It is scheduled for removal in version
-        2.10.0.
-
-    Parameters
-    ----------
-    files: list of Path
-        Preprocessor output files (will not be removed if not in `removed`).
-    remove: list of Path or None, optional (default: None)
-        Files or directories to remove.
-
-    Returns
-    -------
-    list of Path
-        Preprocessor output files.
-
-    """
-    deprecation_msg = (
-        "The preprocessor function `cleanup` has been deprecated in "
-        "ESMValCore version 2.8.0 and is scheduled for removal in version "
-        "2.10.0."
-    )
-    warnings.warn(deprecation_msg, ESMValCoreDeprecationWarning)
-
-    if remove is None:
-        remove = []
-
-    for path in remove:
-        if os.path.isdir(path):
-            shutil.rmtree(path)
-        elif os.path.isfile(path):
-            os.remove(path)
-
-    return files
-
-
 def _sort_products(products):
     """Sort preprocessor output files by their order in the recipe."""
     return sorted(
@@ -434,7 +520,7 @@ def write_metadata(products, write_ncl=False):
 
         output_filename = os.path.join(output_dir, 'metadata.yml')
         output_files.append(output_filename)
-        with open(output_filename, 'w') as file:
+        with open(output_filename, 'w', encoding='utf-8') as file:
             yaml.safe_dump(metadata, file)
         if write_ncl:
             output_files.append(_write_ncl_metadata(output_dir, metadata))
@@ -471,98 +557,3 @@ def _write_ncl_metadata(output_dir, metadata):
     write_ncl_settings(info, filename)
 
     return filename
-
-
-def _concatenate_overlapping_cubes(cubes):
-    """Concatenate time-overlapping cubes (two cubes only)."""
-    # we arrange [cube1, cube2] so that cube1.start <= cube2.start
-    if cubes[0].coord('time').points[0] <= cubes[1].coord('time').points[0]:
-        cubes = [cubes[0], cubes[1]]
-        logger.debug(
-            "Will attempt to concatenate cubes %s "
-            "and %s in this order", cubes[0], cubes[1])
-    else:
-        cubes = [cubes[1], cubes[0]]
-        logger.debug(
-            "Will attempt to concatenate cubes %s "
-            "and %s in this order", cubes[1], cubes[0])
-
-    # get time end points
-    time_1 = cubes[0].coord('time')
-    time_2 = cubes[1].coord('time')
-    if time_1.units != time_2.units:
-        raise ValueError(
-            f"Cubes\n{cubes[0]}\nand\n{cubes[1]}\ncan not be concatenated: "
-            f"time units {time_1.units}, calendar {time_1.units.calendar} "
-            f"and {time_2.units}, calendar {time_2.units.calendar} differ")
-    data_start_1 = time_1.cell(0).point
-    data_start_2 = time_2.cell(0).point
-    data_end_1 = time_1.cell(-1).point
-    data_end_2 = time_2.cell(-1).point
-
-    # case 1: both cubes start at the same time -> return longer cube
-    if data_start_1 == data_start_2:
-        if data_end_1 <= data_end_2:
-            logger.debug(
-                "Both cubes start at the same time but cube %s "
-                "ends before %s", cubes[0], cubes[1])
-            logger.debug("Cube %s contains all needed data so using it fully",
-                         cubes[1])
-            cubes = [cubes[1]]
-        else:
-            logger.debug(
-                "Both cubes start at the same time but cube %s "
-                "ends before %s", cubes[1], cubes[0])
-            logger.debug("Cube %s contains all needed data so using it fully",
-                         cubes[0])
-            cubes = [cubes[0]]
-
-    # case 2: cube1 starts before cube2
-    else:
-        # find time overlap, if any
-        start_overlap = next((time_1.units.num2date(t)
-                              for t in time_1.points if t in time_2.points),
-                             None)
-        # case 2.0: no overlap (new iris implementation does allow
-        # concatenation of cubes with no overlap)
-        if not start_overlap:
-            logger.debug(
-                "Unable to concatenate non-overlapping cubes\n%s\nand\n%s"
-                "separated in time.", cubes[0], cubes[1])
-        # case 2.1: cube1 ends after cube2 -> return cube1
-        elif data_end_1 > data_end_2:
-            cubes = [cubes[0]]
-            logger.debug("Using only data from %s", cubes[0])
-        # case 2.2: cube1 ends before cube2 -> use full cube2 and shorten cube1
-        else:
-            logger.debug(
-                "Extracting time slice between %s and %s from cube %s to use "
-                "it for concatenation with cube %s", "-".join([
-                    str(data_start_1.year),
-                    str(data_start_1.month),
-                    str(data_start_1.day)
-                ]), "-".join([
-                    str(start_overlap.year),
-                    str(start_overlap.month),
-                    str(start_overlap.day)
-                ]), cubes[0], cubes[1])
-            c1_delta = extract_time(cubes[0], data_start_1.year,
-                                    data_start_1.month, data_start_1.day,
-                                    start_overlap.year, start_overlap.month,
-                                    start_overlap.day)
-            # convert c1_delta scalar cube to vector cube, if needed
-            if c1_delta.shape == ():
-                c1_delta = iris.util.new_axis(c1_delta, scalar_coord="time")
-            cubes = iris.cube.CubeList([c1_delta, cubes[1]])
-            logger.debug("Attempting concatenatenation of %s with %s",
-                         c1_delta, cubes[1])
-            try:
-                cubes = [iris.cube.CubeList(cubes).concatenate_cube()]
-            except iris.exceptions.ConcatenateError as ex:
-                logger.error('Can not concatenate cubes: %s', ex)
-                logger.error('Cubes:')
-                for cube in cubes:
-                    logger.error(cube)
-                raise ex
-
-    return cubes
diff --git a/esmvalcore/preprocessor/_multimodel.py b/esmvalcore/preprocessor/_multimodel.py
index 0f862b0e90..7a36f140c1 100644
--- a/esmvalcore/preprocessor/_multimodel.py
+++ b/esmvalcore/preprocessor/_multimodel.py
@@ -7,11 +7,14 @@
 generalized functions that operate on iris cubes. These wrappers support
 grouped execution by passing a groupby keyword.
 """
+from __future__ import annotations
+
 import logging
-import re
 import warnings
+from collections.abc import Iterable
 from datetime import datetime
 from functools import reduce
+from typing import TYPE_CHECKING, Optional
 
 import cf_units
 import iris
@@ -28,62 +31,16 @@
 )
 
 from ._other import _group_products
+from ._shared import get_iris_aggregator
 
-logger = logging.getLogger(__name__)
+if TYPE_CHECKING:
+    from esmvalcore.preprocessor import PreprocessorFile
 
-STATISTIC_MAPPING = {
-    'gmean': iris.analysis.GMEAN,  # not lazy in iris
-    'hmean': iris.analysis.HMEAN,  # not lazy in iris
-    'max': iris.analysis.MAX,
-    'median': iris.analysis.MEDIAN,  # not lazy in iris
-    'min': iris.analysis.MIN,
-    'rms': iris.analysis.RMS,
-    'sum': iris.analysis.SUM,
-    'mean': iris.analysis.MEAN,
-    'std_dev': iris.analysis.STD_DEV,
-    'variance': iris.analysis.VARIANCE,
-    # The following require extra kwargs,
-    # atm this is only supported for percentiles via e.g. `pXX`
-    'count': iris.analysis.COUNT,
-    'peak': iris.analysis.PEAK,
-    'percentile': iris.analysis.PERCENTILE,  # not lazy in iris
-    'proportion': iris.analysis.PROPORTION,  # not lazy in iris
-    'wpercentile': iris.analysis.WPERCENTILE,  # not lazy in iris
-}
+logger = logging.getLogger(__name__)
 
 CONCAT_DIM = 'multi-model'
 
 
-def _resolve_operator(statistic: str):
-    """Find the operator corresponding to the statistic."""
-    statistic = statistic.lower()
-    kwargs = {}
-
-    # special cases
-    if statistic == 'std':
-        logger.warning(
-            "Changing statistics from specified `std` to `std_dev`, "
-            "since multimodel statistics is now using the iris.analysis module"
-            ", which also uses `std_dev`. Please consider replacing 'std' "
-            " with 'std_dev' in your recipe or code.")
-        statistic = 'std_dev'
-
-    elif re.match(r"^(p\d{1,2})(\.\d*)?$", statistic):
-        # percentiles between p0 and p99.99999...
-        percentile = float(statistic[1:])
-        kwargs['percent'] = percentile
-        statistic = 'percentile'
-
-    try:
-        operator = STATISTIC_MAPPING[statistic]
-    except KeyError as err:
-        raise ValueError(
-            f'Statistic `{statistic}` not supported by multicube statistics. '
-            f'Must be one of {tuple(STATISTIC_MAPPING.keys())}.') from err
-
-    return operator, kwargs
-
-
 def _get_consistent_time_unit(cubes):
     """Return cubes' time unit if consistent, standard calendar otherwise."""
     t_units = [cube.coord('time').units for cube in cubes]
@@ -587,7 +544,12 @@ def _compute(cubes: list, *, operator: iris.analysis.Aggregator, **kwargs):
     return result_cube
 
 
-def _multicube_statistics(cubes, statistics, span, ignore_scalar_coords=False):
+def _multicube_statistics(
+    cubes,
+    statistics,
+    span,
+    ignore_scalar_coords=False,
+):
     """Compute statistics over multiple cubes.
 
     Can be used e.g. for ensemble or multi-model statistics.
@@ -633,24 +595,35 @@ def _multicube_statistics(cubes, statistics, span, ignore_scalar_coords=False):
     # Calculate statistics
     statistics_cubes = {}
     lazy_input = any(cube.has_lazy_data() for cube in cubes)
-    for statistic in statistics:
-        logger.debug('Multicube statistics: computing: %s', statistic)
-        operator, kwargs = _resolve_operator(statistic)
-        if lazy_input and operator.lazy_func is not None:
-            result_cube = _compute(cubes, operator=operator, **kwargs)
-        else:
-            result_cube = _compute_eager(cubes, operator=operator, **kwargs)
-        statistics_cubes[statistic] = result_cube
+    for stat in statistics:
+        (stat_id, result_cube) = _compute_statistic(cubes, lazy_input, stat)
+        statistics_cubes[stat_id] = result_cube
 
     return statistics_cubes
 
 
-def _multiproduct_statistics(products,
-                             statistics,
-                             output_products,
-                             span=None,
-                             keep_input_datasets=None,
-                             ignore_scalar_coords=False):
+def _compute_statistic(cubes, lazy_input, statistic):
+    """Compute a single statistic."""
+    stat_id = _get_stat_identifier(statistic)
+    logger.debug('Multicube statistics: computing: %s', stat_id)
+
+    (operator, kwargs) = _get_operator_and_kwargs(statistic)
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **kwargs)
+    if lazy_input and agg.lazy_func is not None:
+        result_cube = _compute(cubes, operator=agg, **agg_kwargs)
+    else:
+        result_cube = _compute_eager(cubes, operator=agg, **agg_kwargs)
+    return (stat_id, result_cube)
+
+
+def _multiproduct_statistics(
+    products,
+    statistics,
+    output_products,
+    span=None,
+    keep_input_datasets=None,
+    ignore_scalar_coords=False,
+):
     """Compute multi-cube statistics on ESMValCore products.
 
     Extract cubes from products, calculate multicube statistics and
@@ -664,8 +637,8 @@ def _multiproduct_statistics(products,
         ignore_scalar_coords=ignore_scalar_coords,
     )
     statistics_products = set()
-    for statistic, cube in statistics_cubes.items():
-        statistics_product = output_products[statistic]
+    for stat_id, cube in statistics_cubes.items():
+        statistics_product = output_products[stat_id]
         statistics_product.cubes = [cube]
 
         for product in products:
@@ -680,13 +653,39 @@ def _multiproduct_statistics(products,
     return products | statistics_products
 
 
-def multi_model_statistics(products,
-                           span,
-                           statistics,
-                           output_products=None,
-                           groupby=None,
-                           keep_input_datasets=True,
-                           ignore_scalar_coords=False):
+def _get_operator_and_kwargs(statistic: str | dict) -> tuple[str, dict]:
+    """Get operator and kwargs from a single statistic."""
+    if isinstance(statistic, dict):
+        statistic = dict(statistic)
+        if 'operator' not in statistic:
+            raise ValueError(
+                f"`statistic` given as dictionary, but missing required key "
+                f"`operator`, got {statistic}"
+            )
+        operator = statistic.pop('operator')
+        kwargs = statistic
+    else:
+        operator = statistic
+        kwargs = {}
+    return (operator, kwargs)
+
+
+def _get_stat_identifier(statistic: str | dict) -> str:
+    (operator, kwargs) = _get_operator_and_kwargs(statistic)
+    if 'percent' in kwargs:
+        operator += str(kwargs['percent'])
+    return operator
+
+
+def multi_model_statistics(
+    products: set[PreprocessorFile] | Iterable[Cube],
+    span: str,
+    statistics: list[str],
+    output_products=None,
+    groupby: Optional[tuple] = None,
+    keep_input_datasets: bool = True,
+    ignore_scalar_coords: bool = False,
+) -> dict | set:
     """Compute multi-model statistics.
 
     This function computes multi-model statistics on a list of ``products``,
@@ -748,28 +747,27 @@ def multi_model_statistics(products,
 
     Parameters
     ----------
-    products: list
+    products:
         Cubes (or products) over which the statistics will be computed.
-    span: str
+    span:
         Overlap or full; if overlap, statitstics are computed on common time-
         span; if full, statistics are computed on full time spans, ignoring
         missing data. This option is ignored if input cubes do not have time
         dimensions.
-    statistics: list
-        Statistical metrics to be computed, e.g. [``mean``, ``max``]. Choose
-        from the operators listed in the iris.analysis package. Percentiles can
-        be specified like ``pXX.YY``.
+    statistics:
+        Statistical metrics to be computed, e.g. [``mean``, ``max``]. Allowed
+        options are given in :ref:`this table <supported_stat_operator>`.
     output_products: dict
         For internal use only. A dict with statistics names as keys and
         preprocessorfiles as values. If products are passed as input, the
         statistics cubes will be assigned to these output products.
-    groupby:  tuple
+    groupby:
         Group products by a given tag or attribute, e.g., ('project',
         'dataset', 'tag1'). This is ignored if ``products`` is a list of cubes.
-    keep_input_datasets: bool
+    keep_input_datasets:
         If True, the output will include the input datasets.
         If False, only the computed statistics will be returned.
-    ignore_scalar_coords: bool
+    ignore_scalar_coords:
         If True, remove any scalar coordinate in the input datasets before
         merging the input cubes into the multi-dataset cube. The resulting
         multi-dataset cube will have no scalar coordinates (the actual input
@@ -779,9 +777,9 @@ def multi_model_statistics(products,
 
     Returns
     -------
-    dict
-        A dictionary of statistics cubes with statistics' names as keys. (If
-        input type is products, then it will return a set of output_products.)
+    dict | set
+        A :obj:`dict` of cubes or :obj:`set` of `output_products` depending on
+        the type of `products`.
 
     Raises
     ------
@@ -822,9 +820,13 @@ def multi_model_statistics(products,
     )
 
 
-def ensemble_statistics(products, statistics,
-                        output_products, span='overlap',
-                        ignore_scalar_coords=False):
+def ensemble_statistics(
+    products: set[PreprocessorFile] | Iterable[Cube],
+    statistics: list[str],
+    output_products,
+    span: str = 'overlap',
+    ignore_scalar_coords: bool = False,
+) -> dict | set:
     """Entry point for ensemble statistics.
 
     An ensemble grouping is performed on the input products.
@@ -834,9 +836,9 @@ def ensemble_statistics(products, statistics,
 
     Parameters
     ----------
-    products: list
+    products:
         Cubes (or products) over which the statistics will be computed.
-    statistics: list
+    statistics:
         Statistical metrics to be computed, e.g. [``mean``, ``max``]. Choose
         from the operators listed in the iris.analysis package. Percentiles can
         be specified like ``pXX.YY``.
@@ -844,11 +846,11 @@ def ensemble_statistics(products, statistics,
         For internal use only. A dict with statistics names as keys and
         preprocessorfiles as values. If products are passed as input, the
         statistics cubes will be assigned to these output products.
-    span: str (default: 'overlap')
+    span:
         Overlap or full; if overlap, statitstics are computed on common time-
         span; if full, statistics are computed on full time spans, ignoring
         missing data.
-    ignore_scalar_coords: bool
+    ignore_scalar_coords:
         If True, remove any scalar coordinate in the input datasets before
         merging the input cubes into the multi-dataset cube. The resulting
         multi-dataset cube will have no scalar coordinates (the actual input
@@ -858,8 +860,9 @@ def ensemble_statistics(products, statistics,
 
     Returns
     -------
-    set
-        A set of output_products with the resulting ensemble statistics.
+    dict | set
+        A :obj:`dict` of cubes or :obj:`set` of `output_products` depending on
+        the type of `products`.
 
     See Also
     --------
diff --git a/esmvalcore/preprocessor/_rolling_window.py b/esmvalcore/preprocessor/_rolling_window.py
index f9fba77d93..485f5a5390 100644
--- a/esmvalcore/preprocessor/_rolling_window.py
+++ b/esmvalcore/preprocessor/_rolling_window.py
@@ -2,25 +2,36 @@
 
 import logging
 
-from ._shared import get_iris_analysis_operation
+from iris.cube import Cube
+
+from ._shared import get_iris_aggregator
 
 logger = logging.getLogger(__name__)
 
 
-def rolling_window_statistics(cube, coordinate, operator, window_length):
+def rolling_window_statistics(
+    cube: Cube,
+    coordinate: str,
+    operator: str,
+    window_length: int,
+    **operator_kwargs,
+):
     """Compute rolling-window statistics over a coordinate.
 
     Parameters
     ----------
-    cube : iris.cube.Cube
+    cube:
         Input cube.
-    coordinate : str
+    coordinate:
         Coordinate over which the rolling-window statistics is calculated.
-    operator : str
-        Select operator to apply. Available operators: ``'mean'``,
-        ``'median'``, ``'std_dev'``, ``'sum'``, ``'variance'``, ``'min'``,
-        ``'max'``.
-    window_length : int
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
+    window_length:
         Size of the window to use.
 
     Returns
@@ -28,15 +39,8 @@ def rolling_window_statistics(cube, coordinate, operator, window_length):
     iris.cube.Cube
         Rolling-window statistics cube.
 
-    Raises
-    ------
-    iris.exceptions.CoordinateNotFoundError:
-        Cube does not have time coordinate.
-    ValueError:
-        Invalid ``'operator'`` given.
     """
-    operation = get_iris_analysis_operation(operator)
-    # applying rolling wondow
-    cube = cube.rolling_window(coordinate, operation, window_length)
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+    cube = cube.rolling_window(coordinate, agg, window_length, *agg_kwargs)
 
     return cube
diff --git a/esmvalcore/preprocessor/_shared.py b/esmvalcore/preprocessor/_shared.py
index 89b6d13b32..09e98d6936 100644
--- a/esmvalcore/preprocessor/_shared.py
+++ b/esmvalcore/preprocessor/_shared.py
@@ -4,9 +4,17 @@
 Utility functions that can be used for multiple preprocessor steps
 """
 import logging
+import re
+import warnings
+from collections.abc import Callable
+from typing import Any, Optional
 
-import iris
 import iris.analysis
+import numpy as np
+from iris.coords import DimCoord
+from iris.cube import Cube
+
+from esmvalcore.exceptions import ESMValCoreDeprecationWarning
 
 logger = logging.getLogger(__name__)
 
@@ -21,51 +29,155 @@ def guess_bounds(cube, coords):
     return cube
 
 
-def get_iris_analysis_operation(operator):
-    """
-    Determine the iris analysis operator from a string.
+def get_iris_aggregator(
+    operator: str,
+    **operator_kwargs,
+) -> tuple[iris.analysis.Aggregator, dict]:
+    """Get :class:`iris.analysis.Aggregator` and keyword arguments.
 
-    Map string to functional operator.
+    Supports all available aggregators in :mod:`iris.analysis`.
 
     Parameters
     ----------
-    operator: str
-        A named operator.
+    operator:
+        A named operator that is used to search for aggregators. Will be
+        capitalized before searching for aggregators, i.e., `MEAN` **and**
+        `mean` will find :const:`iris.analysis.MEAN`.
+    **operator_kwargs:
+        Optional keyword arguments for the aggregator.
 
     Returns
     -------
-        function: A function from iris.analysis
+    tuple[iris.analysis.Aggregator, dict]
+        Object that can be used within :meth:`iris.cube.Cube.collapsed`,
+        :meth:`iris.cube.Cube.aggregated_by`, or
+        :meth:`iris.cube.Cube.rolling_window` and the corresponding keyword
+        arguments.
 
     Raises
     ------
     ValueError
-        operator not in allowed operators list.
-        allowed operators: mean, median, std_dev, sum, variance, min, max, rms
+        An invalid `operator` is specified, i.e., it is not found in
+        :mod:`iris.analysis` or the returned object is not an
+        :class:`iris.analysis.Aggregator`.
+
     """
-    operators = [
-        'mean', 'median', 'std_dev', 'sum', 'variance', 'min', 'max', 'rms'
-    ]
-    operator = operator.lower()
-    if operator not in operators:
-        raise ValueError("operator {} not recognised. "
-                         "Accepted values are: {}."
-                         "".format(operator, ', '.join(operators)))
-    operation = getattr(iris.analysis, operator.upper())
-    return operation
-
-
-def operator_accept_weights(operator):
+    cap_operator = operator.upper()
+    aggregator_kwargs = dict(operator_kwargs)
+
+    # Deprecations
+    if cap_operator == 'STD':
+        msg = (
+            f"The operator '{operator}' for computing the standard deviation "
+            f"has been deprecated in ESMValCore version 2.10.0 and is "
+            f"scheduled for removal in version 2.12.0. Please use 'std_dev' "
+            f"instead. This is an exact replacement."
+        )
+        warnings.warn(msg, ESMValCoreDeprecationWarning)
+        operator = 'std_dev'
+        cap_operator = 'STD_DEV'
+    elif re.match(r"^(P\d{1,2})(\.\d*)?$", cap_operator):
+        msg = (
+            f"Specifying percentile operators with the syntax 'pXX.YY' (here: "
+            f"'{operator}') has been deprecated in ESMValCore version 2.10.0 "
+            f"and is scheduled for removal in version 2.12.0. Please use "
+            f"`operator='percentile'` with the keyword argument "
+            f"`percent=XX.YY` instead. Example: `percent=95.0` for 'p95.0'. "
+            f"This is an exact replacement."
+        )
+        warnings.warn(msg, ESMValCoreDeprecationWarning)
+        aggregator_kwargs['percent'] = float(operator[1:])
+        operator = 'percentile'
+        cap_operator = 'PERCENTILE'
+
+    # Check if valid aggregator is found
+    if not hasattr(iris.analysis, cap_operator):
+        raise ValueError(
+            f"Aggregator '{operator}' not found in iris.analysis module"
+        )
+    aggregator = getattr(iris.analysis, cap_operator)
+    if not hasattr(aggregator, 'aggregate'):
+        raise ValueError(
+            f"Aggregator {aggregator} found by '{operator}' is not a valid "
+            f"iris.analysis.Aggregator"
+        )
+
+    # Use dummy cube to check if aggregator_kwargs are valid
+    x_coord = DimCoord([1.0], bounds=[0.0, 2.0], var_name='x')
+    cube = Cube([0.0], dim_coords_and_dims=[(x_coord, 0)])
+    test_kwargs = update_weights_kwargs(
+        aggregator, aggregator_kwargs, np.array([1.0])
+    )
+    try:
+        cube.collapsed('x', aggregator, **test_kwargs)
+    except (ValueError, TypeError) as exc:
+        raise ValueError(
+            f"Invalid kwargs for operator '{operator}': {str(exc)}"
+        )
+
+    return (aggregator, aggregator_kwargs)
+
+
+def aggregator_accept_weights(aggregator: iris.analysis.Aggregator) -> bool:
+    """Check if aggregator support weights.
+
+    Parameters
+    ----------
+    aggregator:
+        Aggregator to check.
+
+    Returns
+    -------
+    bool
+        ``True`` if aggregator support weights, ``False`` otherwise.
+
     """
-    Get if operator support weights.
+    weighted_aggregators_cls = (
+        iris.analysis.WeightedAggregator,
+        iris.analysis.WeightedPercentileAggregator,
+    )
+    return isinstance(aggregator, weighted_aggregators_cls)
+
+
+def update_weights_kwargs(
+    aggregator: iris.analysis.Aggregator,
+    kwargs: dict,
+    weights: Any,
+    cube: Optional[Cube] = None,
+    callback: Optional[Callable] = None,
+    **callback_kwargs,
+) -> dict:
+    """Update weights keyword argument.
 
     Parameters
     ----------
-    operator: str
-        A named operator.
+    aggregator:
+        Iris aggregator.
+    kwargs:
+        Keyword arguments to update.
+    weights:
+        Object which will be used as weights if supported and desired.
+    cube:
+        Cube which can be updated through the callback (if not None) if weights
+        are used.
+    callback:
+        Optional callback function with signature `f(cube: iris.cube.Cube,
+        **kwargs) -> None`. Should update the cube given to this function
+        in-place. Is called only when weights are used and cube is not None.
+    **callback_kwargs:
+        Optional keyword arguments passed to `callback`.
 
     Returns
     -------
-        bool: True if operator support weights, False otherwise
+    dict
+        Updated keyword arguments.
 
     """
-    return operator.lower() in ('mean', 'sum', 'rms')
+    kwargs = dict(kwargs)
+    if aggregator_accept_weights(aggregator) and kwargs.get('weights', True):
+        kwargs['weights'] = weights
+        if cube is not None and callback is not None:
+            callback(cube, **callback_kwargs)
+    else:
+        kwargs.pop('weights', None)
+    return kwargs
diff --git a/esmvalcore/preprocessor/_supplementary_vars.py b/esmvalcore/preprocessor/_supplementary_vars.py
index 8813735098..d5cb0e2d31 100644
--- a/esmvalcore/preprocessor/_supplementary_vars.py
+++ b/esmvalcore/preprocessor/_supplementary_vars.py
@@ -1,22 +1,11 @@
 """Preprocessor functions for ancillary variables and cell measures."""
 
 import logging
-import warnings
-from pathlib import Path
 from typing import Iterable
 
-import dask.array as da
 import iris.coords
 import iris.cube
 
-from esmvalcore.cmor.check import cmor_check_data, cmor_check_metadata
-from esmvalcore.cmor.fix import fix_data, fix_metadata
-from esmvalcore.config import CFG
-from esmvalcore.config._config import get_ignored_warnings
-from esmvalcore.exceptions import ESMValCoreDeprecationWarning
-from esmvalcore.preprocessor._io import concatenate, load
-from esmvalcore.preprocessor._time import clip_timerange
-
 logger = logging.getLogger(__name__)
 
 PREPROCESSOR_SUPPLEMENTARIES = {}
@@ -50,62 +39,6 @@ def wrapper(func):
     return wrapper
 
 
-def _load_fx(var_cube, fx_info, check_level):
-    """Load and CMOR-check fx variables."""
-    fx_cubes = iris.cube.CubeList()
-
-    project = fx_info['project']
-    mip = fx_info['mip']
-    short_name = fx_info['short_name']
-    freq = fx_info['frequency']
-
-    for fx_file in fx_info['filename']:
-        ignored_warnings = get_ignored_warnings(project, 'load')
-        loaded_cube = load(fx_file, ignore_warnings=ignored_warnings)
-        loaded_cube = fix_metadata(loaded_cube,
-                                   check_level=check_level,
-                                   **fx_info)
-        fx_cubes.append(loaded_cube[0])
-
-    fx_cube = concatenate(fx_cubes)
-
-    if freq != 'fx':
-        fx_cube = clip_timerange(fx_cube, fx_info['timerange'])
-
-    if not _is_fx_broadcastable(fx_cube, var_cube):
-        return None
-
-    fx_cube = cmor_check_metadata(fx_cube,
-                                  cmor_table=project,
-                                  mip=mip,
-                                  short_name=short_name,
-                                  frequency=freq,
-                                  check_level=check_level)
-
-    fx_cube = fix_data(fx_cube, check_level=check_level, **fx_info)
-
-    fx_cube = cmor_check_data(fx_cube,
-                              cmor_table=project,
-                              mip=mip,
-                              short_name=fx_cube.var_name,
-                              frequency=freq,
-                              check_level=check_level)
-
-    return fx_cube
-
-
-def _is_fx_broadcastable(fx_cube, cube):
-    try:
-        da.broadcast_to(fx_cube.core_data(), cube.shape)
-    except ValueError as exc:
-        logger.debug(
-            "Dimensions of %s and %s cubes do not match. "
-            "Discarding use of fx_variable: %s", cube.var_name,
-            fx_cube.var_name, exc)
-        return False
-    return True
-
-
 def add_cell_measure(cube, cell_measure_cube, measure):
     """Add a cube as a cell_measure in the cube containing the data.
 
@@ -172,56 +105,6 @@ def add_ancillary_variable(cube, ancillary_cube):
                  ancillary_cube.var_name, cube.var_name)
 
 
-def add_fx_variables(cube, fx_variables, check_level):
-    """Load requested fx files, check with CMOR standards and add the fx
-    variables as cell measures or ancillary variables in the cube containing
-    the data.
-
-    .. deprecated:: 2.8.0
-        This function is deprecated and will be removed in version 2.10.0.
-        Please use a :class:`esmvalcore.dataset.Dataset` or
-        :func:`esmvalcore.preprocessor.add_supplementary_variables`
-        instead.
-
-    Parameters
-    ----------
-    cube: iris.cube.Cube
-        Iris cube with input data.
-    fx_variables: dict
-        Dictionary with fx_variable information.
-    check_level: CheckLevels
-        Level of strictness of the checks.
-
-    Returns
-    -------
-    iris.cube.Cube
-        Cube with added cell measures or ancillary variables.
-    """
-    msg = (
-        "The function `add_fx_variables` has been deprecated in "
-        "ESMValCore version 2.8.0 and is scheduled for removal in "
-        "version 2.10.0. Use a `esmvalcore.dataset.Dataset` or the function "
-        "`add_supplementary_variables` instead.")
-    warnings.warn(msg, ESMValCoreDeprecationWarning)
-    if not fx_variables:
-        return cube
-    fx_cubes = []
-    for fx_info in fx_variables.values():
-        if not fx_info:
-            continue
-        if isinstance(fx_info['filename'], (str, Path)):
-            fx_info['filename'] = [fx_info['filename']]
-        fx_cube = _load_fx(cube, fx_info, check_level)
-
-        if fx_cube is None:
-            continue
-
-        fx_cubes.append(fx_cube)
-
-    add_supplementary_variables(cube, fx_cubes)
-    return cube
-
-
 def add_supplementary_variables(
     cube: iris.cube.Cube,
     supplementary_cubes: Iterable[iris.cube.Cube],
@@ -246,9 +129,6 @@ def add_supplementary_variables(
         'volcello': 'volume'
     }
     for supplementary_cube in supplementary_cubes:
-        if (CFG['use_legacy_supplementaries']
-                and not _is_fx_broadcastable(supplementary_cube, cube)):
-            continue
         if supplementary_cube.var_name in measure_names:
             measure_name = measure_names[supplementary_cube.var_name]
             add_cell_measure(cube, supplementary_cube, measure_name)
@@ -280,31 +160,3 @@ def remove_supplementary_variables(cube: iris.cube.Cube):
         for variable in cube.ancillary_variables():
             cube.remove_ancillary_variable(variable)
     return cube
-
-
-def remove_fx_variables(cube):
-    """Remove fx variables present as cell measures or ancillary variables in
-    the cube containing the data.
-
-    .. deprecated:: 2.8.0
-        This function is deprecated and will be removed in version 2.10.0.
-        Please use
-        :func:`esmvalcore.preprocessor.remove_supplementary_variables`
-        instead.
-
-    Parameters
-    ----------
-    cube: iris.cube.Cube
-        Iris cube with data and cell measures or ancillary variables.
-
-    Returns
-    -------
-    iris.cube.Cube
-        Cube without cell measures or ancillary variables.
-    """
-    msg = ("The function `remove_fx_variables` has been deprecated in "
-           "ESMValCore version 2.8.0 and is scheduled for removal in "
-           "version 2.10.0. Use the function `remove_supplementary_variables` "
-           "instead.")
-    warnings.warn(msg, ESMValCoreDeprecationWarning)
-    return remove_supplementary_variables(cube)
diff --git a/esmvalcore/preprocessor/_time.py b/esmvalcore/preprocessor/_time.py
index 5de60f35ac..7d5e7ed603 100644
--- a/esmvalcore/preprocessor/_time.py
+++ b/esmvalcore/preprocessor/_time.py
@@ -3,26 +3,31 @@
 Allows for selecting data subsets using certain time bounds;
 constructing seasonal and area averages.
 """
+from __future__ import annotations
+
 import copy
 import datetime
 import logging
-from typing import Union
+import warnings
+from typing import Iterable, Optional
 from warnings import filterwarnings
 
 import dask.array as da
+import dask.config
 import iris
 import iris.coord_categorisation
-import iris.cube
 import iris.exceptions
 import iris.util
 import isodate
 import numpy as np
+from iris.coords import AuxCoord
+from iris.cube import Cube, CubeList
 from iris.time import PartialDateTime
 
-from esmvalcore.cmor.check import _get_next_month, _get_time_bounds
+from esmvalcore.cmor.fixes import get_next_month, get_time_bounds
 from esmvalcore.iris_helpers import date2num
 
-from ._shared import get_iris_analysis_operation, operator_accept_weights
+from ._shared import get_iris_aggregator, update_weights_kwargs
 
 logger = logging.getLogger(__name__)
 
@@ -44,8 +49,15 @@
     )
 
 
-def extract_time(cube, start_year, start_month, start_day, end_year, end_month,
-                 end_day):
+def extract_time(
+    cube: Cube,
+    start_year: int,
+    start_month: int,
+    start_day: int,
+    end_year: int,
+    end_month: int,
+    end_day: int,
+) -> Cube:
     """Extract a time range from a cube.
 
     Given a time range passed in as a series of years, months and days, it
@@ -54,20 +66,20 @@ def extract_time(cube, start_year, start_month, start_day, end_year, end_month,
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-    start_year: int
-        start year
-    start_month: int
-        start month
-    start_day: int
-        start day
-    end_year: int
-        end year
-    end_month: int
-        end month
-    end_day: int
-        end day
+    cube:
+        Input cube.
+    start_year:
+        Start year.
+    start_month:
+        Start month.
+    start_day:
+        Start day.
+    end_year:
+        End year.
+    end_month:
+        End month.
+    end_day:
+        End day.
 
     Returns
     -------
@@ -77,7 +89,8 @@ def extract_time(cube, start_year, start_month, start_day, end_year, end_month,
     Raises
     ------
     ValueError
-        if time ranges are outside the cube time limits
+        Time ranges are outside the cube time limits.
+
     """
     t_1 = PartialDateTime(year=int(start_year),
                           month=int(start_month),
@@ -117,7 +130,7 @@ def _parse_end_date(date):
         if len(date) == 4:
             end_date = datetime.datetime(int(date) + 1, 1, 1, 0, 0, 0)
         elif len(date) == 6:
-            month, year = _get_next_month(int(date[4:]), int(date[0:4]))
+            month, year = get_next_month(int(date[4:]), int(date[0:4]))
             end_date = datetime.datetime(year, month, 1, 0, 0, 0)
         else:
             try:
@@ -136,10 +149,7 @@ def _duration_to_date(duration, reference, sign):
     return date
 
 
-def _select_timeslice(
-    cube: iris.cube.Cube,
-    select: np.ndarray,
-) -> Union[iris.cube.Cube, None]:
+def _select_timeslice(cube: Cube, select: np.ndarray) -> Cube | None:
     """Slice a cube along its time axis."""
     if select.any():
         coord = cube.coord('time')
@@ -157,10 +167,10 @@ def _select_timeslice(
 
 
 def _extract_datetime(
-    cube: iris.cube.Cube,
+    cube: Cube,
     start_datetime: PartialDateTime,
     end_datetime: PartialDateTime,
-) -> iris.cube.Cube:
+) -> Cube:
     """Extract a time range from a cube.
 
     Given a time range passed in as a datetime.datetime object, it
@@ -169,12 +179,12 @@ def _extract_datetime(
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-    start_datetime: PartialDateTime
-        start datetime
-    end_datetime: PartialDateTime
-        end datetime
+    cube:
+        Input cube.
+    start_datetime:
+        Start datetime
+    end_datetime:
+        End datetime
 
     Returns
     -------
@@ -221,14 +231,14 @@ def dt2str(time: PartialDateTime) -> str:
     return cube_slice
 
 
-def clip_timerange(cube, timerange):
+def clip_timerange(cube: Cube, timerange: str) -> Cube:
     """Extract time range with a resolution up to seconds.
 
     Parameters
     ----------
-    cube : iris.cube.Cube
+    cube:
         Input cube.
-    timerange : str
+    timerange: str
         Time range in ISO 8601 format.
 
     Returns
@@ -240,12 +250,10 @@ def clip_timerange(cube, timerange):
     ------
     ValueError
         Time ranges are outside the cube's time limits.
-    """
-    start_date = timerange.split('/')[0]
-    start_date = _parse_start_date(start_date)
 
-    end_date = timerange.split('/')[1]
-    end_date = _parse_end_date(end_date)
+    """
+    start_date = _parse_start_date(timerange.split('/')[0])
+    end_date = _parse_end_date(timerange.split('/')[1])
 
     if isinstance(start_date, isodate.duration.Duration):
         start_date = _duration_to_date(start_date, end_date, sign=-1)
@@ -280,14 +288,14 @@ def clip_timerange(cube, timerange):
     return _extract_datetime(cube, t_1, t_2)
 
 
-def extract_season(cube, season):
+def extract_season(cube: Cube, season: str) -> Cube:
     """Slice cube to get only the data belonging to a specific season.
 
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Original data
-    season: str
+    season:
         Season to extract. Available: DJF, MAM, JJA, SON
         and all sequentially correct combinations: e.g. JJAS
 
@@ -299,7 +307,8 @@ def extract_season(cube, season):
     Raises
     ------
     ValueError
-        if requested season is not present in the cube
+        Requested season is not present in the cube.
+
     """
     season = season.upper()
 
@@ -334,25 +343,26 @@ def extract_season(cube, season):
     return result
 
 
-def extract_month(cube, month):
+def extract_month(cube: Cube, month: int) -> Cube:
     """Slice cube to get only the data belonging to a specific month.
 
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Original data
-    month: int
-        Month to extract as a number from 1 to 12
+    month:
+        Month to extract as a number from 1 to 12.
 
     Returns
     -------
     iris.cube.Cube
-        data cube for specified month.
+        Cube for specified month.
 
     Raises
     ------
     ValueError
-        if requested month is not present in the cube
+        Requested month is not present in the cube.
+
     """
     if month not in range(1, 13):
         raise ValueError('Please provide a month number between 1 and 12.')
@@ -366,18 +376,19 @@ def extract_month(cube, month):
     return result
 
 
-def get_time_weights(cube):
+def get_time_weights(cube: Cube) -> np.ndarray | da.core.Array:
     """Compute the weighting of the time axis.
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
+    cube:
+        Input cube.
 
     Returns
     -------
-    numpy.array
+    np.ndarray or da.core.Array
         Array of time weights for averaging.
+
     """
     time = cube.coord('time')
     coord_dims = cube.coord_dims('time')
@@ -387,8 +398,8 @@ def get_time_weights(cube):
     if len(coord_dims) > 1:
         raise ValueError(
             f"Weighted statistical operations are not supported for "
-            f"{len(coord_dims):d}D time coordinates, expected "
-            f"0D or 1D")
+            f"{len(coord_dims):d}D time coordinates, expected 0D or 1D"
+        )
 
     # Extract 1D time weights (= lengths of time intervals)
     time_weights = time.core_bounds()[:, 1] - time.core_bounds()[:, 0]
@@ -425,28 +436,36 @@ def _aggregate_time_fx(result_cube, source_cube):
                                                    ancillary_dims)
 
 
-def hourly_statistics(cube, hours, operator='mean'):
+def hourly_statistics(
+    cube: Cube,
+    hours: int,
+    operator: str = 'mean',
+    **operator_kwargs,
+) -> Cube:
     """Compute hourly statistics.
 
     Chunks time in x hours periods and computes statistics over them.
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-
-    hours: int
-        Number of hours per period. Must be a divisor of 24
-        (1, 2, 3, 4, 6, 8, 12)
-
-    operator: str, optional
-        Select operator to apply.
-        Available operators: 'mean', 'median', 'std_dev', 'sum', 'min', 'max'
+    cube:
+        Input cube.
+    hours:
+        Number of hours per period. Must be a divisor of 24, i.e., (1, 2, 3, 4,
+        6, 8, 12).
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
     iris.cube.Cube
-        Hourly statistics cube
+        Hourly statistics cube.
+
     """
     if not cube.coords('hour_group'):
         iris.coord_categorisation.add_categorised_coord(
@@ -460,9 +479,10 @@ def hourly_statistics(cube, hours, operator='mean'):
     if not cube.coords('year'):
         iris.coord_categorisation.add_year(cube, 'time')
 
-    operator = get_iris_analysis_operation(operator)
-    result = cube.aggregated_by(['hour_group', 'day_of_year', 'year'],
-                                operator)
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+    result = cube.aggregated_by(
+        ['hour_group', 'day_of_year', 'year'], agg, **agg_kwargs
+    )
 
     result.remove_coord('hour_group')
     result.remove_coord('day_of_year')
@@ -471,97 +491,116 @@ def hourly_statistics(cube, hours, operator='mean'):
     return result
 
 
-def daily_statistics(cube, operator='mean'):
+def daily_statistics(
+    cube: Cube,
+    operator: str = 'mean',
+    **operator_kwargs,
+) -> Cube:
     """Compute daily statistics.
 
     Chunks time in daily periods and computes statistics over them;
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-
-    operator: str, optional
-        Select operator to apply.
-        Available operators: 'mean', 'median', 'std_dev', 'sum', 'min',
-        'max', 'rms'
+    cube:
+        Input cube.
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
     iris.cube.Cube
-        Daily statistics cube
+        Daily statistics cube.
+
     """
     if not cube.coords('day_of_year'):
         iris.coord_categorisation.add_day_of_year(cube, 'time')
     if not cube.coords('year'):
         iris.coord_categorisation.add_year(cube, 'time')
 
-    operator = get_iris_analysis_operation(operator)
-    result = cube.aggregated_by(['day_of_year', 'year'], operator)
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+    result = cube.aggregated_by(['day_of_year', 'year'], agg, **agg_kwargs)
 
     result.remove_coord('day_of_year')
     result.remove_coord('year')
     return result
 
 
-def monthly_statistics(cube, operator='mean'):
+def monthly_statistics(
+    cube: Cube,
+    operator: str = 'mean',
+    **operator_kwargs,
+) -> Cube:
     """Compute monthly statistics.
 
     Chunks time in monthly periods and computes statistics over them;
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-
-    operator: str, optional
-        Select operator to apply.
-        Available operators: 'mean', 'median', 'std_dev', 'sum', 'min',
-        'max', 'rms'
+    cube:
+        Input cube.
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
     iris.cube.Cube
-        Monthly statistics cube
+        Monthly statistics cube.
+
     """
     if not cube.coords('month_number'):
         iris.coord_categorisation.add_month_number(cube, 'time')
     if not cube.coords('year'):
         iris.coord_categorisation.add_year(cube, 'time')
 
-    operator = get_iris_analysis_operation(operator)
-    result = cube.aggregated_by(['month_number', 'year'], operator)
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+    result = cube.aggregated_by(['month_number', 'year'], agg, **agg_kwargs)
     _aggregate_time_fx(result, cube)
     return result
 
 
-def seasonal_statistics(cube,
-                        operator='mean',
-                        seasons=('DJF', 'MAM', 'JJA', 'SON')):
+def seasonal_statistics(
+    cube: Cube,
+    operator: str = 'mean',
+    seasons: Iterable[str] = ('DJF', 'MAM', 'JJA', 'SON'),
+    **operator_kwargs,
+) -> Cube:
     """Compute seasonal statistics.
 
     Chunks time seasons and computes statistics over them.
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-
-    operator: str, optional
-        Select operator to apply.
-        Available operators: 'mean', 'median', 'std_dev', 'sum', 'min',
-        'max', 'rms'
-
-    seasons: list or tuple of str, optional
+    cube:
+        Input cube.
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    seasons:
         Seasons to build. Available: ('DJF', 'MAM', 'JJA', SON') (default)
         and all sequentially correct combinations holding every month
         of a year: e.g. ('JJAS','ONDJFMAM'), or less in case of prior season
         extraction.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
     iris.cube.Cube
-        Seasonal statistic cube
+        Seasonal statistic cube.
+
     """
     seasons = tuple(sea.upper() for sea in seasons)
 
@@ -587,26 +626,28 @@ def seasonal_statistics(cube,
                                                   name='season_year',
                                                   seasons=seasons)
 
-    operator = get_iris_analysis_operation(operator)
-
-    result = cube.aggregated_by(['clim_season', 'season_year'], operator)
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+    result = cube.aggregated_by(
+        ['clim_season', 'season_year'], agg, **agg_kwargs
+    )
 
     # CMOR Units are days so we are safe to operate on days
     # Ranging on [29, 31] days makes this calendar-independent
     # the only season this could not work is 'F' but this raises an
     # ValueError
-    def spans_full_season(cube):
+    def spans_full_season(cube: Cube) -> list[bool]:
         """Check for all month present in the season.
 
         Parameters
         ----------
-        cube: iris.cube.Cube
-            input cube.
+        cube:
+            Input cube.
 
         Returns
         -------
-        bool
-            truth statement if time bounds are within (month*29, month*31)
+        list[bool]
+            Truth statements if time bounds are within (month*29, month*31)
+
         """
         time = cube.coord('time')
         num_days = [(tt.bounds[0, 1] - tt.bounds[0, 0]) for tt in time]
@@ -622,7 +663,11 @@ def spans_full_season(cube):
     return result
 
 
-def annual_statistics(cube, operator='mean'):
+def annual_statistics(
+    cube: Cube,
+    operator: str = 'mean',
+    **operator_kwargs,
+) -> Cube:
     """Compute annual statistics.
 
     Note that this function does not weight the annual mean if
@@ -631,32 +676,39 @@ def annual_statistics(cube, operator='mean'):
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-
-    operator: str, optional
-        Select operator to apply.
-        Available operators: 'mean', 'median', 'std_dev', 'sum', 'min',
-        'max', 'rms'
+    cube:
+        Input cube.
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
     iris.cube.Cube
-        Annual statistics cube
+        Annual statistics cube.
+
     """
     # TODO: Add weighting in time dimension. See iris issue 3290
     # https://github.com/SciTools/iris/issues/3290
 
-    operator = get_iris_analysis_operation(operator)
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
 
     if not cube.coords('year'):
         iris.coord_categorisation.add_year(cube, 'time')
-    result = cube.aggregated_by('year', operator)
+    result = cube.aggregated_by('year', agg, **agg_kwargs)
     _aggregate_time_fx(result, cube)
     return result
 
 
-def decadal_statistics(cube, operator='mean'):
+def decadal_statistics(
+    cube: Cube,
+    operator: str = 'mean',
+    **operator_kwargs,
+) -> Cube:
     """Compute decadal statistics.
 
     Note that this function does not weight the decadal mean if
@@ -665,23 +717,26 @@ def decadal_statistics(cube, operator='mean'):
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-
-    operator: str, optional
-        Select operator to apply.
-        Available operators: 'mean', 'median', 'std_dev', 'sum', 'min',
-        'max', 'rms'
+    cube:
+        Input cube.
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
     iris.cube.Cube
-        Decadal statistics cube
+        Decadal statistics cube.
+
     """
     # TODO: Add weighting in time dimension. See iris issue 3290
     # https://github.com/SciTools/iris/issues/3290
 
-    operator = get_iris_analysis_operation(operator)
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
 
     if not cube.coords('decade'):
 
@@ -692,88 +747,123 @@ def get_decade(coord, value):
 
         iris.coord_categorisation.add_categorised_coord(
             cube, 'decade', 'time', get_decade)
-    result = cube.aggregated_by('decade', operator)
+    result = cube.aggregated_by('decade', agg, **agg_kwargs)
     _aggregate_time_fx(result, cube)
     return result
 
 
-def climate_statistics(cube,
-                       operator='mean',
-                       period='full',
-                       seasons=('DJF', 'MAM', 'JJA', 'SON')):
+def climate_statistics(
+    cube: Cube,
+    operator: str = 'mean',
+    period: str = 'full',
+    seasons: Iterable[str] = ('DJF', 'MAM', 'JJA', 'SON'),
+    **operator_kwargs,
+) -> Cube:
     """Compute climate statistics with the specified granularity.
 
     Computes statistics for the whole dataset. It is possible to get them for
     the full period or with the data grouped by hour, day, month or season.
 
+    Note
+    ----
+    The `mean`, `sum` and `rms` operations over the `full` period are weighted
+    by the time coordinate, i.e., the length of the time intervals. For `sum`,
+    the units of the resulting cube will be multiplied by corresponding time
+    units (e.g., days).
+
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Input cube.
-
-    operator: str, optional
-        Select operator to apply.
-        Available operators: 'mean', 'median', 'std_dev', 'sum', 'min',
-        'max', 'rms'.
-
-    period: str, optional
-        Period to compute the statistic over.
-        Available periods: 'full', 'season', 'seasonal', 'monthly', 'month',
-        'mon', 'daily', 'day', 'hourly', 'hour', 'hr'.
-
-    seasons: list or tuple of str, optional
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    period:
+        Period to compute the statistic over. Available periods: `full`,
+        `season`, `seasonal`, `monthly`, `month`, `mon`, `daily`, `day`,
+        `hourly`, `hour`, `hr`.
+    seasons:
         Seasons to use if needed. Defaults to ('DJF', 'MAM', 'JJA', 'SON').
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
     iris.cube.Cube
         Climate statistics cube.
-
     """
     original_dtype = cube.dtype
     period = period.lower()
 
+    # Use Cube.collapsed when full period is requested
     if period in ('full', ):
-        operator_method = get_iris_analysis_operation(operator)
-        if operator_accept_weights(operator):
-            time_weights = get_time_weights(cube)
-            if time_weights.min() == time_weights.max():
-                # No weighting needed.
-                clim_cube = cube.collapsed('time', operator_method)
-            else:
-                clim_cube = cube.collapsed('time',
-                                           operator_method,
-                                           weights=time_weights)
-        else:
-            clim_cube = cube.collapsed('time', operator_method)
+        (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+        agg_kwargs = update_weights_kwargs(
+            agg, agg_kwargs, '_time_weights_', cube, _add_time_weights_coord
+        )
+        with warnings.catch_warnings():
+            warnings.filterwarnings(
+                'ignore',
+                message=(
+                    "Cannot check if coordinate is contiguous: Invalid "
+                    "operation for '_time_weights_'"
+                ),
+                category=UserWarning,
+                module='iris',
+            )
+            clim_cube = cube.collapsed('time', agg, **agg_kwargs)
+
+        # Make sure input and output cubes do not have auxiliary coordinate
+        if cube.coords('_time_weights_'):
+            cube.remove_coord('_time_weights_')
+        if clim_cube.coords('_time_weights_'):
+            clim_cube.remove_coord('_time_weights_')
+
+    # Use Cube.aggregated_by for other periods
     else:
         clim_coord = _get_period_coord(cube, period, seasons)
-        operator = get_iris_analysis_operation(operator)
-        clim_cube = cube.aggregated_by(clim_coord, operator)
+        (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+        clim_cube = cube.aggregated_by(clim_coord, agg, **agg_kwargs)
         clim_cube.remove_coord('time')
         _aggregate_time_fx(clim_cube, cube)
         if clim_cube.coord(clim_coord.name()).is_monotonic():
             iris.util.promote_aux_coord_to_dim_coord(clim_cube,
                                                      clim_coord.name())
         else:
-            clim_cube = iris.cube.CubeList(
+            clim_cube = CubeList(
                 clim_cube.slices_over(clim_coord.name())).merge_cube()
         cube.remove_coord(clim_coord)
 
+    # Make sure that original dtype is preserved
     new_dtype = clim_cube.dtype
     if original_dtype != new_dtype:
         logger.debug(
             "climate_statistics changed dtype from "
             "%s to %s, changing back", original_dtype, new_dtype)
         clim_cube.data = clim_cube.core_data().astype(original_dtype)
+
     return clim_cube
 
 
-def anomalies(cube,
-              period,
-              reference=None,
-              standardize=False,
-              seasons=('DJF', 'MAM', 'JJA', 'SON')):
+def _add_time_weights_coord(cube):
+    """Add time weight coordinate to cube (in-place)."""
+    time_weights_coord = AuxCoord(
+        get_time_weights(cube),
+        long_name='_time_weights_',
+        units=cube.coord('time').units,
+    )
+    cube.add_aux_coord(time_weights_coord, cube.coord_dims('time'))
+
+
+def anomalies(
+    cube: Cube,
+    period: str,
+    reference: Optional[dict] = None,
+    standardize: bool = False,
+    seasons: Iterable[str] = ('DJF', 'MAM', 'JJA', 'SON'),
+) -> Cube:
     """Compute anomalies using a mean with the specified granularity.
 
     Computes anomalies based on hourly, daily, monthly, seasonal or yearly
@@ -781,30 +871,25 @@ def anomalies(cube,
 
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Input cube.
-
-    period: str
-        Period to compute the statistic over.
-        Available periods: 'full', 'season', 'seasonal', 'monthly', 'month',
-        'mon', 'daily', 'day', 'hourly', 'hour', 'hr'.
-
-    reference: list int, optional, default: None
-        Period of time to use a reference, as needed for the 'extract_time'
-        preprocessor function. If ``None``, all available data is used as a
-        reference.
-
-    standardize: bool, optional
+    period:
+        Period to compute the statistic over. Available periods: `full`,
+        `season`, `seasonal`, `monthly`, `month`, `mon`, `daily`, `day`,
+        `hourly`, `hour`, `hr`.
+    reference: optional
+        Period of time to use a reference, as needed for the
+        :func:`~esmvalcore.preprocessor.extract_time` preprocessor function.
+        If ``None``, all available data is used as a reference.
+    standardize: optional
         If ``True`` standardized anomalies are calculated.
-
-    seasons: list or tuple of str, optional
+    seasons: optional
         Seasons to use if needed. Defaults to ('DJF', 'MAM', 'JJA', 'SON').
 
     Returns
     -------
     iris.cube.Cube
         Anomalies cube.
-
     """
     if reference is None:
         reference_cube = cube
@@ -846,23 +931,31 @@ def anomalies(cube,
     return cube
 
 
-def _compute_anomalies(cube, reference, period, seasons):
+def _compute_anomalies(
+    cube: Cube,
+    reference: Cube,
+    period: str,
+    seasons: Iterable[str],
+):
     cube_coord = _get_period_coord(cube, period, seasons)
     ref_coord = _get_period_coord(reference, period, seasons)
-
-    data = cube.core_data()
-    cube_time = cube.coord('time')
-    ref = {}
-    for ref_slice in reference.slices_over(ref_coord):
-        ref[ref_slice.coord(ref_coord).points[0]] = ref_slice.core_data()
-
-    cube_coord_dim = cube.coord_dims(cube_coord)[0]
-    slicer = [slice(None)] * len(data.shape)
-    new_data = []
-    for i in range(cube_time.shape[0]):
-        slicer[cube_coord_dim] = i
-        new_data.append(data[tuple(slicer)] - ref[cube_coord.points[i]])
-    data = da.stack(new_data, axis=cube_coord_dim)
+    indices = np.empty_like(cube_coord.points, dtype=np.int32)
+    for idx, point in enumerate(ref_coord.points):
+        indices = np.where(cube_coord.points == point, idx, indices)
+    ref_data = reference.core_data()
+    axis, = cube.coord_dims(cube_coord)
+    if cube.has_lazy_data() and reference.has_lazy_data():
+        # Rechunk reference data because iris.cube.Cube.aggregate_by, used to
+        # compute the reference, produces very small chunks.
+        # https://github.com/SciTools/iris/issues/5455
+        ref_chunks = tuple(
+            -1 if i == axis else chunk
+            for i, chunk in enumerate(cube.lazy_data().chunks)
+        )
+        ref_data = ref_data.rechunk(ref_chunks)
+    with dask.config.set({"array.slicing.split_large_chunks": True}):
+        ref_data_broadcast = da.take(ref_data, indices=indices, axis=axis)
+    data = cube.core_data() - ref_data_broadcast
     cube = cube.copy(data)
     cube.remove_coord(cube_coord)
     return cube
@@ -891,7 +984,7 @@ def _get_period_coord(cube, period, seasons):
     raise ValueError(f"Period '{period}' not supported")
 
 
-def regrid_time(cube, frequency):
+def regrid_time(cube: Cube, frequency: str) -> Cube:
     """Align time axis for cubes so they can be subtracted.
 
     Operations on time units, time points and auxiliary
@@ -903,15 +996,16 @@ def regrid_time(cube, frequency):
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-    frequency: str
-        data frequency: mon, day, 1hr, 3hr or 6hr
+    cube:
+        Input cube.
+    frequency:
+        Data frequency: `mon`, `day`, `1hr`, `3hr` or `6hr`.
 
     Returns
     -------
     iris.cube.Cube
-        cube with converted time axis and units.
+        Cube with converted time axis and units.
+
     """
     # standardize time points
     coord = cube.coord('time')
@@ -949,7 +1043,7 @@ def regrid_time(cube, frequency):
 
     # uniformize bounds
     cube.coord('time').bounds = None
-    cube.coord('time').bounds = _get_time_bounds(cube.coord('time'), frequency)
+    cube.coord('time').bounds = get_time_bounds(cube.coord('time'), frequency)
 
     # remove aux coords that will differ
     reset_aux = ['day_of_month', 'day_of_year']
@@ -1000,11 +1094,14 @@ def low_pass_weights(window, cutoff):
     return weights[1:-1]
 
 
-def timeseries_filter(cube,
-                      window,
-                      span,
-                      filter_type='lowpass',
-                      filter_stats='sum'):
+def timeseries_filter(
+    cube: Cube,
+    window: int,
+    span: int,
+    filter_type: str = 'lowpass',
+    filter_stats: str = 'sum',
+    **operator_kwargs,
+) -> Cube:
     """Apply a timeseries filter.
 
     Method borrowed from `iris example
@@ -1018,33 +1115,38 @@ def timeseries_filter(cube,
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-    window: int
+    cube:
+        Input cube.
+    window:
         The length of the filter window (in units of cube time coordinate).
-    span: int
+    span:
         Number of months/days (depending on data frequency) on which
         weights should be computed e.g. 2-yearly: span = 24 (2 x 12 months).
         Span should have same units as cube time coordinate.
-    filter_type: str, optional
+    filter_type: optional
         Type of filter to be applied; default 'lowpass'.
         Available types: 'lowpass'.
-    filter_stats: str, optional
-        Type of statistic to aggregate on the rolling window; default 'sum'.
-        Available operators: 'mean', 'median', 'std_dev', 'sum', 'min',
-        'max', 'rms'
+    filter_stats: optional
+        Type of statistic to aggregate on the rolling window; default: `sum`.
+        Used to determine the :class:`iris.analysis.Aggregator` object used for
+        aggregation. Allowed options are given in :ref:`this table
+        <supported_stat_operator>`.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `filter_stats`.
 
     Returns
     -------
     iris.cube.Cube
-        cube time-filtered using 'rolling_window'.
+        Cube time-filtered using 'rolling_window'.
 
     Raises
     ------
     iris.exceptions.CoordinateNotFoundError:
         Cube does not have time coordinate.
     NotImplementedError:
-        If filter_type is not implemented.
+        `filter_type` is not implemented.
+
     """
     try:
         cube.coord('time')
@@ -1059,6 +1161,8 @@ def timeseries_filter(cube,
     ]
     if filter_type in supported_filters:
         if filter_type == 'lowpass':
+            # These weights sum to one and are dimensionless (-> we do NOT need
+            # to consider units for sums)
             wgts = low_pass_weights(window, 1. / span)
     else:
         raise NotImplementedError(
@@ -1066,16 +1170,14 @@ def timeseries_filter(cube,
             f"please choose one of {', '.join(supported_filters)}")
 
     # Apply filter
-    aggregation_operator = get_iris_analysis_operation(filter_stats)
-    cube = cube.rolling_window('time',
-                               aggregation_operator,
-                               len(wgts),
-                               weights=wgts)
+    (agg, agg_kwargs) = get_iris_aggregator(filter_stats, **operator_kwargs)
+    agg_kwargs['weights'] = wgts
+    cube = cube.rolling_window('time', agg, len(wgts), **agg_kwargs)
 
     return cube
 
 
-def resample_hours(cube, interval, offset=0):
+def resample_hours(cube: Cube, interval: int, offset: int = 0) -> Cube:
     """Convert x-hourly data to y-hourly by eliminating extra timesteps.
 
     Convert x-hourly data to y-hourly (y > x) by eliminating the extra
@@ -1094,11 +1196,11 @@ def resample_hours(cube, interval, offset=0):
 
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Input cube.
-    interval: int
+    interval:
         The period (hours) of the desired data.
-    offset: int, optional
+    offset: optional
         The firs hour (hours) of the desired data.
 
     Returns
@@ -1110,6 +1212,7 @@ def resample_hours(cube, interval, offset=0):
     ------
     ValueError:
         The specified frequency is not a divisor of 24.
+
     """
     allowed_intervals = (1, 2, 3, 4, 6, 12)
     if interval not in allowed_intervals:
@@ -1136,7 +1239,12 @@ def resample_hours(cube, interval, offset=0):
     return cube
 
 
-def resample_time(cube, month=None, day=None, hour=None):
+def resample_time(
+    cube: Cube,
+    month: Optional[int] = None,
+    day: Optional[int] = None,
+    hour: Optional[int] = None,
+) -> Cube:
     """Change frequency of data by resampling it.
 
     Converts data from one frequency to another by extracting the timesteps
@@ -1160,19 +1268,20 @@ def resample_time(cube, month=None, day=None, hour=None):
 
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Input cube.
-    month: int, optional
-        Month to extract
-    day: int, optional
-        Day to extract
-    hour: int, optional
-        Hour to extract
+    month: optional
+        Month to extract.
+    day: optional
+        Day to extract.
+    hour: optional
+        Hour to extract.
 
     Returns
     -------
     iris.cube.Cube
         Cube with the new frequency.
+
     """
     time = cube.coord('time')
     dates = time.units.num2date(time.points)
diff --git a/esmvalcore/preprocessor/_volume.py b/esmvalcore/preprocessor/_volume.py
index 52b9393235..e0c376585e 100644
--- a/esmvalcore/preprocessor/_volume.py
+++ b/esmvalcore/preprocessor/_volume.py
@@ -3,25 +3,33 @@
 Allows for selecting data subsets using certain volume bounds; selecting
 depth or height regions; constructing volumetric averages;
 """
+from __future__ import annotations
+
 import logging
+import warnings
+from typing import Iterable, Sequence
 
 import dask.array as da
 import iris
 import numpy as np
+from iris.coords import AuxCoord, CellMeasure
+from iris.cube import Cube
+from iris.exceptions import CoordinateMultiDimError
 
-from ._shared import get_iris_analysis_operation, operator_accept_weights
+from ._area import compute_area_weights
+from ._shared import get_iris_aggregator, update_weights_kwargs
 from ._supplementary_vars import register_supplementaries
 
 logger = logging.getLogger(__name__)
 
 
 def extract_volume(
-    cube,
-    z_min,
-    z_max,
-    interval_bounds='open',
-    nearest_value=False
-):
+    cube: Cube,
+    z_min: float,
+    z_max: float,
+    interval_bounds: str = 'open',
+    nearest_value: bool = False,
+) -> Cube:
     """Subset a cube based on a range of values in the z-coordinate.
 
     Function that subsets a cube on a box of (z_min, z_max),
@@ -37,21 +45,23 @@ def extract_volume(
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-    z_min: float
-        minimum depth to extract.
-    z_max: float
-        maximum depth to extract.
-    interval_bounds: str
-        sets left bound of the interval to either 'open', 'closed',
+    cube:
+        Input cube.
+    z_min:
+        Minimum depth to extract.
+    z_max:
+        Maximum depth to extract.
+    interval_bounds:
+        Sets left bound of the interval to either 'open', 'closed',
         'left_closed' or 'right_closed'.
-    nearest_value: bool
-        extracts considering the nearest value of z-coord to z_min and z_max.
+    nearest_value:
+        Extracts considering the nearest value of z-coord to z_min and z_max.
+
     Returns
     -------
     iris.cube.Cube
         z-coord extracted cube.
+
     """
     if z_min > z_max:
         # minimum is below maximum, so switch them around
@@ -87,10 +97,16 @@ def extract_volume(
     return cube.extract(z_constraint)
 
 
-def calculate_volume(cube):
+def calculate_volume(cube: Cube) -> da.core.Array:
     """Calculate volume from a cube.
 
-    This function is used when the volume ancillary variables can't be found.
+    This function is used when the 'ocean_volume' cell measure can't be found.
+
+    Note
+    ----
+    This only works if the grid cell areas can be calculated (i.e., latitude
+    and longitude are 1D) and if the depth coordinate is 1D or 4D with first
+    dimension 1.
 
     Parameters
     ----------
@@ -99,167 +115,259 @@ def calculate_volume(cube):
 
     Returns
     -------
-    float
-        grid volume.
+    dask.array.core.Array
+        Grid volumes.
+
     """
-    # ####
-    # Load depth field and figure out which dim is which.
+    # Load depth field and figure out which dim is which
     depth = cube.coord(axis='z')
-    z_dim = cube.coord_dims(cube.coord(axis='z'))[0]
+    z_dim = cube.coord_dims(depth)[0]
 
-    # ####
-    # Load z direction thickness
+    # Calculate Z-direction thickness
     thickness = depth.bounds[..., 1] - depth.bounds[..., 0]
 
-    # ####
-    # Calculate grid volume:
-    area = da.array(iris.analysis.cartography.area_weights(cube))
+    # Try to calculate grid cell area
+    try:
+        area = da.array(compute_area_weights(cube))
+    except CoordinateMultiDimError:
+        logger.error(
+            "Supplementary variables are needed to calculate grid cell "
+            "areas for irregular grid of cube %s",
+            cube.summary(shorten=True),
+        )
+        raise
+
+    # Try to calculate grid cell volume as area * thickness
     if thickness.ndim == 1 and z_dim == 1:
         grid_volume = area * thickness[None, :, None, None]
-    if thickness.ndim == 4 and z_dim == 1:
+    elif thickness.ndim == 4 and z_dim == 1:
         grid_volume = area * thickness[:, :]
+    else:
+        raise ValueError(
+            f"Supplementary variables are needed to calculate grid cell "
+            f"volumes for cubes with {thickness.ndim:d}D depth coordinate, "
+            f"got cube {cube.summary(shorten=True)}"
+        )
 
     return grid_volume
 
 
+def _try_adding_calculated_ocean_volume(cube: Cube) -> None:
+    """Try to add calculated cell measure 'ocean_volume' to cube (in-place)."""
+    if cube.cell_measures('ocean_volume'):
+        return
+
+    logger.debug(
+        "Found no cell measure 'ocean_volume' in cube %s. Check availability "
+        "of supplementary variables",
+        cube.summary(shorten=True),
+    )
+    logger.debug("Attempting to calculate grid cell volume")
+
+    grid_volume = calculate_volume(cube)
+
+    cell_measure = CellMeasure(
+        grid_volume,
+        standard_name='ocean_volume',
+        units='m3',
+        measure='volume',
+    )
+    cube.add_cell_measure(cell_measure, np.arange(cube.ndim))
+
+
 @register_supplementaries(
     variables=['volcello'],
     required='prefer_at_least_one',
 )
-def volume_statistics(cube, operator):
+def volume_statistics(
+    cube: Cube,
+    operator: str,
+    **operator_kwargs,
+) -> Cube:
     """Apply a statistical operation over a volume.
 
     The volume average is weighted according to the cell volume.
 
     Parameters
     ----------
-    cube: iris.cube.Cube
+    cube:
         Input cube. The input cube should have a
-        :class:`iris.coords.CellMeasure` with standard name ``'ocean_volume'``,
-        unless it has regular 1D latitude and longitude coordinates so the cell
-        volumes can be computed by using
-        :func:`iris.analysis.cartography.area_weights` to compute the cell
-        areas and multiplying those by the cell thickness, computed from the
-        bounds of the vertical coordinate.
-    operator: str
-        The operation to apply to the cube, options are: 'mean'.
+        :class:`iris.coords.CellMeasure` named ``'ocean_volume'``, unless it
+        has regular 1D latitude and longitude coordinates so the cell volumes
+        can be computed by using :func:`iris.analysis.cartography.area_weights`
+        to compute the cell areas and multiplying those by the cell thickness,
+        computed from the bounds of the vertical coordinate.
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Currently, only `mean` is
+        allowed.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
     iris.cube.Cube
-        collapsed cube.
+        Collapsed cube.
 
-    Raises
-    ------
-    ValueError
-        if input cube shape differs from grid volume cube shape.
     """
+    has_cell_measure = bool(cube.cell_measures('ocean_volume'))
+
     # TODO: Test sigma coordinates.
     # TODO: Add other operations.
-
     if operator != 'mean':
-        raise ValueError(f'Volume operator {operator} not recognised.')
+        raise ValueError(f"Volume operator {operator} not recognised.")
 
-    try:
-        grid_volume = cube.cell_measure('ocean_volume').core_data()
-    except iris.exceptions.CellMeasureNotFoundError:
-        logger.debug('Cell measure "ocean_volume" not found in cube. '
-                     'Check fx_file availability.')
-        logger.debug('Attempting to calculate grid cell volume...')
-        grid_volume = calculate_volume(cube)
-    else:
-        grid_volume = da.broadcast_to(grid_volume, cube.shape)
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+    agg_kwargs = update_weights_kwargs(
+        agg,
+        agg_kwargs,
+        'ocean_volume',
+        cube,
+        _try_adding_calculated_ocean_volume,
+    )
 
-    if cube.data.shape != grid_volume.shape:
-        raise ValueError('Cube shape ({}) doesn`t match grid volume shape '
-                         f'({cube.shape, grid_volume.shape})')
-
-    masked_volume = da.ma.masked_where(da.ma.getmaskarray(cube.lazy_data()),
-                                       grid_volume)
     result = cube.collapsed(
-        [cube.coord(axis='Z'),
-         cube.coord(axis='Y'),
-         cube.coord(axis='X')],
-        iris.analysis.MEAN,
-        weights=masked_volume)
+        [cube.coord(axis='Z'), cube.coord(axis='Y'), cube.coord(axis='X')],
+        agg,
+        **agg_kwargs,
+    )
+
+    # Make sure input cube has not been modified
+    if not has_cell_measure and cube.cell_measures('ocean_volume'):
+        cube.remove_cell_measure('ocean_volume')
 
     return result
 
 
-def axis_statistics(cube, axis, operator):
+def axis_statistics(
+    cube: Cube,
+    axis: str,
+    operator: str,
+    **operator_kwargs,
+) -> Cube:
     """Perform statistics along a given axis.
 
-    Operates over an axis direction. If weights are required,
-    they are computed using the coordinate bounds.
+    Operates over an axis direction.
+
+    Note
+    ----
+    The `mean`, `sum` and `rms` operations are weighted by the corresponding
+    coordinate bounds by default. For `sum`, the units of the resulting cube
+    will be multiplied by corresponding coordinate units.
 
     Arguments
     ---------
-    cube: iris.cube.Cube
+    cube:
         Input cube.
-    axis: str
-        Direction over where to apply the operator. Possible values
-        are 'x', 'y', 'z', 't'.
-    operator: str
-        Statistics to perform. Available operators are:
-        'mean', 'median', 'std_dev', 'sum', 'variance',
-        'min', 'max', 'rms'.
+    axis:
+        Direction over where to apply the operator. Possible values are `x`,
+        `y`, `z`, `t`.
+    operator:
+        The operation. Used to determine the :class:`iris.analysis.Aggregator`
+        object used to calculate the statistics. Allowed options are given in
+        :ref:`this table <supported_stat_operator>`.
+    **operator_kwargs:
+        Optional keyword arguments for the :class:`iris.analysis.Aggregator`
+        object defined by `operator`.
 
     Returns
     -------
     iris.cube.Cube
-        collapsed cube.
+        Collapsed cube.
+
     """
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **operator_kwargs)
+
+    # Check if a coordinate for the desired axis exists
     try:
         coord = cube.coord(axis=axis)
     except iris.exceptions.CoordinateNotFoundError as err:
-        raise ValueError(f'Axis {axis} not found in cube '
-                         f'{cube.summary(shorten=True)}') from err
+        raise ValueError(
+            f"Axis {axis} not found in cube {cube.summary(shorten=True)}"
+        ) from err
+
+    # Multidimensional coordinates are currently not supported
     coord_dims = cube.coord_dims(coord)
     if len(coord_dims) > 1:
-        raise NotImplementedError('axis_statistics not implemented for '
-                                  'multidimensional coordinates.')
-    operation = get_iris_analysis_operation(operator)
-    if operator_accept_weights(operator):
-        coord_dim = coord_dims[0]
-        expand = list(range(cube.ndim))
-        expand.remove(coord_dim)
-        bounds = coord.core_bounds()
-        weights = np.abs(bounds[..., 1] - bounds[..., 0])
-        weights = np.expand_dims(weights, expand)
-        weights = da.broadcast_to(weights, cube.shape)
-        result = cube.collapsed(coord, operation, weights=weights)
-    else:
-        result = cube.collapsed(coord, operation)
+        raise NotImplementedError(
+            "axis_statistics not implemented for multidimensional "
+            "coordinates."
+        )
+
+    # For weighted operations, create a dummy weights coordinate using the
+    # bounds of the original coordinate (this handles units properly, e.g., for
+    # sums)
+    agg_kwargs = update_weights_kwargs(
+        agg,
+        agg_kwargs,
+        '_axis_statistics_weights_',
+        cube,
+        _add_axis_stats_weights_coord,
+        coord=coord,
+        coord_dims=coord_dims,
+    )
+
+    with warnings.catch_warnings():
+        warnings.filterwarnings(
+            'ignore',
+            message=(
+                "Cannot check if coordinate is contiguous: Invalid "
+                "operation for '_axis_statistics_weights_'"
+            ),
+            category=UserWarning,
+            module='iris',
+        )
+        result = cube.collapsed(coord, agg, **agg_kwargs)
+
+    # Make sure input and output cubes do not have auxiliary coordinate
+    if cube.coords('_axis_statistics_weights_'):
+        cube.remove_coord('_axis_statistics_weights_')
+    if result.coords('_axis_statistics_weights_'):
+        result.remove_coord('_axis_statistics_weights_')
 
     return result
 
 
-def depth_integration(cube):
+def _add_axis_stats_weights_coord(cube, coord, coord_dims):
+    """Add weights for axis_statistics to cube (in-place)."""
+    weights_coord = AuxCoord(
+        np.abs(coord.core_bounds()[..., 1] - coord.core_bounds()[..., 0]),
+        long_name='_axis_statistics_weights_',
+        units=coord.units,
+    )
+    cube.add_aux_coord(weights_coord, coord_dims)
+
+
+def depth_integration(cube: Cube) -> Cube:
     """Determine the total sum over the vertical component.
 
-    Requires a 3D cube. The z-coordinate
-    integration is calculated by taking the sum in the z direction of the
-    cell contents multiplied by the cell thickness.
+    Requires a 3D cube. The z-coordinate integration is calculated by taking
+    the sum in the z direction of the cell contents multiplied by the cell
+    thickness. The units of the resulting cube are multiplied by the
+    z-coordinate units.
 
     Arguments
     ---------
-    cube: iris.cube.Cube
-        input cube.
+    cube:
+        Input cube.
 
     Returns
     -------
     iris.cube.Cube
-        collapsed cube.
+        Collapsed cube.
+
     """
     result = axis_statistics(cube, axis='z', operator='sum')
     result.rename('Depth_integrated_' + str(cube.name()))
-    # result.units = Unit('m') * result.units # This doesn't work:
-    # TODO: Change units on cube to reflect 2D concentration (not 3D)
-    # Waiting for news from iris community.
     return result
 
 
-def extract_transect(cube, latitude=None, longitude=None):
+def extract_transect(
+    cube: Cube,
+    latitude: None | float | Iterable[float] = None,
+    longitude: None | float | Iterable[float] = None,
+) -> Cube:
     """Extract data along a line of constant latitude or longitude.
 
     Both arguments, latitude and longitude, are treated identically.
@@ -283,29 +391,30 @@ def extract_transect(cube, latitude=None, longitude=None):
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-    latitude: None, float or [float, float], optional
-        transect latiude or range.
-    longitude:  None, float or [float, float], optional
-        transect longitude or range.
+    cube:
+        Input cube.
+    latitude: optional
+        Transect latitude or range.
+    longitude:  optional
+        Transect longitude or range.
 
     Returns
     -------
     iris.cube.Cube
-        collapsed cube.
+        Collapsed cube.
 
     Raises
     ------
     ValueError
-        slice extraction not implemented for irregular grids.
+        Slice extraction not implemented for irregular grids.
     ValueError
-        latitude and longitude are both floats or lists; not allowed
-        to slice on both axes at the same time.
+        Latitude and longitude are both floats or lists; not allowed to slice
+        on both axes at the same time.
+
     """
     # ###
     coord_dim2 = False
-    second_coord_range = False
+    second_coord_range: None | list = None
     lats = cube.coord('latitude')
     lons = cube.coord('longitude')
 
@@ -343,13 +452,18 @@ def extract_transect(cube, latitude=None, longitude=None):
     slices = [slice(None) for i in cube.shape]
     slices[coord_dim] = coord_index
 
-    if second_coord_range:
+    if second_coord_range is not None:
         slices[coord_dim2] = slice(second_coord_range[0],
                                    second_coord_range[1])
     return cube[tuple(slices)]
 
 
-def extract_trajectory(cube, latitudes, longitudes, number_points=2):
+def extract_trajectory(
+    cube: Cube,
+    latitudes: Sequence[float],
+    longitudes: Sequence[float],
+    number_points: int = 2,
+) -> Cube:
     """Extract data along a trajectory.
 
     latitudes and longitudes are the pairs of coordinates for two points.
@@ -369,24 +483,25 @@ def extract_trajectory(cube, latitudes, longitudes, number_points=2):
 
     Parameters
     ----------
-    cube: iris.cube.Cube
-        input cube.
-    latitudes: list
-        list of latitude coordinates (floats).
-    longitudes: list
-        list of longitude coordinates (floats).
-    number_points: int
-        number of points to extrapolate (optional).
+    cube:
+        Input cube.
+    latitudes:
+        Latitude coordinates.
+    longitudes:
+        Longitude coordinates.
+    number_points: optional
+        Number of points to extrapolate.
 
     Returns
     -------
     iris.cube.Cube
-        collapsed cube.
+        Collapsed cube.
 
     Raises
     ------
     ValueError
-        if latitude and longitude have different dimensions.
+        Latitude and longitude have different dimensions.
+
     """
     from iris.analysis.trajectory import interpolate
 
diff --git a/setup.py b/setup.py
index 092379b6ba..84379ea008 100755
--- a/setup.py
+++ b/setup.py
@@ -183,7 +183,7 @@ def run(self):
 
 def read_authors(filename):
     """Read the list of authors from .zenodo.json file."""
-    with Path(filename).open() as file:
+    with Path(filename).open(encoding='utf-8') as file:
         info = json.load(file)
         authors = []
         for author in info['creators']:
@@ -194,7 +194,7 @@ def read_authors(filename):
 
 def read_description(filename):
     """Read the description from .zenodo.json file."""
-    with Path(filename).open() as file:
+    with Path(filename).open(encoding='utf-8') as file:
         info = json.load(file)
         return info['description']
 
@@ -203,7 +203,7 @@ def read_description(filename):
     name='ESMValCore',
     author=read_authors('.zenodo.json'),
     description=read_description('.zenodo.json'),
-    long_description=Path('README.md').read_text(),
+    long_description=Path('README.md').read_text(encoding='utf-8'),
     long_description_content_type='text/markdown',
     url='https://www.esmvaltool.org',
     download_url='https://github.com/ESMValGroup/ESMValCore',
diff --git a/tests/integration/cmor/_fixes/cesm/test_cesm2.py b/tests/integration/cmor/_fixes/cesm/test_cesm2.py
index 44fed835b7..661eadcfb7 100644
--- a/tests/integration/cmor/_fixes/cesm/test_cesm2.py
+++ b/tests/integration/cmor/_fixes/cesm/test_cesm2.py
@@ -7,6 +7,7 @@
 from iris.cube import Cube, CubeList
 
 import esmvalcore.cmor._fixes.cesm.cesm2
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import CoordinateInfo, get_var_info
 from esmvalcore.config._config import get_extra_facets
@@ -338,6 +339,7 @@ def test_get_tas_fix():
     fix = Fix.get_fixes('CESM', 'CESM2', 'Amon', 'tas')
     assert fix == [
         esmvalcore.cmor._fixes.cesm.cesm2.AllVars(None),
+        GenericFix(None),
     ]
 
 
diff --git a/tests/integration/cmor/_fixes/cmip5/test_access1_0.py b/tests/integration/cmor/_fixes/cmip5/test_access1_0.py
index 1312762aab..3cba189b7a 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_access1_0.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_access1_0.py
@@ -8,7 +8,7 @@
 from iris.cube import Cube, CubeList
 
 from esmvalcore.cmor._fixes.cmip5.access1_0 import AllVars, Cl
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 from esmvalcore.cmor.table import get_var_info
 from esmvalcore.iris_helpers import date2num
 
@@ -39,8 +39,9 @@ class TestAllVars:
     @staticmethod
     def test_get():
         """Test getting of fix."""
-        assert (Fix.get_fixes('CMIP5', 'ACCESS1-0', 'Amon', 'tas')
-                == [AllVars(None)])
+        assert Fix.get_fixes('CMIP5', 'ACCESS1-0', 'Amon', 'tas') == [
+            AllVars(None),  GenericFix(None)
+        ]
 
     @staticmethod
     def test_fix_metadata(cube):
@@ -66,7 +67,7 @@ def test_fix_metadata_if_not_time(cube):
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'ACCESS1-0', 'Amon', 'cl')
-    assert fix == [Cl(None), AllVars(None)]
+    assert fix == [Cl(None), AllVars(None), GenericFix(None)]
 
 
 @pytest.fixture
diff --git a/tests/integration/cmor/_fixes/cmip5/test_access1_3.py b/tests/integration/cmor/_fixes/cmip5/test_access1_3.py
index 68d59201de..684e88f65f 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_access1_3.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_access1_3.py
@@ -8,7 +8,7 @@
 
 from esmvalcore.cmor._fixes.cmip5.access1_0 import Cl as BaseCl
 from esmvalcore.cmor._fixes.cmip5.access1_3 import AllVars, Cl
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 from esmvalcore.iris_helpers import date2num
 
 
@@ -38,8 +38,9 @@ class TestAllVars:
     @staticmethod
     def test_get():
         """Test getting of fix."""
-        assert (Fix.get_fixes('CMIP5', 'ACCESS1-3', 'Amon', 'tas')
-                == [AllVars(None)])
+        assert Fix.get_fixes('CMIP5', 'ACCESS1-3', 'Amon', 'tas') == [
+             AllVars(None), GenericFix(None)
+        ]
 
     @staticmethod
     def test_fix_metadata(cube):
@@ -65,7 +66,7 @@ def test_fix_metadata_if_not_time(cube):
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'ACCESS1-3', 'Amon', 'cl')
-    assert fix == [Cl(None), AllVars(None)]
+    assert fix == [Cl(None), AllVars(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_bcc_csm1_1.py b/tests/integration/cmor/_fixes/cmip5/test_bcc_csm1_1.py
index 48d846146d..65f37766e0 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_bcc_csm1_1.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_bcc_csm1_1.py
@@ -1,5 +1,4 @@
 """Test bcc-csm1-1 fixes."""
-import unittest
 
 import iris
 import numpy as np
@@ -9,6 +8,7 @@
     ClFixHybridPressureCoord,
     OceanFixGrid,
 )
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -16,7 +16,7 @@
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'bcc-csm1-1', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -24,13 +24,10 @@ def test_cl_fix():
     assert Cl is ClFixHybridPressureCoord
 
 
-class TestTos(unittest.TestCase):
-    """Test tos fixes."""
-
-    def test_get(self):
-        """Test fix get."""
-        self.assertListEqual(
-            Fix.get_fixes('CMIP5', 'bcc-csm1-1', 'Amon', 'tos'), [Tos(None)])
+def test_get_tos_fix():
+    """Test getting of fix."""
+    fix = Fix.get_fixes('CMIP5', 'bcc-csm1-1', 'Omon', 'tos')
+    assert fix == [Tos(None), GenericFix(None)]
 
 
 def test_tos_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_bcc_csm1_1_m.py b/tests/integration/cmor/_fixes/cmip5/test_bcc_csm1_1_m.py
index 8473c84f44..8fe017fe9b 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_bcc_csm1_1_m.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_bcc_csm1_1_m.py
@@ -1,18 +1,17 @@
 """Test fixes for bcc-csm1-1-m."""
-import unittest
 
 from esmvalcore.cmor._fixes.cmip5.bcc_csm1_1_m import Cl, Tos
 from esmvalcore.cmor._fixes.common import (
     ClFixHybridPressureCoord,
     OceanFixGrid,
 )
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'bcc-csm1-1-m', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -20,13 +19,10 @@ def test_cl_fix():
     assert Cl is ClFixHybridPressureCoord
 
 
-class TestTos(unittest.TestCase):
-    """Test tos fixes."""
-
-    def test_get(self):
-        """Test fix get."""
-        self.assertListEqual(
-            Fix.get_fixes('CMIP5', 'bcc-csm1-1-m', 'Amon', 'tos'), [Tos(None)])
+def test_get_tos_fix():
+    """Test getting of fix."""
+    fix = Fix.get_fixes('CMIP5', 'bcc-csm1-1-m', 'Omon', 'tos')
+    assert fix == [Tos(None), GenericFix(None)]
 
 
 def test_tos_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_bnu_esm.py b/tests/integration/cmor/_fixes/cmip5/test_bnu_esm.py
index e8045902f5..d988e02441 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_bnu_esm.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_bnu_esm.py
@@ -5,9 +5,16 @@
 from cf_units import Unit
 from iris.cube import Cube
 
-from esmvalcore.cmor._fixes.cmip5.bnu_esm import (Ch4, Cl, Co2, FgCo2,
-                                                  Od550Aer, SpCo2)
+from esmvalcore.cmor._fixes.cmip5.bnu_esm import (
+    Ch4,
+    Cl,
+    Co2,
+    FgCo2,
+    Od550Aer,
+    SpCo2,
+)
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -22,7 +29,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get"""
         fix = Fix.get_fixes('CMIP5', 'BNU-ESM', 'Amon', 'cl')
-        assert fix == [Cl(None)]
+        assert fix == [Cl(None), GenericFix(None)]
 
     def test_cl_fix(self):
         """Test fix for ``cl``."""
@@ -46,7 +53,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'BNU-ESM', 'Amon', 'co2'),
-                             [Co2(self.vardef)])
+                             [Co2(self.vardef), GenericFix(None)])
 
     def test_fix_metadata(self):
         """Test unit change."""
@@ -74,7 +81,7 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'BNU-ESM', 'Amon', 'fgco2'),
-            [FgCo2(self.vardef)])
+            [FgCo2(self.vardef), GenericFix(None)])
 
     def test_fix_metadata(self):
         """Test unit fix."""
@@ -101,7 +108,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'BNU-ESM', 'Amon', 'ch4'),
-                             [Ch4(self.vardef)])
+                             [Ch4(self.vardef), GenericFix(None)])
 
     def test_fix_metadata(self):
         """Test unit fix."""
@@ -127,7 +134,8 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(
-            Fix.get_fixes('CMIP5', 'BNU-ESM', 'Amon', 'spco2'), [SpCo2(None)])
+            Fix.get_fixes('CMIP5', 'BNU-ESM', 'Amon', 'spco2'),
+            [SpCo2(None), GenericFix(None)])
 
     def test_fix_metadata(self):
         """Test fix."""
@@ -157,7 +165,7 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'BNU-ESM', 'Amon', 'od550aer'),
-            [Od550Aer(None)])
+            [Od550Aer(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_canesm2.py b/tests/integration/cmor/_fixes/cmip5/test_canesm2.py
index 27d29839ab..4e8f9c826d 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_canesm2.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_canesm2.py
@@ -6,13 +6,14 @@
 
 from esmvalcore.cmor._fixes.cmip5.canesm2 import Cl, FgCo2
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'CanESM2', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -31,7 +32,8 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(
-            Fix.get_fixes('CMIP5', 'CANESM2', 'Amon', 'fgco2'), [FgCo2(None)])
+            Fix.get_fixes('CMIP5', 'CANESM2', 'Amon', 'fgco2'),
+            [FgCo2(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_ccsm4.py b/tests/integration/cmor/_fixes/cmip5/test_ccsm4.py
index f19cc98165..05bb6620a0 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_ccsm4.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_ccsm4.py
@@ -7,6 +7,7 @@
 
 from esmvalcore.cmor._fixes.cmip5.bnu_esm import Cl as BaseCl
 from esmvalcore.cmor._fixes.cmip5.ccsm4 import AllVars, Cl, Csoil, So
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -59,7 +60,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'CCSM4', 'Amon', 'rlut'),
-                             [AllVars(None)])
+                             [AllVars(None), GenericFix(None)])
 
     def test_fix_metadata(self):
         """Check that latitudes values are rounded."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_cesm1_bgc.py b/tests/integration/cmor/_fixes/cmip5/test_cesm1_bgc.py
index 31fb3f670f..fdb2314d80 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_cesm1_bgc.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_cesm1_bgc.py
@@ -6,13 +6,14 @@
 
 from esmvalcore.cmor._fixes.cmip5.cesm1_bgc import Cl, Gpp, Nbp
 from esmvalcore.cmor._fixes.cmip5.cesm1_cam5 import Cl as BaseCl
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'CESM1-BGC', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -31,7 +32,8 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(
-            Fix.get_fixes('CMIP5', 'CESM1-BGC', 'Amon', 'gpp'), [Gpp(None)])
+            Fix.get_fixes('CMIP5', 'CESM1-BGC', 'Amon', 'gpp'),
+            [Gpp(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test fix to set missing values correctly."""
@@ -54,4 +56,5 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(
-            Fix.get_fixes('CMIP5', 'CESM1-BGC', 'Amon', 'nbp'), [Nbp(None)])
+            Fix.get_fixes('CMIP5', 'CESM1-BGC', 'Amon', 'nbp'),
+            [Nbp(None), GenericFix(None)])
diff --git a/tests/integration/cmor/_fixes/cmip5/test_cesm1_cam5.py b/tests/integration/cmor/_fixes/cmip5/test_cesm1_cam5.py
index d5991ddff6..07cf8ab1a9 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_cesm1_cam5.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_cesm1_cam5.py
@@ -3,13 +3,14 @@
 import pytest
 
 from esmvalcore.cmor._fixes.cmip5.cesm1_cam5 import Cl
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'CESM1-CAM5', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 @pytest.fixture
diff --git a/tests/integration/cmor/_fixes/cmip5/test_cesm1_fastchem.py b/tests/integration/cmor/_fixes/cmip5/test_cesm1_fastchem.py
index a41d1996f1..6ae2a44913 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_cesm1_fastchem.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_cesm1_fastchem.py
@@ -1,13 +1,14 @@
 """Tests for CESM1-FASTCHEM fixes."""
 from esmvalcore.cmor._fixes.cmip5.cesm1_cam5 import Cl as BaseCl
 from esmvalcore.cmor._fixes.cmip5.cesm1_fastchem import Cl
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'CESM1-FASTCHEM', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_cesm1_waccm.py b/tests/integration/cmor/_fixes/cmip5/test_cesm1_waccm.py
index 20023eebfa..146a456dad 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_cesm1_waccm.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_cesm1_waccm.py
@@ -1,13 +1,14 @@
 """Tests for CESM1-WACCM fixes."""
 from esmvalcore.cmor._fixes.cmip5.cesm1_cam5 import Cl as BaseCl
 from esmvalcore.cmor._fixes.cmip5.cesm1_waccm import Cl
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'CESM1-WACCM', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_cnrm_cm5.py b/tests/integration/cmor/_fixes/cmip5/test_cnrm_cm5.py
index ae9da2ef04..ce6ebe0121 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_cnrm_cm5.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_cnrm_cm5.py
@@ -4,8 +4,9 @@
 from cf_units import Unit
 from iris.cube import Cube
 
-from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor._fixes.cmip5.cnrm_cm5 import Msftmyz, Msftmyzba
+from esmvalcore.cmor._fixes.fix import GenericFix
+from esmvalcore.cmor.fix import Fix
 
 
 class TestMsftmyz(unittest.TestCase):
@@ -19,7 +20,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'CNRM-CM5', 'Amon', 'msftmyz'),
-            [Msftmyz(None)])
+            [Msftmyz(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -39,7 +40,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'CNRM-CM5', 'Amon', 'msftmyzba'),
-            [Msftmyzba(None)])
+            [Msftmyzba(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_csiro_mk3_6_0.py b/tests/integration/cmor/_fixes/cmip5/test_csiro_mk3_6_0.py
index a7d23d9d41..3fa4318d72 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_csiro_mk3_6_0.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_csiro_mk3_6_0.py
@@ -1,13 +1,13 @@
 """Test fixes for CSIRO-Mk3-6-0."""
 from esmvalcore.cmor._fixes.cmip5.csiro_mk3_6_0 import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'CSIRO-Mk3-6-0', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_ec_earth.py b/tests/integration/cmor/_fixes/cmip5/test_ec_earth.py
index 8ec734a90c..4b480ef81f 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_ec_earth.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_ec_earth.py
@@ -2,18 +2,19 @@
 import unittest
 
 import numpy as np
-
 from cf_units import Unit
 from iris.coords import AuxCoord, DimCoord
 from iris.cube import Cube, CubeList
 from iris.exceptions import CoordinateNotFoundError
+
 from esmvalcore.cmor._fixes.cmip5.ec_earth import (
     Areacello,
     Pr,
     Sftlf,
     Sic,
     Tas,
-    )
+)
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
@@ -27,7 +28,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get"""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'EC-EARTH', 'Amon', 'sic'),
-                             [Sic(None)])
+                             [Sic(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -46,7 +47,8 @@ def setUp(self):
     def test_get(self):
         """Test fix get"""
         self.assertListEqual(
-            Fix.get_fixes('CMIP5', 'EC-EARTH', 'Amon', 'sftlf'), [Sftlf(None)])
+            Fix.get_fixes('CMIP5', 'EC-EARTH', 'Amon', 'sftlf'),
+            [Sftlf(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -90,7 +92,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get"""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'EC-EARTH', 'Amon', 'tas'),
-                             [Tas(None)])
+                             [Tas(None), GenericFix(None)])
 
     def test_tas_fix_metadata(self):
         """Test metadata fix."""
@@ -148,7 +150,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'EC-EARTH', 'Omon', 'areacello'),
-            [Areacello(None)],
+            [Areacello(None), GenericFix(None)],
         )
 
     def test_areacello_fix_metadata(self):
@@ -210,7 +212,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'EC-EARTH', 'Amon', 'pr'),
-            [Pr(None)],
+            [Pr(None), GenericFix(None)],
         )
 
     def test_pr_fix_metadata(self):
diff --git a/tests/integration/cmor/_fixes/cmip5/test_fgoals_g2.py b/tests/integration/cmor/_fixes/cmip5/test_fgoals_g2.py
index abda3d180b..b70b16fa25 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_fgoals_g2.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_fgoals_g2.py
@@ -5,6 +5,7 @@
 from iris.cube import Cube
 
 from esmvalcore.cmor._fixes.cmip5.fgoals_g2 import AllVars
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
@@ -33,8 +34,9 @@ class TestAll:
     @staticmethod
     def test_get():
         """Test fix get."""
-        assert (Fix.get_fixes('CMIP5', 'FGOALS-G2', 'Amon', 'tas')
-                == [AllVars(None)])
+        assert Fix.get_fixes('CMIP5', 'FGOALS-G2', 'Amon', 'tas') == [
+             AllVars(None), GenericFix(None)
+        ]
 
     @staticmethod
     def test_fix_metadata(cube):
diff --git a/tests/integration/cmor/_fixes/cmip5/test_fgoals_s2.py b/tests/integration/cmor/_fixes/cmip5/test_fgoals_s2.py
index e77c095b3c..a1c15afebd 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_fgoals_s2.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_fgoals_s2.py
@@ -4,13 +4,14 @@
 from iris.cube import Cube, CubeList
 
 from esmvalcore.cmor._fixes.cmip5.fgoals_s2 import AllVars
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_allvars_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'FGOALS-s2', 'Amon', 'tas')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 LAT_COORD = DimCoord(
diff --git a/tests/integration/cmor/_fixes/cmip5/test_fio_esm.py b/tests/integration/cmor/_fixes/cmip5/test_fio_esm.py
index b8b8429f33..c0705e58fa 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_fio_esm.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_fio_esm.py
@@ -4,15 +4,16 @@
 from cf_units import Unit
 from iris.cube import Cube
 
-from esmvalcore.cmor.fix import Fix
-from esmvalcore.cmor._fixes.cmip5.fio_esm import Ch4, Cl, Co2
 from esmvalcore.cmor._fixes.cmip5.cesm1_cam5 import Cl as BaseCl
+from esmvalcore.cmor._fixes.cmip5.fio_esm import Ch4, Cl, Co2
+from esmvalcore.cmor._fixes.fix import GenericFix
+from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'FIO-ESM', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -30,7 +31,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get"""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'FIO-ESM', 'Amon', 'ch4'),
-                             [Ch4(None)])
+                             [Ch4(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -49,7 +50,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get"""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'FIO-ESM', 'Amon', 'co2'),
-                             [Co2(None)])
+                             [Co2(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_gfdl_cm2p1.py b/tests/integration/cmor/_fixes/cmip5/test_gfdl_cm2p1.py
index 63d5ce426d..8a4fa19fd1 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_gfdl_cm2p1.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_gfdl_cm2p1.py
@@ -6,9 +6,15 @@
 from cf_units import Unit
 from iris.cube import Cube
 
-from esmvalcore.cmor._fixes.cmip5.gfdl_cm2p1 import (AllVars, Areacello, Cl,
-                                                     Sftof, Sit)
 from esmvalcore.cmor._fixes.cmip5.cesm1_cam5 import Cl as BaseCl
+from esmvalcore.cmor._fixes.cmip5.gfdl_cm2p1 import (
+    AllVars,
+    Areacello,
+    Cl,
+    Sftof,
+    Sit,
+)
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -19,7 +25,7 @@ def test_get(self):
         """Test getting of fix."""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-CM2P1', 'Amon', 'cl'),
-            [Cl(None), AllVars(None)])
+            [Cl(None), AllVars(None), GenericFix(None)])
 
     def test_fix(self):
         """Test fix for ``cl``."""
@@ -37,7 +43,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-CM2P1', 'fx', 'sftof'),
-            [Sftof(None), AllVars(None)])
+            [Sftof(None), AllVars(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -59,7 +65,9 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-CM2P1', 'Amon', 'areacello'),
-            [Areacello(self.vardef), AllVars(self.vardef)])
+            [Areacello(self.vardef),
+             AllVars(self.vardef),
+             GenericFix(self.vardef)])
 
     def test_fix_metadata(self):
         """Test data fix."""
@@ -101,7 +109,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-CM2P1', 'OImon', 'sit'),
-            [Sit(self.var_info_mock), AllVars(None)])
+            [Sit(self.var_info_mock), AllVars(None), GenericFix(None)])
 
     def test_fix_metadata_day_do_nothing(self):
         """Test data fix."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_gfdl_cm3.py b/tests/integration/cmor/_fixes/cmip5/test_gfdl_cm3.py
index c4aaae2729..bcda26c95b 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_gfdl_cm3.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_gfdl_cm3.py
@@ -5,6 +5,7 @@
 from iris.cube import Cube
 
 from esmvalcore.cmor._fixes.cmip5.gfdl_cm3 import AllVars, Areacello, Sftof
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -20,7 +21,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-CM3', 'fx', 'sftof'),
-            [Sftof(None), AllVars(None)])
+            [Sftof(None), AllVars(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -41,7 +42,9 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-CM3', 'Amon', 'areacello'),
-            [Areacello(self.vardef), AllVars(self.vardef)])
+            [Areacello(self.vardef),
+             AllVars(self.vardef),
+             GenericFix(self.vardef)])
 
     def test_fix_metadata(self):
         """Test data fix."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_gfdl_esm2g.py b/tests/integration/cmor/_fixes/cmip5/test_gfdl_esm2g.py
index 89a1a1e32b..d5189e84c4 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_gfdl_esm2g.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_gfdl_esm2g.py
@@ -7,9 +7,16 @@
 from cf_units import Unit
 from iris.cube import Cube
 
-from esmvalcore.cmor._fixes.cmip5.gfdl_esm2g import (AllVars, Areacello, Co2,
-                                                     FgCo2, Usi, Vsi,
-                                                     _get_and_remove)
+from esmvalcore.cmor._fixes.cmip5.gfdl_esm2g import (
+    AllVars,
+    Areacello,
+    Co2,
+    FgCo2,
+    Usi,
+    Vsi,
+    _get_and_remove,
+)
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -71,7 +78,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-ESM2G', 'Amon', 'co2'),
-            [Co2(None), AllVars(None)])
+            [Co2(None), AllVars(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -92,7 +99,9 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-ESM2G', 'day', 'usi'),
-            [Usi(self.vardef), AllVars(self.vardef)])
+            [Usi(self.vardef),
+             AllVars(self.vardef),
+             GenericFix(self.vardef)])
 
     def test_fix_data(self):
         """Test metadata fix."""
@@ -112,7 +121,9 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-ESM2G', 'day', 'vsi'),
-            [Vsi(self.vardef), AllVars(self.vardef)])
+            [Vsi(self.vardef),
+             AllVars(self.vardef),
+             GenericFix(self.vardef)])
 
     def test_fix_data(self):
         """Test metadata fix."""
@@ -132,7 +143,9 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-ESM2G', 'fx', 'areacello'),
-            [Areacello(self.vardef), AllVars(self.vardef)])
+            [Areacello(self.vardef),
+             AllVars(self.vardef),
+             GenericFix(self.vardef)])
 
     def test_fix_metadata(self):
         """Test data fix."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_gfdl_esm2m.py b/tests/integration/cmor/_fixes/cmip5/test_gfdl_esm2m.py
index 1538098d25..1897ba5c85 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_gfdl_esm2m.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_gfdl_esm2m.py
@@ -4,8 +4,13 @@
 from cf_units import Unit
 from iris.cube import Cube
 
-from esmvalcore.cmor._fixes.cmip5.gfdl_esm2m import (AllVars, Areacello, Co2,
-                                                     Sftof)
+from esmvalcore.cmor._fixes.cmip5.gfdl_esm2m import (
+    AllVars,
+    Areacello,
+    Co2,
+    Sftof,
+)
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -21,7 +26,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-ESM2M', 'fx', 'sftof'),
-            [Sftof(None), AllVars(None)])
+            [Sftof(None), AllVars(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -41,7 +46,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-ESM2M', 'Amon', 'co2'),
-            [Co2(None), AllVars(None)])
+            [Co2(None), AllVars(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -62,7 +67,9 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'GFDL-ESM2M', 'fx', 'areacello'),
-            [Areacello(self.vardef), AllVars(self.vardef)])
+            [Areacello(self.vardef),
+             AllVars(self.vardef),
+             GenericFix(self.vardef)])
 
     def test_fix_metadata(self):
         """Test data fix."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_giss_e2_h.py b/tests/integration/cmor/_fixes/cmip5/test_giss_e2_h.py
index 5fd78f648c..9c39dd136f 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_giss_e2_h.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_giss_e2_h.py
@@ -1,13 +1,13 @@
 """Test fixes for GISS-E2-H."""
 from esmvalcore.cmor._fixes.cmip5.giss_e2_h import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'GISS-E2-H', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_giss_e2_r.py b/tests/integration/cmor/_fixes/cmip5/test_giss_e2_r.py
index e030bb4aaf..d95b517cdd 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_giss_e2_r.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_giss_e2_r.py
@@ -1,13 +1,13 @@
 """Test fixes for GISS-E2-R."""
 from esmvalcore.cmor._fixes.cmip5.giss_e2_r import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'GISS-E2-R', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_hadgem2_cc.py b/tests/integration/cmor/_fixes/cmip5/test_hadgem2_cc.py
index ed2f7c0d1f..0e6a4fc57a 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_hadgem2_cc.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_hadgem2_cc.py
@@ -1,8 +1,9 @@
 """Test HADGEM2-CC fixes."""
 import unittest
 
+from esmvalcore.cmor._fixes.cmip5.hadgem2_cc import O2, AllVars
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
-from esmvalcore.cmor._fixes.cmip5.hadgem2_cc import AllVars, O2
 
 
 class TestAllVars(unittest.TestCase):
@@ -11,7 +12,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'HADGEM2-CC', 'Amon', 'tas'),
-            [AllVars(None)])
+            [AllVars(None), GenericFix(None)])
 
 
 class TestO2(unittest.TestCase):
@@ -20,4 +21,4 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'HADGEM2-CC', 'Amon', 'o2'),
-            [O2(None), AllVars(None)])
+            [O2(None), AllVars(None), GenericFix(None)])
diff --git a/tests/integration/cmor/_fixes/cmip5/test_hadgem2_es.py b/tests/integration/cmor/_fixes/cmip5/test_hadgem2_es.py
index 99c7eb4aa9..c0ab2bb8fd 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_hadgem2_es.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_hadgem2_es.py
@@ -3,6 +3,7 @@
 
 from esmvalcore.cmor._fixes.cmip5.hadgem2_es import O2, AllVars, Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridHeightCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
@@ -13,7 +14,7 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'HADGEM2-ES', 'Amon', 'tas'),
-            [AllVars(None)])
+            [AllVars(None), GenericFix(None)])
 
 
 class TestO2(unittest.TestCase):
@@ -23,13 +24,13 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'HADGEM2-ES', 'Amon', 'o2'),
-            [O2(None), AllVars(None)])
+            [O2(None), AllVars(None), GenericFix(None)])
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'HadGEM2-ES', 'Amon', 'cl')
-    assert fix == [Cl(None), AllVars(None)]
+    assert fix == [Cl(None), AllVars(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_inmcm4.py b/tests/integration/cmor/_fixes/cmip5/test_inmcm4.py
index a5a5cf0235..dcabbbf313 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_inmcm4.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_inmcm4.py
@@ -6,13 +6,14 @@
 
 from esmvalcore.cmor._fixes.cmip5.inmcm4 import Cl, Gpp, Lai, Nbp
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'inmcm4', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -31,7 +32,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'INMCM4', 'Amon', 'gpp'),
-                             [Gpp(None)])
+                             [Gpp(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fox."""
@@ -51,7 +52,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'INMCM4', 'Amon', 'lai'),
-                             [Lai(None)])
+                             [Lai(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -71,7 +72,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'INMCM4', 'Amon', 'nbp'),
-                             [Nbp(None)])
+                             [Nbp(None), GenericFix(None)])
 
     def test_fix_metadata(self):
         """Test fix on nbp files to set standard_name."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5a_lr.py b/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5a_lr.py
index 443a4aafbb..67f50c1ea0 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5a_lr.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5a_lr.py
@@ -1,13 +1,13 @@
 """Test fixes for IPSL-CM5A-LR."""
 from esmvalcore.cmor._fixes.cmip5.ipsl_cm5a_lr import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'IPSL-CM5A-LR', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5a_mr.py b/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5a_mr.py
index ff3e0adc25..787a2d804a 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5a_mr.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5a_mr.py
@@ -1,13 +1,13 @@
 """Test fixes for IPSL-CM5A-MR."""
 from esmvalcore.cmor._fixes.cmip5.ipsl_cm5a_mr import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'IPSL-CM5A-MR', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5b_lr.py b/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5b_lr.py
index e04fa4718a..4a7b0a4476 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5b_lr.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_ipsl_cm5b_lr.py
@@ -1,13 +1,13 @@
 """Test fixes for IPSL-CM5B-LR."""
 from esmvalcore.cmor._fixes.cmip5.ipsl_cm5b_lr import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'IPSL-CM5B-LR', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_miroc5.py b/tests/integration/cmor/_fixes/cmip5/test_miroc5.py
index a9d61dde10..63a706eef7 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_miroc5.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_miroc5.py
@@ -7,13 +7,14 @@
 
 from esmvalcore.cmor._fixes.cmip5.miroc5 import Cl, Hur, Pr, Sftof, Tas
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'MIROC5', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -24,13 +25,13 @@ def test_cl_fix():
 def test_get_hur_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'MIROC5', 'Amon', 'hur')
-    assert fix == [Hur(None)]
+    assert fix == [Hur(None), GenericFix(None)]
 
 
 def test_get_pr_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'MIROC5', 'Amon', 'pr')
-    assert fix == [Pr(None)]
+    assert fix == [Pr(None), GenericFix(None)]
 
 
 @unittest.mock.patch(
@@ -64,7 +65,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'MIROC5', 'Amon', 'sftof'),
-                             [Sftof(None)])
+                             [Sftof(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -88,7 +89,7 @@ def setUp(self):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(Fix.get_fixes('CMIP5', 'MIROC5', 'Amon', 'tas'),
-                             [Tas(None)])
+                             [Tas(None), GenericFix(None)])
 
     def test_fix_metadata(self):
         """Test metadata fix."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_miroc_esm.py b/tests/integration/cmor/_fixes/cmip5/test_miroc_esm.py
index f87902a8d9..1010e4e670 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_miroc_esm.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_miroc_esm.py
@@ -9,6 +9,7 @@
 
 from esmvalcore.cmor._fixes.cmip5.miroc_esm import AllVars, Cl, Co2, Tro3
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -16,7 +17,7 @@
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'MIROC-ESM', 'Amon', 'cl')
-    assert fix == [Cl(None), AllVars(None)]
+    assert fix == [Cl(None), AllVars(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -37,7 +38,9 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'MIROC-ESM', 'Amon', 'co2'),
-            [Co2(self.vardef), AllVars(self.vardef)])
+            [Co2(self.vardef),
+             AllVars(self.vardef),
+             GenericFix(self.vardef)])
 
     def test_fix_metadata(self):
         """Test unit fix."""
@@ -58,7 +61,7 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'MIROC-ESM', 'Amon', 'tro3'),
-            [Tro3(None), AllVars(None)])
+            [Tro3(None), AllVars(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -102,7 +105,7 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'MIROC-ESM', 'Amon', 'tos'),
-            [AllVars(None)])
+            [AllVars(None), GenericFix(None)])
 
     def test_fix_metadata_plev(self):
         """Test plev fix."""
@@ -112,7 +115,7 @@ def test_fix_metadata_plev(self):
         cube.coord('air_pressure')
 
     def test_fix_metadata_no_plev(self):
-        """Test plev fix wotk with no plev."""
+        """Test plev fix work with no plev."""
         self.cube.remove_coord('AR5PL35')
         cube = self.fix.fix_metadata([self.cube])[0]
         with self.assertRaises(CoordinateNotFoundError):
diff --git a/tests/integration/cmor/_fixes/cmip5/test_miroc_esm_chem.py b/tests/integration/cmor/_fixes/cmip5/test_miroc_esm_chem.py
index 186f321710..1e14dfd30c 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_miroc_esm_chem.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_miroc_esm_chem.py
@@ -5,8 +5,9 @@
 from cf_units import Unit
 from iris.cube import Cube
 
-from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor._fixes.cmip5.miroc_esm_chem import Tro3
+from esmvalcore.cmor._fixes.fix import GenericFix
+from esmvalcore.cmor.fix import Fix
 
 
 class TestTro3(unittest.TestCase):
@@ -20,7 +21,7 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'MIROC-ESM-CHEM', 'Amon', 'tro3'),
-            [Tro3(None)])
+            [Tro3(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_lr.py b/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_lr.py
index effb781f9f..07aa974d15 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_lr.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_lr.py
@@ -6,13 +6,14 @@
 
 from esmvalcore.cmor._fixes.cmip5.mpi_esm_lr import Cl, Pctisccp
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'MPI-ESM-LR', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -32,7 +33,7 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'MPI-ESM-LR', 'Amon', 'pctisccp'),
-            [Pctisccp(None)])
+            [Pctisccp(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
diff --git a/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_mr.py b/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_mr.py
index 1c074d41a6..96cd83b963 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_mr.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_mr.py
@@ -1,13 +1,13 @@
 """Test fixes for MPI-ESM-MR."""
 from esmvalcore.cmor._fixes.cmip5.mpi_esm_mr import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'MPI-ESM-MR', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_p.py b/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_p.py
index 7e0aa87a5a..2466e5a9f8 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_p.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_mpi_esm_p.py
@@ -1,13 +1,13 @@
 """Test fixes for MPI-ESM-P."""
 from esmvalcore.cmor._fixes.cmip5.mpi_esm_p import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'MPI-ESM-P', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_mri_cgcm3.py b/tests/integration/cmor/_fixes/cmip5/test_mri_cgcm3.py
index 2b0d85ab7a..717c66cee6 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_mri_cgcm3.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_mri_cgcm3.py
@@ -3,13 +3,14 @@
 
 from esmvalcore.cmor._fixes.cmip5.mri_cgcm3 import Cl, Msftmyz, ThetaO
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'MRI-CGCM3', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -24,7 +25,7 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'MRI-CGCM3', 'Amon', 'msftmyz'),
-            [Msftmyz(None)])
+            [Msftmyz(None), GenericFix(None)])
 
 
 class TestThetao(unittest.TestCase):
@@ -34,4 +35,4 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'MRI-CGCM3', 'Amon', 'thetao'),
-            [ThetaO(None)])
+            [ThetaO(None), GenericFix(None)])
diff --git a/tests/integration/cmor/_fixes/cmip5/test_mri_esm1.py b/tests/integration/cmor/_fixes/cmip5/test_mri_esm1.py
index c00af1d6fe..f4d39eb70b 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_mri_esm1.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_mri_esm1.py
@@ -1,8 +1,9 @@
 """Test MRI-ESM1 fixes."""
 import unittest
 
-from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor._fixes.cmip5.mri_esm1 import Msftmyz
+from esmvalcore.cmor._fixes.fix import GenericFix
+from esmvalcore.cmor.fix import Fix
 
 
 class TestMsftmyz(unittest.TestCase):
@@ -11,4 +12,4 @@ def test_get(self):
         """Test fix get"""
         self.assertListEqual(
             Fix.get_fixes('CMIP5', 'MRI-ESM1', 'Amon', 'msftmyz'),
-            [Msftmyz(None)])
+            [Msftmyz(None), GenericFix(None)])
diff --git a/tests/integration/cmor/_fixes/cmip5/test_noresm1_m.py b/tests/integration/cmor/_fixes/cmip5/test_noresm1_m.py
index 79664ce6b9..1ad165c633 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_noresm1_m.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_noresm1_m.py
@@ -1,13 +1,13 @@
 """Test fixes for NorESM1-M."""
 from esmvalcore.cmor._fixes.cmip5.noresm1_m import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP5', 'NorESM1-M', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip5/test_noresm1_me.py b/tests/integration/cmor/_fixes/cmip5/test_noresm1_me.py
index ab286d78bd..b600311d5a 100644
--- a/tests/integration/cmor/_fixes/cmip5/test_noresm1_me.py
+++ b/tests/integration/cmor/_fixes/cmip5/test_noresm1_me.py
@@ -1,10 +1,11 @@
 """Tests for fixes of NorESM1-ME (CMIP5)."""
-import pytest
 import iris
+import pytest
 from iris.cube import CubeList
 
-from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor._fixes.cmip5.noresm1_me import Tas
+from esmvalcore.cmor._fixes.fix import GenericFix
+from esmvalcore.cmor.fix import Fix
 
 DIM_COORD_SHORT = iris.coords.DimCoord(
     [1.0, 2.0, 3.0],
@@ -69,4 +70,6 @@ def test_tas(cubes_in, cubes_out):
 
 def test_get():
     """Test fix get"""
-    assert Fix.get_fixes('CMIP5', 'NORESM1-ME', 'Amon', 'tas') == [Tas(None)]
+    assert Fix.get_fixes('CMIP5', 'NORESM1-ME', 'Amon', 'tas') == [
+        Tas(None), GenericFix(None)
+    ]
diff --git a/tests/integration/cmor/_fixes/cmip6/test_access_cm2.py b/tests/integration/cmor/_fixes/cmip6/test_access_cm2.py
index 0e5bd66eb9..00977403ea 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_access_cm2.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_access_cm2.py
@@ -7,6 +7,7 @@
 
 from esmvalcore.cmor._fixes.cmip6.access_cm2 import Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridHeightCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 B_POINTS = [
@@ -108,7 +109,7 @@ def cl_cubes():
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'ACCESS-CM2', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -132,7 +133,7 @@ def test_cl_fix_metadata(mock_base_fix_metadata, cl_cubes):
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'ACCESS-CM2', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -143,7 +144,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'ACCESS-CM2', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_access_esm1_5.py b/tests/integration/cmor/_fixes/cmip6/test_access_esm1_5.py
index d126d3a74d..29fb72c870 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_access_esm1_5.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_access_esm1_5.py
@@ -7,6 +7,7 @@
 
 from esmvalcore.cmor._fixes.cmip6.access_esm1_5 import Cl, Cli, Clw, Hus, Zg
 from esmvalcore.cmor._fixes.common import ClFixHybridHeightCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -77,7 +78,7 @@ def cl_cubes():
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'ACCESS-ESM1-5', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 @unittest.mock.patch(
@@ -101,7 +102,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'ACCESS-ESM1-5', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -112,7 +113,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'ACCESS-ESM1-5', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -143,7 +144,7 @@ def cubes_with_wrong_air_pressure():
 def test_get_hus_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'ACCESS-ESM1-5', 'Amon', 'hus')
-    assert fix == [Hus(None)]
+    assert fix == [Hus(None), GenericFix(None)]
 
 
 def test_hus_fix_metadata(cubes_with_wrong_air_pressure):
@@ -169,7 +170,7 @@ def test_hus_fix_metadata(cubes_with_wrong_air_pressure):
 def test_get_zg_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'ACCESS-ESM1-5', 'Amon', 'zg')
-    assert fix == [Zg(None)]
+    assert fix == [Zg(None), GenericFix(None)]
 
 
 def test_zg_fix_metadata(cubes_with_wrong_air_pressure):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_awi_cm_1_1_mr.py b/tests/integration/cmor/_fixes/cmip6/test_awi_cm_1_1_mr.py
index f198e2f69b..780b09bd7f 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_awi_cm_1_1_mr.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_awi_cm_1_1_mr.py
@@ -3,6 +3,7 @@
 import pytest
 
 from esmvalcore.cmor._fixes.cmip6.awi_cm_1_1_mr import AllVars
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
@@ -34,7 +35,7 @@ def cubes():
 
 def test_get_allvars_fix():
     fix = Fix.get_fixes('CMIP6', 'AWI-CM-1-1-MR', 'Amon', 'wrong_lat_lname')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_allvars_fix_metadata(cubes):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_awi_esm_1_1_lr.py b/tests/integration/cmor/_fixes/cmip6/test_awi_esm_1_1_lr.py
index eba75631e2..07dd1f41ef 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_awi_esm_1_1_lr.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_awi_esm_1_1_lr.py
@@ -3,6 +3,7 @@
 import pytest
 
 from esmvalcore.cmor._fixes.cmip6.awi_esm_1_1_lr import AllVars
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
@@ -15,7 +16,7 @@ def sample_cubes():
 
 def test_get_tas_fix():
     fix = Fix.get_fixes('CMIP6', 'AWI-ESM-1-1-LR', 'Amon', 'tas')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_allvars_fix_metadata(sample_cubes):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_bcc_csm2_mr.py b/tests/integration/cmor/_fixes/cmip6/test_bcc_csm2_mr.py
index ee5739380f..5281953fa0 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_bcc_csm2_mr.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_bcc_csm2_mr.py
@@ -12,13 +12,13 @@
     ClFixHybridPressureCoord,
     OceanFixGrid,
 )
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_areacello_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-CSM2-MR', 'Amon', 'areacello')
-    assert fix == [Areacello(None)]
+    assert fix == [Areacello(None), GenericFix(None)]
 
 
 def test_areacello_fix():
@@ -29,7 +29,7 @@ def test_areacello_fix():
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-CSM2-MR', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -40,7 +40,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-CSM2-MR', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -51,7 +51,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-CSM2-MR', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -62,7 +62,7 @@ def test_clw_fix():
 def test_get_tos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-CSM2-MR', 'Omon', 'tos')
-    assert fix == [Tos(None)]
+    assert fix == [Tos(None), GenericFix(None)]
 
 
 def test_tos_fix():
@@ -73,7 +73,7 @@ def test_tos_fix():
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-CSM2-MR', 'SImon', 'siconc')
-    assert fix == [Siconc(None)]
+    assert fix == [Siconc(None), GenericFix(None)]
 
 
 def test_siconc_fix():
@@ -84,7 +84,7 @@ def test_siconc_fix():
 def test_get_sos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-CSM2-MR', 'Omon', 'sos')
-    assert fix == [Sos(None)]
+    assert fix == [Sos(None), GenericFix(None)]
 
 
 def test_sos_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_bcc_esm1.py b/tests/integration/cmor/_fixes/cmip6/test_bcc_esm1.py
index 382d0268f3..076390e923 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_bcc_esm1.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_bcc_esm1.py
@@ -11,13 +11,13 @@
     ClFixHybridPressureCoord,
     OceanFixGrid,
 )
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-ESM1', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -28,7 +28,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-ESM1', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -39,7 +39,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-ESM1', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -50,7 +50,7 @@ def test_clw_fix():
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-ESM1', 'SImon', 'siconc')
-    assert fix == [Siconc(None)]
+    assert fix == [Siconc(None), GenericFix(None)]
 
 
 def test_siconc_fix():
@@ -61,7 +61,7 @@ def test_siconc_fix():
 def test_get_sos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-ESM1', 'Omon', 'sos')
-    assert fix == [Sos(None)]
+    assert fix == [Sos(None), GenericFix(None)]
 
 
 def test_sos_fix():
@@ -72,7 +72,7 @@ def test_sos_fix():
 def test_get_tos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-ESM1', 'Omon', 'tos')
-    assert fix == [Tos(None)]
+    assert fix == [Tos(None), GenericFix(None)]
 
 
 def test_tos_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_cams_csm1_0.py b/tests/integration/cmor/_fixes/cmip6/test_cams_csm1_0.py
index 55cb512aee..eb2367539c 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_cams_csm1_0.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_cams_csm1_0.py
@@ -1,13 +1,13 @@
 """Test fixes for CAMS-CSM1-0."""
 from esmvalcore.cmor._fixes.cmip6.cams_csm1_0 import Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CAMS-CSM1-0', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -18,7 +18,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CAMS-CSM1-0', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -29,7 +29,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CAMS-CSM1-0', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_canesm5.py b/tests/integration/cmor/_fixes/cmip6/test_canesm5.py
index 9b9638e5f3..5f23af82f3 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_canesm5.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_canesm5.py
@@ -4,13 +4,14 @@
 import pytest
 
 from esmvalcore.cmor._fixes.cmip6.canesm5 import Co2, Gpp
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_co2_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CanESM5', 'Amon', 'co2')
-    assert fix == [Co2(None)]
+    assert fix == [Co2(None), GenericFix(None)]
 
 
 @pytest.fixture
@@ -48,7 +49,7 @@ def gpp_cube():
 def test_get_gpp_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CanESM5', 'Lmon', 'gpp')
-    assert fix == [Gpp(None)]
+    assert fix == [Gpp(None), GenericFix(None)]
 
 
 def test_gpp_fix_data(gpp_cube):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_canesm5_canoe.py b/tests/integration/cmor/_fixes/cmip6/test_canesm5_canoe.py
index 349444559c..f0f43fd597 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_canesm5_canoe.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_canesm5_canoe.py
@@ -2,13 +2,13 @@
 from esmvalcore.cmor._fixes.cmip6.canesm5 import Co2 as BaseCo2
 from esmvalcore.cmor._fixes.cmip6.canesm5 import Gpp as BaseGpp
 from esmvalcore.cmor._fixes.cmip6.canesm5_canoe import Co2, Gpp
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_co2_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CanESM5-CanOE', 'Amon', 'co2')
-    assert fix == [Co2(None)]
+    assert fix == [Co2(None), GenericFix(None)]
 
 
 def test_co2_fix():
@@ -19,7 +19,7 @@ def test_co2_fix():
 def test_get_gpp_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CanESM5-CanOE', 'Lmon', 'gpp')
-    assert fix == [Gpp(None)]
+    assert fix == [Gpp(None), GenericFix(None)]
 
 
 def test_gpp_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_cas_esm2_0.py b/tests/integration/cmor/_fixes/cmip6/test_cas_esm2_0.py
index bd018b3f2e..2e22f91c1d 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_cas_esm2_0.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_cas_esm2_0.py
@@ -1,13 +1,14 @@
 """Tests for the fixes of CAS-ESM2-0."""
 from esmvalcore.cmor._fixes.cmip6.cas_esm2_0 import Cl
 from esmvalcore.cmor._fixes.cmip6.ciesm import Cl as BaseCl
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CAS-ESM2-0', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_cesm2.py b/tests/integration/cmor/_fixes/cmip6/test_cesm2.py
index 55442a323a..e60e1727b2 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_cesm2.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_cesm2.py
@@ -19,6 +19,7 @@
     Tos,
 )
 from esmvalcore.cmor._fixes.common import SiconcFixScalarCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -26,7 +27,7 @@
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 AIR_PRESSURE_POINTS = np.array([[[[1.0, 1.0, 1.0, 1.0],
@@ -163,7 +164,7 @@ def test_cl_fix_metadata(cl_cubes):
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -174,7 +175,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -268,31 +269,31 @@ def thetao_cubes():
 def test_get_tas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2', 'Amon', 'tas')
-    assert fix == [Tas(None)]
+    assert fix == [Tas(None), GenericFix(None)]
 
 
 def test_get_tos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2', 'Omon', 'tos')
-    assert fix == [Tos(None), Omon(None)]
+    assert fix == [Tos(None), Omon(None), GenericFix(None)]
 
 
 def test_get_thetao_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2', 'Omon', 'thetao')
-    assert fix == [Omon(None)]
+    assert fix == [Omon(None), GenericFix(None)]
 
 
 def test_get_fgco2_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2', 'Omon', 'fgco2')
-    assert fix == [Fgco2(None), Omon(None)]
+    assert fix == [Fgco2(None), Omon(None), GenericFix(None)]
 
 
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2', 'SImon', 'siconc')
-    assert fix == [Siconc(None)]
+    assert fix == [Siconc(None), GenericFix(None)]
 
 
 def test_tas_fix_metadata(tas_cubes):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_cesm2_fv2.py b/tests/integration/cmor/_fixes/cmip6/test_cesm2_fv2.py
index 96a2013075..16d8a9c0b2 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_cesm2_fv2.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_cesm2_fv2.py
@@ -12,13 +12,14 @@
     Tas,
 )
 from esmvalcore.cmor._fixes.common import SiconcFixScalarCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-FV2', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -29,7 +30,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-FV2', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -40,7 +41,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-FV2', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -51,7 +52,7 @@ def test_clw_fix():
 def test_get_fgco2_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-FV2', 'Omon', 'fgco2')
-    assert fix == [Fgco2(None), Omon(None)]
+    assert fix == [Fgco2(None), Omon(None), GenericFix(None)]
 
 
 def test_fgco2_fix():
@@ -62,7 +63,7 @@ def test_fgco2_fix():
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-FV2', 'SImon', 'siconc')
-    assert fix == [Siconc(None)]
+    assert fix == [Siconc(None), GenericFix(None)]
 
 
 def test_siconc_fix():
@@ -73,7 +74,7 @@ def test_siconc_fix():
 def test_get_tas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-FV2', 'Amon', 'tas')
-    assert fix == [Tas(None)]
+    assert fix == [Tas(None), GenericFix(None)]
 
 
 def test_tas_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_cesm2_waccm.py b/tests/integration/cmor/_fixes/cmip6/test_cesm2_waccm.py
index b9075b6716..b80beb45fc 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_cesm2_waccm.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_cesm2_waccm.py
@@ -20,13 +20,14 @@
     Tas,
 )
 from esmvalcore.cmor._fixes.common import SiconcFixScalarCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -65,7 +66,7 @@ def test_cl_fix_file(mock_get_filepath, tmp_path, test_data_path):
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -76,7 +77,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -87,7 +88,7 @@ def test_clw_fix():
 def test_get_fgco2_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM', 'Omon', 'fgco2')
-    assert fix == [Fgco2(None), Omon(None)]
+    assert fix == [Fgco2(None), Omon(None), GenericFix(None)]
 
 
 def test_fgco2_fix():
@@ -98,7 +99,7 @@ def test_fgco2_fix():
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM', 'SImon', 'siconc')
-    assert fix == [Siconc(None)]
+    assert fix == [Siconc(None), GenericFix(None)]
 
 
 def test_siconc_fix():
@@ -117,7 +118,7 @@ def tas_cubes():
 def test_get_tas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM', 'Amon', 'tas')
-    assert fix == [Tas(None)]
+    assert fix == [Tas(None), GenericFix(None)]
 
 
 def test_tas_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_cesm2_waccm_fv2.py b/tests/integration/cmor/_fixes/cmip6/test_cesm2_waccm_fv2.py
index a5ac8f6735..d4eb9b4b62 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_cesm2_waccm_fv2.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_cesm2_waccm_fv2.py
@@ -1,6 +1,6 @@
 """Tests for the fixes of CESM2-WACCM-FV2."""
-from esmvalcore.cmor._fixes.cmip6.cesm2 import Tas as BaseTas
 from esmvalcore.cmor._fixes.cmip6.cesm2 import Fgco2 as BaseFgco2
+from esmvalcore.cmor._fixes.cmip6.cesm2 import Tas as BaseTas
 from esmvalcore.cmor._fixes.cmip6.cesm2_waccm import Cl as BaseCl
 from esmvalcore.cmor._fixes.cmip6.cesm2_waccm_fv2 import (
     Cl,
@@ -12,13 +12,14 @@
     Tas,
 )
 from esmvalcore.cmor._fixes.common import SiconcFixScalarCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM-FV2', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -29,7 +30,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM-FV2', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -40,7 +41,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM-FV2', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -51,7 +52,7 @@ def test_clw_fix():
 def test_get_fgco2_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM-FV2', 'Omon', 'fgco2')
-    assert fix == [Fgco2(None), Omon(None)]
+    assert fix == [Fgco2(None), Omon(None), GenericFix(None)]
 
 
 def test_fgco2_fix():
@@ -62,7 +63,7 @@ def test_fgco2_fix():
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM-FV2', 'SImon', 'siconc')
-    assert fix == [Siconc(None)]
+    assert fix == [Siconc(None), GenericFix(None)]
 
 
 def test_siconc_fix():
@@ -73,7 +74,7 @@ def test_siconc_fix():
 def test_get_tas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CESM2-WACCM-FV2', 'Amon', 'tas')
-    assert fix == [Tas(None)]
+    assert fix == [Tas(None), GenericFix(None)]
 
 
 def test_tas_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_ciesm.py b/tests/integration/cmor/_fixes/cmip6/test_ciesm.py
index 29da65c025..1cf1aa3aad 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_ciesm.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_ciesm.py
@@ -4,13 +4,14 @@
 
 from esmvalcore.cmor._fixes.cmip6.ciesm import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CIESM', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 @pytest.fixture
diff --git a/tests/integration/cmor/_fixes/cmip6/test_cmcc_cm2_sr5.py b/tests/integration/cmor/_fixes/cmip6/test_cmcc_cm2_sr5.py
index 44f410427c..27aa306289 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_cmcc_cm2_sr5.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_cmcc_cm2_sr5.py
@@ -6,6 +6,7 @@
 
 from esmvalcore.cmor._fixes.cmip6.cmcc_cm2_sr5 import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -13,7 +14,7 @@
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CMCC-CM2-SR5', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 @pytest.fixture
diff --git a/tests/integration/cmor/_fixes/cmip6/test_cnrm_cm6_1.py b/tests/integration/cmor/_fixes/cmip6/test_cnrm_cm6_1.py
index 8322b1e7fe..18ca8a3fa4 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_cnrm_cm6_1.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_cnrm_cm6_1.py
@@ -4,8 +4,14 @@
 import numpy as np
 import pytest
 
-from esmvalcore.cmor._fixes.cmip6.cnrm_cm6_1 import (Cl, Clcalipso,
-                                                     Cli, Clw, Omon)
+from esmvalcore.cmor._fixes.cmip6.cnrm_cm6_1 import (
+    Cl,
+    Clcalipso,
+    Cli,
+    Clw,
+    Omon,
+)
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -14,7 +20,7 @@
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-CM6-1', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 AIR_PRESSURE_POINTS = np.array([[[[1.0, 1.0],
@@ -85,7 +91,7 @@ def test_cl_fix_metadata(test_data_path):
 def test_get_clcalipso_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-CM6-1', 'CFmon', 'clcalipso')
-    assert fix == [Clcalipso(None)]
+    assert fix == [Clcalipso(None), GenericFix(None)]
 
 
 @pytest.fixture
@@ -113,7 +119,7 @@ def test_clcalipso_fix_metadata(clcalipso_cubes):
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-CM6-1', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -124,7 +130,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-CM6-1', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -135,4 +141,4 @@ def test_clw_fix():
 def test_get_thetao_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-CM6-1', 'Omon', 'thetao')
-    assert fix == [Omon(None)]
+    assert fix == [Omon(None), GenericFix(None)]
diff --git a/tests/integration/cmor/_fixes/cmip6/test_cnrm_cm6_1_hr.py b/tests/integration/cmor/_fixes/cmip6/test_cnrm_cm6_1_hr.py
index fa43c06acf..9ac3e8bad1 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_cnrm_cm6_1_hr.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_cnrm_cm6_1_hr.py
@@ -3,13 +3,13 @@
 from esmvalcore.cmor._fixes.cmip6.cnrm_cm6_1 import Cli as BaseCli
 from esmvalcore.cmor._fixes.cmip6.cnrm_cm6_1 import Clw as BaseClw
 from esmvalcore.cmor._fixes.cmip6.cnrm_cm6_1_hr import Cl, Cli, Clw
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-CM6-1-HR', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -20,7 +20,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-CM6-1-HR', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -31,7 +31,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-CM6-1-HR', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_cnrm_esm2_1.py b/tests/integration/cmor/_fixes/cmip6/test_cnrm_esm2_1.py
index 8ff7b7e0a2..3e6d66ebb9 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_cnrm_esm2_1.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_cnrm_esm2_1.py
@@ -7,16 +7,21 @@
 from esmvalcore.cmor._fixes.cmip6.cnrm_cm6_1 import Clcalipso as BaseClcalipso
 from esmvalcore.cmor._fixes.cmip6.cnrm_cm6_1 import Cli as BaseCli
 from esmvalcore.cmor._fixes.cmip6.cnrm_cm6_1 import Clw as BaseClw
-from esmvalcore.cmor._fixes.cmip6.cnrm_esm2_1 import (Cl, Clcalipso,
-                                                      Cli, Clw, Omon)
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.cmip6.cnrm_esm2_1 import (
+    Cl,
+    Clcalipso,
+    Cli,
+    Clw,
+    Omon,
+)
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 from esmvalcore.cmor.table import get_var_info
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-ESM2-1', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -27,7 +32,7 @@ def test_cl_fix():
 def test_get_clcalipso_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-ESM2-1', 'Amon', 'clcalipso')
-    assert fix == [Clcalipso(None)]
+    assert fix == [Clcalipso(None), GenericFix(None)]
 
 
 def test_clcalipso_fix():
@@ -38,7 +43,7 @@ def test_clcalipso_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-ESM2-1', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -49,7 +54,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-ESM2-1', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -88,7 +93,7 @@ def thetao_cubes():
 def test_get_thetao_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'CNRM-ESM2-1', 'Omon', 'thetao')
-    assert fix == [Omon(None)]
+    assert fix == [Omon(None), GenericFix(None)]
 
 
 def test_thetao_fix_metadata(thetao_cubes):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_e3sm_1_0.py b/tests/integration/cmor/_fixes/cmip6/test_e3sm_1_0.py
index e86de9e3a2..890c81fd6b 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_e3sm_1_0.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_e3sm_1_0.py
@@ -1,13 +1,14 @@
 """Tests for the fixes of E3SM-1-0."""
 from esmvalcore.cmor._fixes.cmip6.e3sm_1_0 import Cl
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'E3SM-1-0', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_ec_earth3_veg.py b/tests/integration/cmor/_fixes/cmip6/test_ec_earth3_veg.py
index f30904b46e..b9145e6e87 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_ec_earth3_veg.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_ec_earth3_veg.py
@@ -14,6 +14,7 @@
     Siconca,
     Tas,
 )
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -30,7 +31,7 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('CMIP6', 'EC-Earth3-Veg', 'SImon', 'siconca'),
-            [Siconca(None)])
+            [Siconca(None), GenericFix(None)])
 
     def test_fix_data(self):
         """Test data fix."""
@@ -41,13 +42,13 @@ def test_fix_data(self):
 
 def test_get_siconc_fix():
     """Test sinconc calendar is fixed."""
-    fix, = Fix.get_fixes('CMIP6', 'EC-Earth3-Veg', 'SImon', 'siconc')
+    fix = Fix.get_fixes('CMIP6', 'EC-Earth3-Veg', 'SImon', 'siconc')[0]
     assert isinstance(fix, CalendarFix)
 
 
 def test_get_tos_fix():
     """Test tos calendar is fixed."""
-    fix, = Fix.get_fixes('CMIP6', 'EC-Earth3-Veg', 'Omon', 'tos')
+    fix = Fix.get_fixes('CMIP6', 'EC-Earth3-Veg', 'Omon', 'tos')[0]
     assert isinstance(fix, CalendarFix)
 
 
@@ -110,7 +111,7 @@ def tas_cubes():
 def test_get_tas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'EC-Earth3-Veg', 'Amon', 'tas')
-    assert fix == [Tas(None)]
+    assert fix == [Tas(None), GenericFix(None)]
 
 
 def test_tas_fix_metadata(tas_cubes):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_ec_earth3_veg_lr.py b/tests/integration/cmor/_fixes/cmip6/test_ec_earth3_veg_lr.py
index 22abcc7d33..b3f7963a7d 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_ec_earth3_veg_lr.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_ec_earth3_veg_lr.py
@@ -1,13 +1,13 @@
 """Test fixes for EC-Earth3-Veg-LR."""
 from esmvalcore.cmor._fixes.cmip6.ec_earth3_veg_lr import Siconc
 from esmvalcore.cmor._fixes.common import OceanFixGrid
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'EC-Earth3-Veg-LR', 'SImon', 'siconc')
-    assert fix == [Siconc(None)]
+    assert fix == [Siconc(None), GenericFix(None)]
 
 
 def test_siconc_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_fgoals_f3_l.py b/tests/integration/cmor/_fixes/cmip6/test_fgoals_f3_l.py
index 450158ca7d..7e9aa38d06 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_fgoals_f3_l.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_fgoals_f3_l.py
@@ -1,17 +1,13 @@
 """Tests for the fixes of FGOALS-f3-L."""
 
-import numpy as np
 import iris
+import numpy as np
 import pytest
 from cf_units import Unit
 
-from esmvalcore.cmor._fixes.cmip6.fgoals_f3_l import (
-    AllVars,
-    Clt,
-    Sftlf,
-    Tos,
-)
+from esmvalcore.cmor._fixes.cmip6.fgoals_f3_l import AllVars, Clt, Sftlf, Tos
 from esmvalcore.cmor._fixes.common import OceanFixGrid
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
@@ -80,7 +76,7 @@ def cubes():
 
 def test_get_allvars_fix():
     fix = Fix.get_fixes('CMIP6', 'FGOALS-f3-L', 'Amon', 'wrong_time_bnds')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_allvars_fix_metadata(cubes):
@@ -104,7 +100,7 @@ def test_tos_fix():
 def test_get_clt_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'FGOALS-f3-l', 'Amon', 'clt')
-    assert fix == [Clt(None), AllVars(None)]
+    assert fix == [Clt(None), AllVars(None), GenericFix(None)]
 
 
 @pytest.fixture
@@ -129,7 +125,7 @@ def test_clt_fix_data(clt_cube):
 def test_get_sftlf_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'FGOALS-f3-l', 'Amon', 'sftlf')
-    assert fix == [Sftlf(None), AllVars(None)]
+    assert fix == [Sftlf(None), AllVars(None), GenericFix(None)]
 
 
 def test_sftlf_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_fgoals_g3.py b/tests/integration/cmor/_fixes/cmip6/test_fgoals_g3.py
index 630aa99fca..8bb9457021 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_fgoals_g3.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_fgoals_g3.py
@@ -6,6 +6,7 @@
 
 from esmvalcore.cmor._fixes.cmip6.fgoals_g3 import Mrsos, Siconc, Tos
 from esmvalcore.cmor._fixes.common import OceanFixGrid
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -13,7 +14,7 @@
 def test_get_tos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-CSM2-MR', 'Omon', 'tos')
-    assert fix == [Tos(None)]
+    assert fix == [Tos(None), GenericFix(None)]
 
 
 def test_tos_fix():
@@ -56,7 +57,7 @@ def test_tos_fix_metadata(mock_base_fix_metadata):
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'BCC-CSM2-MR', 'SImon', 'siconc')
-    assert fix == [Siconc(None)]
+    assert fix == [Siconc(None), GenericFix(None)]
 
 
 def test_siconc_fix():
@@ -67,7 +68,7 @@ def test_siconc_fix():
 def test_get_mrsos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'FGOALS-g3', 'Lmon', 'mrsos')
-    assert fix == [Mrsos(None)]
+    assert fix == [Mrsos(None), GenericFix(None)]
 
 
 def test_mrsos_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_fio_esm_2_0.py b/tests/integration/cmor/_fixes/cmip6/test_fio_esm_2_0.py
index 36696f122b..4ac1d05d4c 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_fio_esm_2_0.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_fio_esm_2_0.py
@@ -6,6 +6,7 @@
 
 from esmvalcore.cmor._fixes.cmip6.fio_esm_2_0 import Amon, Omon, Tos
 from esmvalcore.cmor._fixes.common import OceanFixGrid
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -13,13 +14,13 @@
 def test_get_tas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'FIO-ESM-2-0', 'Amon', 'tas')
-    assert fix == [Amon(None)]
+    assert fix == [Amon(None), GenericFix(None)]
 
 
 def test_get_tos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'FIO-ESM-2-0', 'Omon', 'tos')
-    assert fix == [OceanFixGrid(None), Omon(None)]
+    assert fix == [OceanFixGrid(None), Omon(None), GenericFix(None)]
 
 
 def test_tos_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_gfdl_cm4.py b/tests/integration/cmor/_fixes/cmip6/test_gfdl_cm4.py
index e52b55a001..f28310c6c2 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_gfdl_cm4.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_gfdl_cm4.py
@@ -3,9 +3,16 @@
 import numpy as np
 import pytest
 
-from esmvalcore.cmor._fixes.cmip6.gfdl_cm4 import (Cl, Cli, Clw,
-                                                   Fgco2, Omon, Siconc)
+from esmvalcore.cmor._fixes.cmip6.gfdl_cm4 import (
+    Cl,
+    Cli,
+    Clw,
+    Fgco2,
+    Omon,
+    Siconc,
+)
 from esmvalcore.cmor._fixes.common import SiconcFixScalarCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -13,7 +20,7 @@
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GFDL-CM4', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 AIR_PRESSURE_POINTS = np.array([[[[1.0, 1.0],
@@ -75,7 +82,7 @@ def test_cl_fix_metadata(test_data_path):
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GFDL-CM4', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -86,7 +93,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GFDL-CM4', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -97,13 +104,13 @@ def test_clw_fix():
 def test_get_fgco2_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GFDL-CM4', 'Omon', 'fgco2')
-    assert fix == [Fgco2(None), Omon(None)]
+    assert fix == [Fgco2(None), Omon(None), GenericFix(None)]
 
 
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GFDL-CM4', 'SImon', 'siconc')
-    assert fix == [Siconc(None)]
+    assert fix == [Siconc(None), GenericFix(None)]
 
 
 def test_siconc_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_gfdl_esm4.py b/tests/integration/cmor/_fixes/cmip6/test_gfdl_esm4.py
index d21323bb10..1db8eca4a0 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_gfdl_esm4.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_gfdl_esm4.py
@@ -6,6 +6,7 @@
 
 from esmvalcore.cmor._fixes.cmip6.gfdl_esm4 import Fgco2, Omon, Siconc
 from esmvalcore.cmor._fixes.common import SiconcFixScalarCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -13,7 +14,7 @@
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GFDL-ESM4', 'SImon', 'siconc')
-    assert fix == [Siconc(None)]
+    assert fix == [Siconc(None), GenericFix(None)]
 
 
 def test_siconc_fix():
@@ -52,7 +53,7 @@ def thetao_cubes():
 def test_get_thetao_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GFDL-ESM4', 'Omon', 'thetao')
-    assert fix == [Omon(None)]
+    assert fix == [Omon(None), GenericFix(None)]
 
 
 def test_thetao_fix_metadata(thetao_cubes):
@@ -76,7 +77,7 @@ def test_thetao_fix_metadata(thetao_cubes):
 def test_get_fgco2_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GFDL-ESM4', 'Omon', 'fgco2')
-    assert fix == [Fgco2(None), Omon(None)]
+    assert fix == [Fgco2(None), Omon(None), GenericFix(None)]
 
 
 def test_fgco2_fix_metadata():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_giss_e2_1_g.py b/tests/integration/cmor/_fixes/cmip6/test_giss_e2_1_g.py
index 9c88dc61aa..40e61adb86 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_giss_e2_1_g.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_giss_e2_1_g.py
@@ -5,13 +5,13 @@
 
 from esmvalcore.cmor._fixes.cmip6.giss_e2_1_g import Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GISS-E2-1-G', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -22,7 +22,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GISS-E2-1-G', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -33,7 +33,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GISS-E2-1-G', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -42,7 +42,7 @@ def test_clw_fix():
 
 
 def test_tos_fix():
-    fix, = Fix.get_fixes('CMIP6', 'GISS-E2-1-G', 'Omon', 'tos')
+    fix = Fix.get_fixes('CMIP6', 'GISS-E2-1-G', 'Omon', 'tos')[0]
     cube = Cube(
         da.array([274], dtype=np.float32),
         var_name='tos',
diff --git a/tests/integration/cmor/_fixes/cmip6/test_giss_e2_1_h.py b/tests/integration/cmor/_fixes/cmip6/test_giss_e2_1_h.py
index f8afbeea0a..482e72cd22 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_giss_e2_1_h.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_giss_e2_1_h.py
@@ -1,13 +1,13 @@
 """Test fixes for GISS-E2-1-H."""
 from esmvalcore.cmor._fixes.cmip6.giss_e2_1_h import Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GISS-E2-1-H', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -18,7 +18,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GISS-E2-1-H', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -29,7 +29,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'GISS-E2-1-H', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_hadgem3_gc31_ll.py b/tests/integration/cmor/_fixes/cmip6/test_hadgem3_gc31_ll.py
index a6543060be..aa9e7c34cb 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_hadgem3_gc31_ll.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_hadgem3_gc31_ll.py
@@ -4,6 +4,7 @@
 
 from esmvalcore.cmor._fixes.cmip6.hadgem3_gc31_ll import AllVars, Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridHeightCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
@@ -16,7 +17,7 @@ def sample_cubes():
 
 def test_get_tas_fix():
     fix = Fix.get_fixes('CMIP6', 'HadGEM3-GC31-LL', 'Amon', 'tas')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_allvars_fix_metadata(sample_cubes):
@@ -40,7 +41,7 @@ def test_allvars_no_need_tofix_metadata(sample_cubes):
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'HadGEM3-GC31-LL', 'Amon', 'cl')
-    assert fix == [Cl(None), AllVars(None)]
+    assert fix == [Cl(None), AllVars(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -51,7 +52,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'HadGEM3-GC31-LL', 'Amon', 'cli')
-    assert fix == [Cli(None), AllVars(None)]
+    assert fix == [Cli(None), AllVars(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -62,7 +63,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'HadGEM3-GC31-LL', 'Amon', 'clw')
-    assert fix == [Clw(None), AllVars(None)]
+    assert fix == [Clw(None), AllVars(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_icon_esm_lr.py b/tests/integration/cmor/_fixes/cmip6/test_icon_esm_lr.py
index 705a8bb5ef..dfd183788d 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_icon_esm_lr.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_icon_esm_lr.py
@@ -4,6 +4,7 @@
 from iris.cube import Cube, CubeList
 
 from esmvalcore.cmor._fixes.cmip6.icon_esm_lr import AllVars
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
@@ -34,7 +35,7 @@ def cubes():
 def test_get_allvars_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'ICON-ESM-LR', 'Amon', 'tas')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_allvars_fix_metadata_lat_lon(cubes):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_iitm_esm.py b/tests/integration/cmor/_fixes/cmip6/test_iitm_esm.py
index 52380e87fd..16efd1d75c 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_iitm_esm.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_iitm_esm.py
@@ -6,6 +6,7 @@
 
 from esmvalcore.cmor._fixes.cmip6.iitm_esm import AllVars, Tos
 from esmvalcore.cmor._fixes.common import OceanFixGrid
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
@@ -16,7 +17,7 @@ def test_get_tos_fix():
                         'Omon',
                         'tos',
                         extra_facets={"frequency": "mon"})
-    assert fix == [Tos(None), AllVars(None)]
+    assert fix == [Tos(None), AllVars(None), GenericFix(None)]
 
 
 def test_tos_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_ipsl_cm6a_lr.py b/tests/integration/cmor/_fixes/cmip6/test_ipsl_cm6a_lr.py
index 99f2a76aa2..c32008ef0c 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_ipsl_cm6a_lr.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_ipsl_cm6a_lr.py
@@ -9,7 +9,7 @@
 from iris.exceptions import CoordinateNotFoundError
 
 from esmvalcore.cmor._fixes.cmip6.ipsl_cm6a_lr import AllVars, Clcalipso, Omon
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 from esmvalcore.cmor.table import get_var_info
 
 
@@ -79,7 +79,7 @@ def test_fix_data_no_lat_lon(self):
 def test_get_clcalipso_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'IPSL-CM6A-LR', 'CFmon', 'clcalipso')
-    assert fix == [Clcalipso(None), AllVars(None)]
+    assert fix == [Clcalipso(None), AllVars(None), GenericFix(None)]
 
 
 @pytest.fixture
@@ -137,7 +137,7 @@ def thetao_cubes():
 def test_get_thetao_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'IPSL-CM6A-LR', 'Omon', 'thetao')
-    assert fix == [Omon(None), AllVars(None)]
+    assert fix == [Omon(None), AllVars(None), GenericFix(None)]
 
 
 def test_thetao_fix_metadata(thetao_cubes):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_kace_1_0_g.py b/tests/integration/cmor/_fixes/cmip6/test_kace_1_0_g.py
index 21e35f0c01..5d6b4641d8 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_kace_1_0_g.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_kace_1_0_g.py
@@ -6,13 +6,14 @@
 
 from esmvalcore.cmor._fixes.cmip6.kace_1_0_g import AllVars, Cl, Cli, Clw, Tos
 from esmvalcore.cmor._fixes.common import ClFixHybridHeightCoord, OceanFixGrid
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'KACE-1-0-G', 'Amon', 'cl')
-    assert fix == [Cl(None), AllVars(None)]
+    assert fix == [Cl(None), AllVars(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -23,7 +24,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'KACE-1-0-G', 'Amon', 'cli')
-    assert fix == [Cli(None), AllVars(None)]
+    assert fix == [Cli(None), AllVars(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -34,7 +35,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'KACE-1-0-G', 'Amon', 'clw')
-    assert fix == [Clw(None), AllVars(None)]
+    assert fix == [Clw(None), AllVars(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -45,7 +46,7 @@ def test_clw_fix():
 def test_get_tos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'KACE-1-0-G', 'Omon', 'tos')
-    assert fix == [Tos(None), AllVars(None)]
+    assert fix == [Tos(None), AllVars(None), GenericFix(None)]
 
 
 def test_tos_fix():
@@ -101,7 +102,7 @@ def tos_cubes():
 
 def test_get_allvars_fix():
     fix = Fix.get_fixes('CMIP6', 'KACE-1-0-G', 'Omon', 'tos')
-    assert fix == [OceanFixGrid(None), AllVars(None)]
+    assert fix == [OceanFixGrid(None), AllVars(None), GenericFix(None)]
 
 
 def test_allvars_fix_metadata(monkeypatch, tos_cubes, caplog):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_kiost_esm.py b/tests/integration/cmor/_fixes/cmip6/test_kiost_esm.py
index 9b460db15a..80af6436e1 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_kiost_esm.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_kiost_esm.py
@@ -8,7 +8,7 @@
 
 from esmvalcore.cmor._fixes.cmip6.kiost_esm import SfcWind, Siconc, Tas
 from esmvalcore.cmor._fixes.common import SiconcFixScalarCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 from esmvalcore.cmor.table import get_var_info
 
 
@@ -72,7 +72,7 @@ def tas_cubes():
 
 def test_get_sfcwind_fix():
     fix = Fix.get_fixes('CMIP6', 'KIOST-ESM', 'Amon', 'sfcWind')
-    assert fix == [SfcWind(None)]
+    assert fix == [SfcWind(None), GenericFix(None)]
 
 
 def test_sfcwind_fix_metadata(sfcwind_cubes):
@@ -104,7 +104,7 @@ def test_sfcwind_fix_metadata(sfcwind_cubes):
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'KIOST-ESM', 'SImon', 'siconc')
-    assert fix == [Siconc(None)]
+    assert fix == [Siconc(None), GenericFix(None)]
 
 
 def test_siconc_fix():
@@ -127,7 +127,7 @@ def test_siconc_fix_data():
 
 def test_get_tas_fix():
     fix = Fix.get_fixes('CMIP6', 'KIOST-ESM', 'Amon', 'tas')
-    assert fix == [Tas(None)]
+    assert fix == [Tas(None), GenericFix(None)]
 
 
 def test_tas_fix_metadata(tas_cubes):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_mcm_ua_1_0.py b/tests/integration/cmor/_fixes/cmip6/test_mcm_ua_1_0.py
index bbb1a98f32..85eed25338 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_mcm_ua_1_0.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_mcm_ua_1_0.py
@@ -5,6 +5,7 @@
 from cf_units import Unit
 
 from esmvalcore.cmor._fixes.cmip6.mcm_ua_1_0 import AllVars, Omon, Tas, Uas
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -119,17 +120,17 @@ def cubes_bounds():
 def test_get_allvars_fix():
     fix = Fix.get_fixes('CMIP6', 'MCM-UA-1-0', 'Amon',
                         'arbitrary_var_name_and_wrong_lon_bnds')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_get_tas_fix():
     fix = Fix.get_fixes('CMIP6', 'MCM-UA-1-0', 'Amon', 'tas')
-    assert fix == [Tas(None), AllVars(None)]
+    assert fix == [Tas(None), AllVars(None), GenericFix(None)]
 
 
 def test_get_uas_fix():
     fix = Fix.get_fixes('CMIP6', 'MCM-UA-1-0', 'Amon', 'uas')
-    assert fix == [Uas(None), AllVars(None)]
+    assert fix == [Uas(None), AllVars(None), GenericFix(None)]
 
 
 def test_allvars_fix_metadata(cubes):
@@ -265,7 +266,7 @@ def thetao_cubes():
 def test_get_thetao_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MCM-UA-1-0', 'Omon', 'thetao')
-    assert fix == [Omon(None), AllVars(None)]
+    assert fix == [Omon(None), AllVars(None), GenericFix(None)]
 
 
 def test_thetao_fix_metadata(thetao_cubes):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_miroc6.py b/tests/integration/cmor/_fixes/cmip6/test_miroc6.py
index 9c021d9ce5..26662a0ec3 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_miroc6.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_miroc6.py
@@ -5,14 +5,14 @@
 
 from esmvalcore.cmor._fixes.cmip6.miroc6 import Cl, Cli, Clw, Tos
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 from esmvalcore.cmor.table import get_var_info
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MIROC6', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -23,7 +23,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MIROC6', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -34,7 +34,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MIROC6', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -69,7 +69,7 @@ def tos_cubes():
 def test_get_tos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MIROC6', 'Omon', 'tos')
-    assert fix == [Tos(None)]
+    assert fix == [Tos(None), GenericFix(None)]
 
 
 def test_tos_fix_metadata(tos_cubes):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_miroc_es2l.py b/tests/integration/cmor/_fixes/cmip6/test_miroc_es2l.py
index 550f01d80c..22ae2d1c03 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_miroc_es2l.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_miroc_es2l.py
@@ -1,13 +1,13 @@
 """Test fixes for MIROC-ES2L."""
 from esmvalcore.cmor._fixes.cmip6.miroc_es2l import Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MIROC-ES2L', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -18,7 +18,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MIROC-ES2L', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -29,7 +29,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MIROC-ES2L', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_mpi_esm1_2_lr.py b/tests/integration/cmor/_fixes/cmip6/test_mpi_esm1_2_lr.py
index 0f05c763cb..2ae3af9355 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_mpi_esm1_2_lr.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_mpi_esm1_2_lr.py
@@ -1,13 +1,14 @@
 """Tests for the fixes of MPI-ESM1-2-LR."""
 from esmvalcore.cmor._fixes.cmip6.mpi_esm1_2_lr import Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MPI-ESM1-2-LR', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -18,7 +19,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MPI-ESM1-2-LR', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -29,7 +30,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MPI-ESM1-2-LR', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_mpi_esm_1_2_ham.py b/tests/integration/cmor/_fixes/cmip6/test_mpi_esm_1_2_ham.py
index 492aa45f57..358cb1f56f 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_mpi_esm_1_2_ham.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_mpi_esm_1_2_ham.py
@@ -1,13 +1,14 @@
 """Tests for the fixes of MPI-ESM-1-2-HAM."""
 from esmvalcore.cmor._fixes.cmip6.mpi_esm_1_2_ham import Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MPI-ESM-1-2-HAM', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -18,7 +19,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MPI-ESM-1-2-HAM', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -29,7 +30,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MPI-ESM-1-2-HAM', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_mri_esm2_0.py b/tests/integration/cmor/_fixes/cmip6/test_mri_esm2_0.py
index 609cd12abc..6ec68855b7 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_mri_esm2_0.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_mri_esm2_0.py
@@ -1,13 +1,13 @@
 """Test fixes for MRI-ESM2-0."""
 from esmvalcore.cmor._fixes.cmip6.mri_esm2_0 import Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MRI-ESM2-0', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -18,7 +18,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MRI-ESM2-0', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -29,7 +29,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'MRI-ESM2-0', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_nesm3.py b/tests/integration/cmor/_fixes/cmip6/test_nesm3.py
index c1e1fe5f94..bc9265bc5b 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_nesm3.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_nesm3.py
@@ -1,13 +1,13 @@
 """Test fixes for NESM3."""
 from esmvalcore.cmor._fixes.cmip6.nesm3 import Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'NESM3', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -18,7 +18,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'NESM3', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -29,7 +29,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'NESM3', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_noresm2_lm.py b/tests/integration/cmor/_fixes/cmip6/test_noresm2_lm.py
index c77e945dee..78ea66effc 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_noresm2_lm.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_noresm2_lm.py
@@ -12,6 +12,7 @@
     Siconc,
 )
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
 
@@ -19,7 +20,7 @@
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'NorESM2-LM', 'Amon', 'cl')
-    assert fix == [Cl(None), AllVars(None)]
+    assert fix == [Cl(None), AllVars(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -30,7 +31,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'NorESM2-LM', 'Amon', 'cli')
-    assert fix == [Cli(None), AllVars(None)]
+    assert fix == [Cli(None), AllVars(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -41,7 +42,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'NorESM2-LM', 'Amon', 'clw')
-    assert fix == [Clw(None), AllVars(None)]
+    assert fix == [Clw(None), AllVars(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -97,7 +98,7 @@ def cubes_bounds():
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'NorESM2-LM', 'SImon', 'siconc')
-    assert fix == [Siconc(None), AllVars(None)]
+    assert fix == [Siconc(None), AllVars(None), GenericFix(None)]
 
 
 def test_allvars_fix_lon_bounds(cubes_bounds):
diff --git a/tests/integration/cmor/_fixes/cmip6/test_noresm2_mm.py b/tests/integration/cmor/_fixes/cmip6/test_noresm2_mm.py
index 2fd3a9c7f4..0868dd910a 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_noresm2_mm.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_noresm2_mm.py
@@ -1,13 +1,14 @@
 """Tests for the fixes of NorESM2-MM."""
 from esmvalcore.cmor._fixes.cmip6.noresm2_mm import Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'NorESM2-MM', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -18,7 +19,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'NorESM2-MM', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -29,7 +30,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'NorESM2-MM', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_sam0_unicon.py b/tests/integration/cmor/_fixes/cmip6/test_sam0_unicon.py
index 09d35be726..e9f0a76a50 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_sam0_unicon.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_sam0_unicon.py
@@ -5,13 +5,13 @@
 
 from esmvalcore.cmor._fixes.cmip6.sam0_unicon import Cl, Cli, Clw, Nbp
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
-from esmvalcore.cmor._fixes.fix import Fix
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'SAM0-UNICON', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -22,7 +22,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'SAM0-UNICON', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -33,7 +33,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'SAM0-UNICON', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
@@ -44,7 +44,7 @@ def test_clw_fix():
 def test_get_nbp_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'SAM0-UNICON', 'Lmon', 'nbp')
-    assert fix == [Nbp(None)]
+    assert fix == [Nbp(None), GenericFix(None)]
 
 
 @pytest.fixture
diff --git a/tests/integration/cmor/_fixes/cmip6/test_taiesm1.py b/tests/integration/cmor/_fixes/cmip6/test_taiesm1.py
index 107db534bd..dd955ef1fb 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_taiesm1.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_taiesm1.py
@@ -1,13 +1,14 @@
 """Tests for the fixes of TaiESM1."""
 from esmvalcore.cmor._fixes.cmip6.taiesm1 import Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridPressureCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'TaiESM1', 'Amon', 'cl')
-    assert fix == [Cl(None)]
+    assert fix == [Cl(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -18,7 +19,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'TaiESM1', 'Amon', 'cli')
-    assert fix == [Cli(None)]
+    assert fix == [Cli(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -29,7 +30,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'TaiESM1', 'Amon', 'clw')
-    assert fix == [Clw(None)]
+    assert fix == [Clw(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cmip6/test_ukesm1_0_ll.py b/tests/integration/cmor/_fixes/cmip6/test_ukesm1_0_ll.py
index f6aceb1211..423d55e637 100644
--- a/tests/integration/cmor/_fixes/cmip6/test_ukesm1_0_ll.py
+++ b/tests/integration/cmor/_fixes/cmip6/test_ukesm1_0_ll.py
@@ -4,6 +4,7 @@
 
 from esmvalcore.cmor._fixes.cmip6.ukesm1_0_ll import AllVars, Cl, Cli, Clw
 from esmvalcore.cmor._fixes.common import ClFixHybridHeightCoord
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 
 
@@ -18,7 +19,7 @@ def sample_cubes():
 def test_get_tas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'UKESM1-0-LL', 'Amon', 'tas')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_allvars_fix_metadata(sample_cubes):
@@ -44,7 +45,7 @@ def test_allvars_no_need_tofix_metadata(sample_cubes):
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'UKESM1-0-LL', 'Amon', 'cl')
-    assert fix == [Cl(None), AllVars(None)]
+    assert fix == [Cl(None), AllVars(None), GenericFix(None)]
 
 
 def test_cl_fix():
@@ -55,7 +56,7 @@ def test_cl_fix():
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'UKESM1-0-LL', 'Amon', 'cli')
-    assert fix == [Cli(None), AllVars(None)]
+    assert fix == [Cli(None), AllVars(None), GenericFix(None)]
 
 
 def test_cli_fix():
@@ -66,7 +67,7 @@ def test_cli_fix():
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('CMIP6', 'UKESM1-0-LL', 'Amon', 'clw')
-    assert fix == [Clw(None), AllVars(None)]
+    assert fix == [Clw(None), AllVars(None), GenericFix(None)]
 
 
 def test_clw_fix():
diff --git a/tests/integration/cmor/_fixes/cordex/test_cnrm_cerfacs_cnrm_cm5.py b/tests/integration/cmor/_fixes/cordex/test_cnrm_cerfacs_cnrm_cm5.py
index 2b29c7185c..47b0cb81f4 100644
--- a/tests/integration/cmor/_fixes/cordex/test_cnrm_cerfacs_cnrm_cm5.py
+++ b/tests/integration/cmor/_fixes/cordex/test_cnrm_cerfacs_cnrm_cm5.py
@@ -2,7 +2,7 @@
 import iris
 import pytest
 
-from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5 import cnrm_aladin63
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5 import aladin63
 from esmvalcore.cmor.fix import Fix
 
 
@@ -32,10 +32,10 @@ def cubes():
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_mohc_hadrem3ga705_fix(short_name):
+def test_get_hadrem3ga705_fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'MOHC-HadREM3-GA7-05',
+        'HadREM3-GA7-05',
         'Amon',
         short_name,
         extra_facets={'driver': 'CNRM-CERFACS-CNRM-CM5'})
@@ -43,18 +43,18 @@ def test_get_mohc_hadrem3ga705_fix(short_name):
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_cnrm_aladin63_fix(short_name):
+def test_get_aladin63_fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'CNRM-ALADIN63',
+        'ALADIN63',
         'Amon',
         short_name,
         extra_facets={'driver': 'CNRM-CERFACS-CNRM-CM5'})
     assert isinstance(fix[0], Fix)
 
 
-def test_cnrm_aladin63_height_fix(cubes):
-    fix = cnrm_aladin63.Tas(None)
+def test_aladin63_height_fix(cubes):
+    fix = aladin63.Tas(None)
     out_cubes = fix.fix_metadata(cubes)
     assert cubes is out_cubes
     for cube in out_cubes:
diff --git a/tests/integration/cmor/_fixes/cordex/test_ichec_ec_earth.py b/tests/integration/cmor/_fixes/cordex/test_ichec_ec_earth.py
index 09c345ba01..8b888a0b79 100644
--- a/tests/integration/cmor/_fixes/cordex/test_ichec_ec_earth.py
+++ b/tests/integration/cmor/_fixes/cordex/test_ichec_ec_earth.py
@@ -4,20 +4,20 @@
 from esmvalcore.cmor.fix import Fix
 
 
-def test_get_gerics_remo2015_fix():
+def test_get_remo2015_fix():
     fix = Fix.get_fixes(
         'CORDEX',
-        'GERICS-REMO2015',
+        'REMO2015',
         'Amon',
         'pr',
         extra_facets={'driver': 'ICHEC-EC-Earth'})
     assert isinstance(fix[0], Fix)
 
 
-def test_get_knmi_racmo22e_fix():
+def test_get_racmo22e_fix():
     fix = Fix.get_fixes(
         'CORDEX',
-        'KNMI-RACMO22E',
+        'RACMO22E',
         'Amon',
         'pr',
         extra_facets={'driver': 'ICHEC-EC-Earth'})
@@ -25,10 +25,10 @@ def test_get_knmi_racmo22e_fix():
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_mohc_hadrem3ga705_fix(short_name):
+def test_get_hadrem3ga705_fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'MOHC-HadREM3-GA7-05',
+        'HadREM3-GA7-05',
         'Amon',
         short_name,
         extra_facets={'driver': 'ICHEC-EC-Earth'})
@@ -36,10 +36,10 @@ def test_get_mohc_hadrem3ga705_fix(short_name):
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_smhi_rca4_fix(short_name):
+def test_get_rca4_fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'SMHI-RCA4',
+        'RCA4',
         'Amon',
         short_name,
         extra_facets={'driver': 'ICHEC-EC-Earth'})
diff --git a/tests/integration/cmor/_fixes/cordex/test_miroc_miroc5.py b/tests/integration/cmor/_fixes/cordex/test_miroc_miroc5.py
index a177498930..c54bea04cd 100644
--- a/tests/integration/cmor/_fixes/cordex/test_miroc_miroc5.py
+++ b/tests/integration/cmor/_fixes/cordex/test_miroc_miroc5.py
@@ -1,8 +1,8 @@
-"""Tests for the fixes of AWI-CM-1-1-MR."""
+"""Tests for the fixes of MIROC-MIROC5."""
 import pytest
 import iris
 
-from esmvalcore.cmor._fixes.cordex.miroc_miroc5 import uhoh_wrf361h
+from esmvalcore.cmor._fixes.cordex.miroc_miroc5 import wrf361h
 from esmvalcore.cmor.fix import Fix
 
 
@@ -25,38 +25,38 @@ def cubes():
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_clmcom_cclm4_8_17fix(short_name):
+def test_get_cclm4_8_17fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'CLMCOM-CCLM4-8-17',
+        'CCLM4-8-17',
         'Amon',
         short_name,
         extra_facets={'driver': 'MIROC-MIROC5'})
     assert isinstance(fix[0], Fix)
 
 
-def test_get_gerics_remo2015_fix():
+def test_get_remo2015_fix():
     fix = Fix.get_fixes(
         'CORDEX',
-        'GERICS-REMO2015',
+        'REMO2015',
         'Amon',
         'pr',
         extra_facets={'driver': 'MIROC-MIROC5'})
     assert isinstance(fix[0], Fix)
 
 
-def test_get_uhoh_wrf361h_fix():
+def test_get_wrf361h_fix():
     fix = Fix.get_fixes(
         'CORDEX',
-        'UHOH-WRF361H',
+        'WRF361H',
         'Amon',
         'tas',
         extra_facets={'driver': 'MIROC-MIROC5'})
     assert isinstance(fix[0], Fix)
 
 
-def test_uhoh_wrf361h_height_fix(cubes):
-    fix = uhoh_wrf361h.Tas(None)
+def test_wrf361h_height_fix(cubes):
+    fix = wrf361h.Tas(None)
     out_cubes = fix.fix_metadata(cubes)
     for cube in out_cubes:
         assert cube.ndim == 1
diff --git a/tests/integration/cmor/_fixes/cordex/test_mohc_hadgem2_es.py b/tests/integration/cmor/_fixes/cordex/test_mohc_hadgem2_es.py
index 408fe4d5a6..f504b81aec 100644
--- a/tests/integration/cmor/_fixes/cordex/test_mohc_hadgem2_es.py
+++ b/tests/integration/cmor/_fixes/cordex/test_mohc_hadgem2_es.py
@@ -2,7 +2,7 @@
 import iris
 import pytest
 
-from esmvalcore.cmor._fixes.cordex.mohc_hadgem2_es import dmi_hirham5
+from esmvalcore.cmor._fixes.cordex.mohc_hadgem2_es import hirham5
 from esmvalcore.cmor.fix import Fix
 
 
@@ -53,10 +53,10 @@ def cubes():
     return iris.cube.CubeList([correct_cube, wrong_cube])
 
 
-def test_get_dmi_hirham5_fix():
+def test_get_hirham5_fix():
     fix = Fix.get_fixes(
         'CORDEX',
-        'DMI-HIRHAM5',
+        'HIRHAM5',
         'Amon',
         'pr',
         extra_facets={'driver': 'MOHC-HadGEM2-ES'})
@@ -64,10 +64,10 @@ def test_get_dmi_hirham5_fix():
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_gerics_remo2015_fix(short_name):
+def test_get_remo2015_fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'GERICS-REMO2015',
+        'REMO2015',
         'Amon',
         short_name,
         extra_facets={'driver': 'MOHC-HadGEM2-ES'})
@@ -75,10 +75,10 @@ def test_get_gerics_remo2015_fix(short_name):
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_mohc_hadrem3ga705_fix(short_name):
+def test_get_hadrem3ga705_fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'MOHC-HadREM3-GA7-05',
+        'HadREM3-GA7-05',
         'Amon',
         short_name,
         extra_facets={'driver': 'MOHC-HadGEM2-ES'})
@@ -86,18 +86,18 @@ def test_get_mohc_hadrem3ga705_fix(short_name):
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_smhi_rca4_fix(short_name):
+def test_get_rca4_fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'SMHI-RCA4',
+        'RCA4',
         'Amon',
         short_name,
         extra_facets={'driver': 'MOHC-HadGEM2-ES'})
     assert isinstance(fix[0], Fix)
 
 
-def test_dmi_hirham5_fix(cubes):
-    fix = dmi_hirham5.Pr(None)
+def test_hirham5_fix(cubes):
+    fix = hirham5.Pr(None)
     out_cubes = fix.fix_metadata(cubes)
     assert cubes is out_cubes
     for cube in out_cubes:
diff --git a/tests/integration/cmor/_fixes/cordex/test_mpi_m_mpi_esm_lr.py b/tests/integration/cmor/_fixes/cordex/test_mpi_m_mpi_esm_lr.py
index 30c813297f..7e42204666 100644
--- a/tests/integration/cmor/_fixes/cordex/test_mpi_m_mpi_esm_lr.py
+++ b/tests/integration/cmor/_fixes/cordex/test_mpi_m_mpi_esm_lr.py
@@ -5,20 +5,20 @@
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_ictp_regcm4_6_fix(short_name):
+def test_get_regcm4_6_fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'ICTP-REGCM4-6',
+        'REGCM4-6',
         'Amon',
         short_name,
         extra_facets={'driver': 'MPI-M-MPI-ESM-LR'})
     assert isinstance(fix[0], Fix)
 
 
-def test_get_knmi_racmo22e_fix():
+def test_get_racmo22e_fix():
     fix = Fix.get_fixes(
         'CORDEX',
-        'KNMI-RACMO22E',
+        'RACMO22E',
         'Amon',
         'pr',
         extra_facets={'driver': 'MPI-M-MPI-ESM-LR'})
@@ -26,10 +26,10 @@ def test_get_knmi_racmo22e_fix():
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_mohc_hadrem3ga705_fix(short_name):
+def test_get_hadrem3ga705_fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'MOHC-HadREM3-GA7-05',
+        'HadREM3-GA7-05',
         'Amon',
         short_name,
         extra_facets={'driver': 'MPI-M-MPI-ESM-LR'})
diff --git a/tests/integration/cmor/_fixes/cordex/test_ncc_noresm1_m.py b/tests/integration/cmor/_fixes/cordex/test_ncc_noresm1_m.py
index e071c8d7ea..209c2311fd 100644
--- a/tests/integration/cmor/_fixes/cordex/test_ncc_noresm1_m.py
+++ b/tests/integration/cmor/_fixes/cordex/test_ncc_noresm1_m.py
@@ -4,20 +4,20 @@
 from esmvalcore.cmor.fix import Fix
 
 
-def test_get_gerics_remo2015_fix():
+def test_get_remo2015_fix():
     fix = Fix.get_fixes(
         'CORDEX',
-        'GERICS-REMO2015',
+        'REMO2015',
         'Amon',
         'pr',
         extra_facets={'driver': 'NCC-NorESM1-M'})
     assert isinstance(fix[0], Fix)
 
 
-def test_get_knmi_racmo22e_fix():
+def test_get_racmo22e_fix():
     fix = Fix.get_fixes(
         'CORDEX',
-        'KNMI-RACMO22E',
+        'RACMO22E',
         'Amon',
         'pr',
         extra_facets={'driver': 'NCC-NorESM1-M'})
@@ -25,10 +25,10 @@ def test_get_knmi_racmo22e_fix():
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_mohc_hadrem3ga705_fix(short_name):
+def test_get_hadrem3ga705_fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'MOHC-HadREM3-GA7-05',
+        'HadREM3-GA7-05',
         'Amon',
         short_name,
         extra_facets={'driver': 'NCC-NorESM1-M'})
@@ -36,10 +36,10 @@ def test_get_mohc_hadrem3ga705_fix(short_name):
 
 
 @pytest.mark.parametrize('short_name', ['pr', 'tas'])
-def test_get_smhi_rca4_fix(short_name):
+def test_get_rca4_fix(short_name):
     fix = Fix.get_fixes(
         'CORDEX',
-        'SMHI-RCA4',
+        'RCA4',
         'Amon',
         short_name,
         extra_facets={'driver': 'NCC-NorESM1-M'})
diff --git a/tests/integration/cmor/_fixes/emac/test_emac.py b/tests/integration/cmor/_fixes/emac/test_emac.py
index 15c5b76a6a..1146502a42 100644
--- a/tests/integration/cmor/_fixes/emac/test_emac.py
+++ b/tests/integration/cmor/_fixes/emac/test_emac.py
@@ -36,6 +36,7 @@
     Toz,
     Zg,
 )
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import CoordinateInfo, get_var_info
 from esmvalcore.config._config import get_extra_facets
@@ -834,7 +835,7 @@ def test_sample_data_ta_alevel(test_data_path, tmp_path):
 def test_get_awhea_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Omon', 'awhea')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_awhea_fix(cubes_2d):
@@ -859,7 +860,7 @@ def test_awhea_fix(cubes_2d):
 def test_get_clivi_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'clivi')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_clivi_fix(cubes_2d):
@@ -883,7 +884,7 @@ def test_clivi_fix(cubes_2d):
 def test_get_clt_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'clt')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_clt_fix(cubes_2d):
@@ -906,7 +907,7 @@ def test_clt_fix(cubes_2d):
 def test_get_clwvi_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'clwvi')
-    assert fix == [Clwvi(None), AllVars(None)]
+    assert fix == [Clwvi(None), AllVars(None), GenericFix(None)]
 
 
 def test_clwvi_fix(cubes_2d):
@@ -933,7 +934,7 @@ def test_clwvi_fix(cubes_2d):
 def test_get_co2mass_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'co2mass')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_co2mass_fix(cubes_1d):
@@ -957,7 +958,7 @@ def test_co2mass_fix(cubes_1d):
 def test_get_evspsbl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'evspsbl')
-    assert fix == [Evspsbl(None), AllVars(None)]
+    assert fix == [Evspsbl(None), AllVars(None), GenericFix(None)]
 
 
 def test_evspsbl_fix(cubes_2d):
@@ -986,7 +987,7 @@ def test_evspsbl_fix(cubes_2d):
 def test_get_hfls_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'hfls')
-    assert fix == [Hfls(None), AllVars(None)]
+    assert fix == [Hfls(None), AllVars(None), GenericFix(None)]
 
 
 def test_hfls_fix(cubes_2d):
@@ -1014,7 +1015,7 @@ def test_hfls_fix(cubes_2d):
 def test_get_hfss_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'hfss')
-    assert fix == [Hfss(None), AllVars(None)]
+    assert fix == [Hfss(None), AllVars(None), GenericFix(None)]
 
 
 def test_hfss_fix(cubes_2d):
@@ -1042,7 +1043,7 @@ def test_hfss_fix(cubes_2d):
 def test_get_hurs_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'hurs')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_hurs_fix(cubes_2d):
@@ -1065,7 +1066,7 @@ def test_hurs_fix(cubes_2d):
 def test_get_od550aer_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'od550aer')
-    assert fix == [Od550aer(None), AllVars(None)]
+    assert fix == [Od550aer(None), AllVars(None), GenericFix(None)]
 
 
 def test_od550aer_fix(cubes_3d):
@@ -1090,7 +1091,7 @@ def test_od550aer_fix(cubes_3d):
 def test_get_pr_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'pr')
-    assert fix == [Pr(None), AllVars(None)]
+    assert fix == [Pr(None), AllVars(None), GenericFix(None)]
 
 
 def test_pr_fix(cubes_2d):
@@ -1116,7 +1117,7 @@ def test_pr_fix(cubes_2d):
 def test_get_prc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'prc')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_prc_fix(cubes_2d):
@@ -1140,7 +1141,7 @@ def test_prc_fix(cubes_2d):
 def test_get_prl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'prl')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_prl_fix(cubes_2d):
@@ -1164,7 +1165,7 @@ def test_prl_fix(cubes_2d):
 def test_get_prsn_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'prsn')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_prsn_fix(cubes_2d):
@@ -1188,7 +1189,7 @@ def test_prsn_fix(cubes_2d):
 def test_get_prw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'prw')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_prw_fix(cubes_2d):
@@ -1212,7 +1213,7 @@ def test_prw_fix(cubes_2d):
 def test_get_ps_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'ps')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_ps_fix(cubes_2d):
@@ -1236,7 +1237,7 @@ def test_ps_fix(cubes_2d):
 def test_get_psl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'psl')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_psl_fix(cubes_2d):
@@ -1260,7 +1261,7 @@ def test_psl_fix(cubes_2d):
 def test_get_rlds_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'rlds')
-    assert fix == [Rlds(None), AllVars(None)]
+    assert fix == [Rlds(None), AllVars(None), GenericFix(None)]
 
 
 def test_rlds_fix(cubes_2d):
@@ -1285,7 +1286,7 @@ def test_rlds_fix(cubes_2d):
 def test_get_rlus_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'rlus')
-    assert fix == [Rlus(None), AllVars(None)]
+    assert fix == [Rlus(None), AllVars(None), GenericFix(None)]
 
 
 def test_rlus_fix(cubes_2d):
@@ -1313,7 +1314,7 @@ def test_rlus_fix(cubes_2d):
 def test_get_rlut_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'rlut')
-    assert fix == [Rlut(None), AllVars(None)]
+    assert fix == [Rlut(None), AllVars(None), GenericFix(None)]
 
 
 def test_rlut_fix(cubes_2d):
@@ -1341,7 +1342,7 @@ def test_rlut_fix(cubes_2d):
 def test_get_rlutcs_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'rlutcs')
-    assert fix == [Rlutcs(None), AllVars(None)]
+    assert fix == [Rlutcs(None), AllVars(None), GenericFix(None)]
 
 
 def test_rlutcs_fix(cubes_2d):
@@ -1370,7 +1371,7 @@ def test_rlutcs_fix(cubes_2d):
 def test_get_rsds_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'rsds')
-    assert fix == [Rsds(None), AllVars(None)]
+    assert fix == [Rsds(None), AllVars(None), GenericFix(None)]
 
 
 def test_rsds_fix(cubes_2d):
@@ -1395,7 +1396,7 @@ def test_rsds_fix(cubes_2d):
 def test_get_rsdt_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'rsdt')
-    assert fix == [Rsdt(None), AllVars(None)]
+    assert fix == [Rsdt(None), AllVars(None), GenericFix(None)]
 
 
 def test_rsdt_fix(cubes_2d):
@@ -1420,7 +1421,7 @@ def test_rsdt_fix(cubes_2d):
 def test_get_rsus_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'rsus')
-    assert fix == [Rsus(None), AllVars(None)]
+    assert fix == [Rsus(None), AllVars(None), GenericFix(None)]
 
 
 def test_rsus_fix(cubes_2d):
@@ -1448,7 +1449,7 @@ def test_rsus_fix(cubes_2d):
 def test_get_rsut_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'rsut')
-    assert fix == [Rsut(None), AllVars(None)]
+    assert fix == [Rsut(None), AllVars(None), GenericFix(None)]
 
 
 def test_rsut_fix(cubes_2d):
@@ -1476,7 +1477,7 @@ def test_rsut_fix(cubes_2d):
 def test_get_rsutcs_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'rsutcs')
-    assert fix == [Rsutcs(None), AllVars(None)]
+    assert fix == [Rsutcs(None), AllVars(None), GenericFix(None)]
 
 
 def test_rsutcs_fix(cubes_2d):
@@ -1505,7 +1506,7 @@ def test_rsutcs_fix(cubes_2d):
 def test_get_rtmt_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'rtmt')
-    assert fix == [Rtmt(None), AllVars(None)]
+    assert fix == [Rtmt(None), AllVars(None), GenericFix(None)]
 
 
 def test_rtmt_fix(cubes_2d):
@@ -1531,7 +1532,7 @@ def test_rtmt_fix(cubes_2d):
 def test_get_sfcWind_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'sfcWind')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_sfcWind_fix(cubes_2d):  # noqa: N802
@@ -1557,7 +1558,7 @@ def test_sfcWind_fix(cubes_2d):  # noqa: N802
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'SImon', 'siconc')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_siconc_fix(cubes_2d):
@@ -1582,7 +1583,7 @@ def test_siconc_fix(cubes_2d):
 def test_get_siconca_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'SImon', 'siconca')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_siconca_fix(cubes_2d):
@@ -1607,7 +1608,7 @@ def test_siconca_fix(cubes_2d):
 def test_get_sithick_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'SImon', 'sithick')
-    assert fix == [Sithick(None), AllVars(None)]
+    assert fix == [Sithick(None), AllVars(None), GenericFix(None)]
 
 
 def test_sithick_fix(cubes_2d):
@@ -1642,7 +1643,7 @@ def test_sithick_fix(cubes_2d):
 def test_get_tas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'tas')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_tas_fix(cubes_2d):
@@ -1668,7 +1669,7 @@ def test_tas_fix(cubes_2d):
 def test_get_tasmax_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'tasmax')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_tasmax_fix(cubes_2d):
@@ -1694,7 +1695,7 @@ def test_tasmax_fix(cubes_2d):
 def test_get_tasmin_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'tasmin')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_tasmin_fix(cubes_2d):
@@ -1720,7 +1721,7 @@ def test_tasmin_fix(cubes_2d):
 def test_get_tauu_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'tauu')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_tauu_fix(cubes_2d):
@@ -1744,7 +1745,7 @@ def test_tauu_fix(cubes_2d):
 def test_get_tauv_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'tauv')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_tauv_fix(cubes_2d):
@@ -1768,7 +1769,7 @@ def test_tauv_fix(cubes_2d):
 def test_get_tos_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Omon', 'tos')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_tos_fix(cubes_2d):
@@ -1792,7 +1793,7 @@ def test_tos_fix(cubes_2d):
 def test_get_toz_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'AERmon', 'toz')
-    assert fix == [Toz(None), AllVars(None)]
+    assert fix == [Toz(None), AllVars(None), GenericFix(None)]
 
 
 def test_toz_fix(cubes_2d):
@@ -1816,7 +1817,7 @@ def test_toz_fix(cubes_2d):
 def test_get_ts_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'ts')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_ts_fix(cubes_2d):
@@ -1840,7 +1841,7 @@ def test_ts_fix(cubes_2d):
 def test_get_uas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'uas')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_uas_fix(cubes_2d):
@@ -1866,7 +1867,7 @@ def test_uas_fix(cubes_2d):
 def test_get_vas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'vas')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_vas_fix(cubes_2d):
@@ -1895,7 +1896,7 @@ def test_vas_fix(cubes_2d):
 def test_get_MP_BC_tot_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_BC_tot')
-    assert fix == [MP_BC_tot(None), AllVars(None)]
+    assert fix == [MP_BC_tot(None), AllVars(None), GenericFix(None)]
 
 
 def test_MP_BC_tot_fix(cubes_1d):  # noqa: N802
@@ -1925,7 +1926,7 @@ def test_MP_BC_tot_fix(cubes_1d):  # noqa: N802
 def test_get_MP_CFCl3_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_CFCl3')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_CFCl3_fix(cubes_1d):  # noqa: N802
@@ -1949,7 +1950,7 @@ def test_MP_CFCl3_fix(cubes_1d):  # noqa: N802
 def test_get_MP_ClOX_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_ClOX')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_ClOX_fix(cubes_1d):  # noqa: N802
@@ -1973,7 +1974,7 @@ def test_MP_ClOX_fix(cubes_1d):  # noqa: N802
 def test_get_MP_CH4_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_CH4')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_CH4_fix(cubes_1d):  # noqa: N802
@@ -1997,7 +1998,7 @@ def test_MP_CH4_fix(cubes_1d):  # noqa: N802
 def test_get_MP_CO_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_CO')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_CO_fix(cubes_1d):  # noqa: N802
@@ -2021,7 +2022,7 @@ def test_MP_CO_fix(cubes_1d):  # noqa: N802
 def test_get_MP_CO2_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_CO2')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_CO2_fix(cubes_1d):  # noqa: N802
@@ -2045,7 +2046,7 @@ def test_MP_CO2_fix(cubes_1d):  # noqa: N802
 def test_get_MP_DU_tot_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_DU_tot')
-    assert fix == [MP_DU_tot(None), AllVars(None)]
+    assert fix == [MP_DU_tot(None), AllVars(None), GenericFix(None)]
 
 
 def test_MP_DU_tot_fix(cubes_1d):  # noqa: N802
@@ -2076,7 +2077,7 @@ def test_MP_DU_tot_fix(cubes_1d):  # noqa: N802
 def test_get_MP_N2O_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_N2O')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_N2O_fix(cubes_1d):  # noqa: N802
@@ -2100,7 +2101,7 @@ def test_MP_N2O_fix(cubes_1d):  # noqa: N802
 def test_get_MP_NH3_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_NH3')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_NH3_fix(cubes_1d):  # noqa: N802
@@ -2124,7 +2125,7 @@ def test_MP_NH3_fix(cubes_1d):  # noqa: N802
 def test_get_MP_NO_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_NO')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_NO_fix(cubes_1d):  # noqa: N802
@@ -2148,7 +2149,7 @@ def test_MP_NO_fix(cubes_1d):  # noqa: N802
 def test_get_MP_NO2_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_NO2')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_NO2_fix(cubes_1d):  # noqa: N802
@@ -2172,7 +2173,7 @@ def test_MP_NO2_fix(cubes_1d):  # noqa: N802
 def test_get_MP_NOX_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_NOX')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_NOX_fix(cubes_1d):  # noqa: N802
@@ -2196,7 +2197,7 @@ def test_MP_NOX_fix(cubes_1d):  # noqa: N802
 def test_get_MP_O3_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_O3')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_O3_fix(cubes_1d):  # noqa: N802
@@ -2220,7 +2221,7 @@ def test_MP_O3_fix(cubes_1d):  # noqa: N802
 def test_get_MP_OH_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_OH')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_OH_fix(cubes_1d):  # noqa: N802
@@ -2244,7 +2245,7 @@ def test_MP_OH_fix(cubes_1d):  # noqa: N802
 def test_get_MP_S_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_S')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_S_fix(cubes_1d):  # noqa: N802
@@ -2268,7 +2269,7 @@ def test_MP_S_fix(cubes_1d):  # noqa: N802
 def test_get_MP_SO2_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_SO2')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_MP_SO2_fix(cubes_1d):  # noqa: N802
@@ -2292,7 +2293,7 @@ def test_MP_SO2_fix(cubes_1d):  # noqa: N802
 def test_get_MP_SO4mm_tot_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_SO4mm_tot')
-    assert fix == [MP_SO4mm_tot(None), AllVars(None)]
+    assert fix == [MP_SO4mm_tot(None), AllVars(None), GenericFix(None)]
 
 
 def test_MP_SO4mm_tot_fix(cubes_1d):  # noqa: N802
@@ -2323,7 +2324,7 @@ def test_MP_SO4mm_tot_fix(cubes_1d):  # noqa: N802
 def test_get_MP_SS_tot_fix():  # noqa: N802
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'TRAC10hr', 'MP_SS_tot')
-    assert fix == [MP_SS_tot(None), AllVars(None)]
+    assert fix == [MP_SS_tot(None), AllVars(None), GenericFix(None)]
 
 
 def test_MP_SS_tot_fix(cubes_1d):  # noqa: N802
@@ -2355,7 +2356,7 @@ def test_MP_SS_tot_fix(cubes_1d):  # noqa: N802
 def test_get_cl_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'cl')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_cl_fix(cubes_3d):
@@ -2380,7 +2381,7 @@ def test_cl_fix(cubes_3d):
 def test_get_cli_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'cli')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_cli_fix(cubes_3d):
@@ -2406,7 +2407,7 @@ def test_cli_fix(cubes_3d):
 def test_get_clw_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'clw')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_clw_fix(cubes_3d):
@@ -2432,7 +2433,7 @@ def test_clw_fix(cubes_3d):
 def test_get_hur_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'hur')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_hur_fix(cubes_3d):
@@ -2459,7 +2460,7 @@ def test_hur_fix(cubes_3d):
 def test_get_hus_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'hus')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_hus_fix(cubes_3d):
@@ -2486,7 +2487,7 @@ def test_hus_fix(cubes_3d):
 def test_get_ta_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'ta')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_ta_fix(cubes_3d):
@@ -2513,7 +2514,7 @@ def test_ta_fix(cubes_3d):
 def test_get_ua_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'ua')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_ua_fix(cubes_3d):
@@ -2540,7 +2541,7 @@ def test_ua_fix(cubes_3d):
 def test_get_va_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'va')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_va_fix(cubes_3d):
@@ -2567,7 +2568,7 @@ def test_va_fix(cubes_3d):
 def test_get_zg_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('EMAC', 'EMAC', 'Amon', 'zg')
-    assert fix == [Zg(None), AllVars(None)]
+    assert fix == [Zg(None), AllVars(None), GenericFix(None)]
 
 
 def test_zg_fix(cubes_3d):
diff --git a/tests/integration/cmor/_fixes/icon/test_icon.py b/tests/integration/cmor/_fixes/icon/test_icon.py
index 297058a9a1..ab823cb846 100644
--- a/tests/integration/cmor/_fixes/icon/test_icon.py
+++ b/tests/integration/cmor/_fixes/icon/test_icon.py
@@ -12,6 +12,7 @@
 from iris.cube import Cube, CubeList
 
 import esmvalcore.cmor._fixes.icon.icon
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor._fixes.icon._base_fixes import IconFix
 from esmvalcore.cmor._fixes.icon.icon import AllVars, Clwvi
 from esmvalcore.cmor.fix import Fix
@@ -491,7 +492,7 @@ def check_typesi(cube):
 def test_get_areacella_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'fx', 'areacella')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_areacella_fix(cubes_grid):
@@ -513,7 +514,7 @@ def test_areacella_fix(cubes_grid):
 def test_get_areacello_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'Ofx', 'areacello')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_areacello_fix(cubes_grid):
@@ -538,7 +539,7 @@ def test_areacello_fix(cubes_grid):
 def test_get_clwvi_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'Amon', 'clwvi')
-    assert fix == [Clwvi(None), AllVars(None)]
+    assert fix == [Clwvi(None), AllVars(None), GenericFix(None)]
 
 
 def test_clwvi_fix(cubes_regular_grid):
@@ -572,7 +573,7 @@ def test_clwvi_fix(cubes_regular_grid):
 def test_get_lwp_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'AERmon', 'lwp')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_lwp_fix(cubes_2d):
@@ -599,7 +600,7 @@ def test_lwp_fix(cubes_2d):
 def test_get_rsdt_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'Amon', 'rsdt')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_rsdt_fix(cubes_2d):
@@ -622,7 +623,7 @@ def test_rsdt_fix(cubes_2d):
 def test_get_rsut_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'Amon', 'rsut')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_rsut_fix(cubes_2d):
@@ -648,7 +649,7 @@ def test_rsut_fix(cubes_2d):
 def test_get_siconc_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'SImon', 'siconc')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_siconc_fix(cubes_2d):
@@ -671,7 +672,7 @@ def test_siconc_fix(cubes_2d):
 def test_get_siconca_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'SImon', 'siconca')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_siconca_fix(cubes_2d):
@@ -697,7 +698,7 @@ def test_siconca_fix(cubes_2d):
 def test_get_ta_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'Amon', 'ta')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_ta_fix(cubes_3d):
@@ -732,7 +733,7 @@ def test_ta_fix_no_plev_bounds(cubes_3d):
 def test_get_tas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'Amon', 'tas')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_tas_fix(cubes_2d):
@@ -854,7 +855,7 @@ def test_tas_no_shift_time(cubes_2d):
 def test_get_uas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'Amon', 'uas')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_uas_fix(cubes_2d):
@@ -951,7 +952,7 @@ def test_2d_lat_lon_grid_fix(cubes_2d_lat_lon_grid):
 def test_get_ch4clim_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('ICON', 'ICON', 'Amon', 'ch4Clim')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_ch4clim_fix(cubes_regular_grid):
@@ -2065,7 +2066,7 @@ def test_get_path_from_facet(path, description, output, tmp_path):
 
     # Create empty dummy file
     output = output.format(tmp_path=tmp_path)
-    with open(output, 'w'):
+    with open(output, 'w', encoding='utf-8'):
         pass
 
     out_path = fix._get_path_from_facet('test_path', description=description)
diff --git a/tests/integration/cmor/_fixes/ipslcm/test_ipsl_cm6.py b/tests/integration/cmor/_fixes/ipslcm/test_ipsl_cm6.py
index f136114bcf..dd1d19480e 100644
--- a/tests/integration/cmor/_fixes/ipslcm/test_ipsl_cm6.py
+++ b/tests/integration/cmor/_fixes/ipslcm/test_ipsl_cm6.py
@@ -2,6 +2,7 @@
 import iris
 import pytest
 
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor._fixes.ipslcm.ipsl_cm6 import Tas
 from esmvalcore.cmor.fix import Fix
 from esmvalcore.cmor.table import get_var_info
@@ -11,7 +12,7 @@
 def test_get_tas_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('IPSLCM', 'IPSL-CM6', 'Amon', 'tas')
-    assert fix == [Tas(None)]
+    assert fix == [Tas(None), GenericFix(None)]
 
 
 @pytest.fixture
diff --git a/tests/integration/cmor/_fixes/native6/test_era5.py b/tests/integration/cmor/_fixes/native6/test_era5.py
index cfe20e7fde..6b8a4922b7 100644
--- a/tests/integration/cmor/_fixes/native6/test_era5.py
+++ b/tests/integration/cmor/_fixes/native6/test_era5.py
@@ -6,14 +6,16 @@
 import pytest
 from cf_units import Unit
 
+from esmvalcore.cmor._fixes.fix import Fix, GenericFix
 from esmvalcore.cmor._fixes.native6.era5 import (
     AllVars,
     Evspsbl,
     Zg,
     get_frequency,
 )
-from esmvalcore.cmor.fix import Fix, fix_metadata
-from esmvalcore.cmor.table import CMOR_TABLES
+from esmvalcore.cmor.fix import fix_metadata
+from esmvalcore.cmor.table import CMOR_TABLES, get_var_info
+from esmvalcore.preprocessor import cmor_check_metadata
 
 COMMENT = ('Contains modified Copernicus Climate Change Service Information '
            f'{datetime.datetime.now().year}')
@@ -22,13 +24,15 @@
 def test_get_evspsbl_fix():
     """Test whether the right fixes are gathered for a single variable."""
     fix = Fix.get_fixes('native6', 'ERA5', 'E1hr', 'evspsbl')
-    assert fix == [Evspsbl(None), AllVars(None)]
+    vardef = get_var_info('native6', 'E1hr', 'evspsbl')
+    assert fix == [Evspsbl(vardef), AllVars(vardef), GenericFix(vardef)]
 
 
 def test_get_zg_fix():
     """Test whether the right fix gets found again, for zg as well."""
     fix = Fix.get_fixes('native6', 'ERA5', 'Amon', 'zg')
-    assert fix == [Zg(None), AllVars(None)]
+    vardef = get_var_info('native6', 'E1hr', 'evspsbl')
+    assert fix == [Zg(vardef), AllVars(vardef), GenericFix(vardef)]
 
 
 def test_get_frequency_hourly():
@@ -1027,9 +1031,14 @@ def uas_cmor_e1hr():
 def test_cmorization(era5_cubes, cmor_cubes, var, mip):
     """Verify that cmorization results in the expected target cube."""
     fixed_cubes = fix_metadata(era5_cubes, var, 'native6', 'era5', mip)
+
     assert len(fixed_cubes) == 1
     fixed_cube = fixed_cubes[0]
     cmor_cube = cmor_cubes[0]
+
+    # Test that CMOR checks are passing
+    fixed_cubes = cmor_check_metadata(fixed_cube, 'native6', mip, var)
+
     if fixed_cube.coords('time'):
         for cube in [fixed_cube, cmor_cube]:
             coord = cube.coord('time')
diff --git a/tests/integration/cmor/_fixes/obs4mips/test_airs_2_1.py b/tests/integration/cmor/_fixes/obs4mips/test_airs_2_1.py
index 4ac2ce7f26..80ce0d00c6 100644
--- a/tests/integration/cmor/_fixes/obs4mips/test_airs_2_1.py
+++ b/tests/integration/cmor/_fixes/obs4mips/test_airs_2_1.py
@@ -3,6 +3,7 @@
 from iris.coords import DimCoord
 from iris.cube import Cube, CubeList
 
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor._fixes.obs4mips.airs_2_1 import AllVars
 from esmvalcore.cmor.fix import Fix
 
@@ -16,7 +17,7 @@ def get_air_pressure_coord(points, units):
 def test_get_allvars_fix():
     """Test getting of fix."""
     fix = Fix.get_fixes('obs4MIPs', 'AIRS-2-1', 'Amon', 'cl')
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_allvars_fix_no_air_pressure():
diff --git a/tests/integration/cmor/_fixes/obs4mips/test_ssmi.py b/tests/integration/cmor/_fixes/obs4mips/test_ssmi.py
index bde17735c1..6a66486778 100644
--- a/tests/integration/cmor/_fixes/obs4mips/test_ssmi.py
+++ b/tests/integration/cmor/_fixes/obs4mips/test_ssmi.py
@@ -1,6 +1,7 @@
 """Test SSMI fixes."""
 import unittest
 
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor._fixes.obs4mips.ssmi import Prw
 from esmvalcore.cmor.fix import Fix
 
@@ -10,4 +11,4 @@ class TestPrw(unittest.TestCase):
     def test_get(self):
         """Test fix get."""
         self.assertListEqual(Fix.get_fixes('obs4MIPs', 'SSMI', 'Amon', 'prw'),
-                             [Prw(None)])
+                             [Prw(None), GenericFix(None)])
diff --git a/tests/integration/cmor/_fixes/obs4mips/test_ssmi_meris.py b/tests/integration/cmor/_fixes/obs4mips/test_ssmi_meris.py
index 47ec98b12e..024aa4e705 100644
--- a/tests/integration/cmor/_fixes/obs4mips/test_ssmi_meris.py
+++ b/tests/integration/cmor/_fixes/obs4mips/test_ssmi_meris.py
@@ -1,6 +1,7 @@
 """Test SSMI fixes."""
 import unittest
 
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor._fixes.obs4mips.ssmi_meris import Prw
 from esmvalcore.cmor.fix import Fix
 
@@ -11,4 +12,4 @@ def test_get(self):
         """Test fix get."""
         self.assertListEqual(
             Fix.get_fixes('obs4MIPs', 'SSMI-MERIS', 'Amon', 'prw'),
-            [Prw(None)])
+            [Prw(None), GenericFix(None)])
diff --git a/tests/integration/cmor/_fixes/test_common.py b/tests/integration/cmor/_fixes/test_common.py
index 90955cd77d..809c1fbfd2 100644
--- a/tests/integration/cmor/_fixes/test_common.py
+++ b/tests/integration/cmor/_fixes/test_common.py
@@ -135,9 +135,9 @@ def hybrid_height_coord_fix_metadata(nc_path, short_name, fix):
     air_pressure_coord = cube.coord('air_pressure')
     np.testing.assert_allclose(air_pressure_coord.points, PRESSURE_POINTS)
     np.testing.assert_allclose(air_pressure_coord.bounds, PRESSURE_BOUNDS)
-    assert air_pressure_coord.var_name is None
+    assert air_pressure_coord.var_name == 'plev'
     assert air_pressure_coord.standard_name == 'air_pressure'
-    assert air_pressure_coord.long_name is None
+    assert air_pressure_coord.long_name == 'pressure'
     assert air_pressure_coord.units == 'Pa'
 
 
diff --git a/tests/integration/cmor/_fixes/test_fix.py b/tests/integration/cmor/_fixes/test_fix.py
index 7abc734182..1e97c62fd4 100644
--- a/tests/integration/cmor/_fixes/test_fix.py
+++ b/tests/integration/cmor/_fixes/test_fix.py
@@ -10,50 +10,60 @@
 from esmvalcore.cmor._fixes.cmip5.canesm2 import FgCo2
 from esmvalcore.cmor._fixes.cmip5.cesm1_bgc import Gpp
 from esmvalcore.cmor._fixes.cmip6.cesm2 import Omon, Tos
-from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.cnrm_aladin63 import (
+from esmvalcore.cmor._fixes.cordex.cnrm_cerfacs_cnrm_cm5.aladin63 import (
     Tas,
 )
 from esmvalcore.cmor._fixes.cordex.cordex_fixes import AllVars
+from esmvalcore.cmor._fixes.fix import GenericFix
 from esmvalcore.cmor.fix import Fix
+from esmvalcore.cmor.table import get_var_info
 from esmvalcore.config import CFG
 
 
 def test_get_fix():
-    assert Fix.get_fixes('CMIP5', 'CanESM2', 'Amon', 'fgco2') == [FgCo2(None)]
+    assert Fix.get_fixes('CMIP5', 'CanESM2', 'Amon', 'fgco2') == [
+        FgCo2(None), GenericFix(None)
+    ]
 
 
 def test_get_fix_case_insensitive():
-    assert Fix.get_fixes('CMIP5', 'CanESM2', 'Amon', 'fgCo2'), [FgCo2(None)]
+    assert Fix.get_fixes('CMIP5', 'CanESM2', 'Amon', 'fgCo2') == [
+        FgCo2(None), GenericFix(None)
+    ]
 
 
 def test_get_fix_cordex():
     fix = Fix.get_fixes(
         'CORDEX',
-        'CNRM-ALADIN63',
+        'ALADIN63',
         'Amon',
         'tas',
         extra_facets={'driver': 'CNRM-CERFACS-CNRM-CM5'},
     )
-    assert fix == [Tas(None), AllVars(None)]
+    assert fix == [Tas(None), AllVars(None), GenericFix(None)]
 
 
 def test_get_grid_fix_cordex():
     fix = Fix.get_fixes(
         'CORDEX',
-        'CNRM-ALADIN53',
+        'ALADIN53',
         'Amon',
         'tas',
         extra_facets={'driver': 'CNRM-CERFACS-CNRM-CM5'},
     )
-    assert fix == [AllVars(None)]
+    assert fix == [AllVars(None), GenericFix(None)]
 
 
 def test_get_fixes_with_replace():
-    assert Fix.get_fixes('CMIP5', 'BNU-ESM', 'Amon', 'ch4') == [Ch4(None)]
+    assert Fix.get_fixes('CMIP5', 'BNU-ESM', 'Amon', 'ch4') == [
+        Ch4(None), GenericFix(None)
+    ]
 
 
 def test_get_fixes_with_generic():
-    assert Fix.get_fixes('CMIP5', 'CESM1-BGC', 'Amon', 'gpp') == [Gpp(None)]
+    assert Fix.get_fixes('CMIP5', 'CESM1-BGC', 'Amon', 'gpp') == [
+        Gpp(None), GenericFix(None)
+    ]
 
 
 def test_get_fix_no_project():
@@ -62,24 +72,33 @@ def test_get_fix_no_project():
 
 
 def test_get_fix_no_model():
-    assert Fix.get_fixes('CMIP5', 'BAD_MODEL', 'Amon', 'ch4') == []
+    assert Fix.get_fixes('CMIP5', 'BAD_MODEL', 'Amon', 'ch4') == [
+        GenericFix(None)
+    ]
 
 
 def test_get_fix_no_var():
-    assert Fix.get_fixes('CMIP5', 'BNU-ESM', 'Amon', 'BAD_VAR') == []
+    assert Fix.get_fixes('CMIP5', 'BNU-ESM', 'Amon', 'BAD_VAR') == [
+        GenericFix(None)
+    ]
 
 
 def test_get_fix_only_mip():
-    assert Fix.get_fixes('CMIP6', 'CESM2', 'Omon', 'thetao') == [Omon(None)]
+    assert Fix.get_fixes('CMIP6', 'CESM2', 'Omon', 'thetao') == [
+        Omon(None), GenericFix(None)
+    ]
 
 
 def test_get_fix_only_mip_case_insensitive():
-    assert Fix.get_fixes('CMIP6', 'CESM2', 'omOn', 'thetao') == [Omon(None)]
+    assert Fix.get_fixes('CMIP6', 'CESM2', 'omOn', 'thetao') == [
+        Omon(None), GenericFix(None)
+    ]
 
 
 def test_get_fix_mip_and_var():
-    assert (Fix.get_fixes('CMIP6', 'CESM2', 'Omon', 'tos') ==
-            [Tos(None), Omon(None)])
+    assert Fix.get_fixes('CMIP6', 'CESM2', 'Omon', 'tos') == [
+        Tos(None), Omon(None), GenericFix(None)
+    ]
 
 
 def test_fix_metadata():
@@ -156,3 +175,25 @@ def test_session():
     session = CFG.start_session('my session')
     fix = Fix(None, session=session)
     assert fix.session == session
+
+
+def test_frequency_empty():
+    fix = Fix(None)
+    assert fix.frequency is None
+
+
+def test_frequency_from_vardef():
+    vardef = get_var_info('CMIP6', 'Amon', 'tas')
+    fix = Fix(vardef)
+    assert fix.frequency == 'mon'
+
+
+def test_frequency_given():
+    fix = Fix(None, frequency='1hr')
+    assert fix.frequency == '1hr'
+
+
+def test_frequency_not_from_vardef():
+    vardef = get_var_info('CMIP6', 'Amon', 'tas')
+    fix = Fix(vardef, frequency='3hr')
+    assert fix.frequency == '3hr'
diff --git a/tests/integration/cmor/_fixes/test_shared.py b/tests/integration/cmor/_fixes/test_shared.py
index 92d2cfba2a..8158865aa6 100644
--- a/tests/integration/cmor/_fixes/test_shared.py
+++ b/tests/integration/cmor/_fixes/test_shared.py
@@ -7,6 +7,7 @@
 import pytest
 from cf_units import Unit
 from iris import NameConstraint
+from iris.coords import AuxCoord
 
 from esmvalcore.cmor._fixes.shared import (
     _map_on_filled,
@@ -25,6 +26,7 @@
     get_altitude_to_pressure_func,
     get_bounds_cube,
     get_pressure_to_altitude_func,
+    get_time_bounds,
     round_coordinates,
 )
 
@@ -186,17 +188,21 @@ def test_map_on_filled_da_mask_not_used():
 
 
 ALT_COORD = iris.coords.AuxCoord([0.0], bounds=[[-100.0, 500.0]],
-                                 standard_name='altitude', units='m')
+                                 standard_name='altitude', units='m',
+                                 var_name='alt', long_name='altitude')
 ALT_COORD_MASKED = ALT_COORD.copy(np.ma.masked_equal([0.0], 0.0))
-ALT_COORD_NB = iris.coords.AuxCoord([0.0], standard_name='altitude', units='m')
+ALT_COORD_NB = iris.coords.AuxCoord([0.0], standard_name='altitude', units='m',
+                                    var_name='alt', long_name='altitude')
 ALT_COORD_KM = iris.coords.AuxCoord([0.0], bounds=[[-0.1, 0.5]],
                                     var_name='alt', long_name='altitude',
                                     standard_name='altitude', units='km')
 P_COORD = iris.coords.AuxCoord([101325.0], bounds=[[102532.0, 95460.8]],
-                               standard_name='air_pressure', units='Pa')
+                               standard_name='air_pressure', units='Pa',
+                               var_name='plev', long_name='pressure')
 P_COORD_MASKED = P_COORD.copy(np.ma.masked_equal([0.0], 0.0))
 P_COORD_NB = iris.coords.AuxCoord([101325.0], standard_name='air_pressure',
-                                  units='Pa')
+                                  units='Pa', var_name='plev',
+                                  long_name='pressure')
 CUBE_ALT = iris.cube.Cube([1.0], var_name='x',
                           aux_coords_and_dims=[(ALT_COORD, 0)])
 CUBE_ALT_MASKED = iris.cube.Cube([1.0], var_name='x',
@@ -620,3 +626,39 @@ def test_fix_ocean_depth_coord():
     assert depth_coord.units == 'm'
     assert depth_coord.long_name == 'ocean depth coordinate'
     assert depth_coord.attributes == {'positive': 'down'}
+
+
+@pytest.fixture
+def time_coord():
+    """Time coordinate."""
+    time_coord = AuxCoord(
+        [15, 350],
+        standard_name='time',
+        units='days since 1850-01-01'
+    )
+    return time_coord
+
+
+@pytest.mark.parametrize(
+    'freq,expected_bounds',
+    [
+        ('mon', [[0, 31], [334, 365]]),
+        ('mo', [[0, 31], [334, 365]]),
+        ('yr', [[0, 365], [0, 365]]),
+        ('dec', [[0, 3652], [0, 3652]]),
+        ('day', [[14.5, 15.5], [349.5, 350.5]]),
+        ('6hr', [[14.875, 15.125], [349.875, 350.125]]),
+        ('3hr', [[14.9375, 15.0625], [349.9375, 350.0625]]),
+        ('1hr', [[14.97916666, 15.020833333], [349.97916666, 350.020833333]]),
+    ]
+)
+def test_get_time_bounds(time_coord, freq, expected_bounds):
+    """Test ``get_time_bounds`."""
+    bounds = get_time_bounds(time_coord, freq)
+    np.testing.assert_allclose(bounds, expected_bounds)
+
+
+def test_get_time_bounds_invalid_freq_fail(time_coord):
+    """Test ``get_time_bounds`."""
+    with pytest.raises(NotImplementedError):
+        get_time_bounds(time_coord, 'invalid_freq')
diff --git a/tests/integration/cmor/test_fix.py b/tests/integration/cmor/test_fix.py
new file mode 100644
index 0000000000..e52dc0fd42
--- /dev/null
+++ b/tests/integration/cmor/test_fix.py
@@ -0,0 +1,909 @@
+"""Integration tests for fixes."""
+
+import dask.array as da
+import numpy as np
+import pytest
+from cf_units import Unit
+from iris.aux_factory import HybridHeightFactory, HybridPressureFactory
+from iris.coords import AuxCoord, DimCoord
+from iris.cube import Cube, CubeList
+
+from esmvalcore.cmor.check import CheckLevels, CMORCheckError
+from esmvalcore.exceptions import ESMValCoreDeprecationWarning
+from esmvalcore.preprocessor import (
+    cmor_check_data,
+    cmor_check_metadata,
+    fix_data,
+    fix_metadata,
+)
+
+
+# TODO: remove in v2.12
+@pytest.fixture(autouse=True)
+def disable_fix_cmor_checker(mocker):
+    """Disable the CMOR checker in fixes (will be default in v2.12)."""
+    class MockChecker:
+
+        def __init__(self, cube):
+            self._cube = cube
+
+        def check_metadata(self):
+            return self._cube
+
+        def check_data(self):
+            return self._cube
+
+    mock = mocker.patch('esmvalcore.cmor.fix._get_cmor_checker')
+    mock.return_value = MockChecker
+
+
+class TestGenericFix:
+    """Tests for ``GenericFix``."""
+
+    @pytest.fixture(autouse=True)
+    def setup(self, mocker):
+        """Setup tests."""
+        self.mock_debug = mocker.patch(
+            'esmvalcore.cmor._fixes.fix.GenericFix._debug_msg', autospec=True
+        )
+        self.mock_warning = mocker.patch(
+            'esmvalcore.cmor._fixes.fix.GenericFix._warning_msg',
+            autospec=True,
+        )
+
+        # Create sample data with CMOR errors
+        time_coord = DimCoord(
+            [15, 45],
+            standard_name='time',
+            var_name='time',
+            units=Unit('days since 1851-01-01', calendar='noleap'),
+            attributes={'test': 1, 'time_origin': 'will_be_removed'},
+        )
+        plev_coord_rev = DimCoord(
+            [250, 500, 850],
+            standard_name='air_pressure',
+            var_name='plev',
+            units='hPa',
+        )
+        lev_coord_hybrid_height = DimCoord(
+            [1.0, 0.5, 0.0],
+            standard_name='atmosphere_hybrid_height_coordinate',
+            var_name='lev',
+            units='m',
+        )
+        lev_coord_hybrid_pressure = DimCoord(
+            [0.0, 0.5, 1.0],
+            standard_name='atmosphere_hybrid_sigma_pressure_coordinate',
+            var_name='lev',
+            units='1',
+        )
+        ap_coord = AuxCoord(
+            [0.0, 0.0, 0.0],
+            var_name='ap',
+            units='Pa',
+        )
+        b_coord = AuxCoord(
+            [0.0, 0.5, 1.0],
+            var_name='b',
+            units='1',
+        )
+        ps_coord = AuxCoord(
+            np.full((2, 2, 2), 10),
+            var_name='ps',
+            units='Pa',
+        )
+        orog_coord = AuxCoord(
+            np.full((2, 2), 10),
+            var_name='orog',
+            units='m',
+        )
+        hybrid_height_factory = HybridHeightFactory(
+            delta=lev_coord_hybrid_height,
+            sigma=b_coord,
+            orography=orog_coord,
+        )
+        hybrid_pressure_factory = HybridPressureFactory(
+            delta=ap_coord,
+            sigma=lev_coord_hybrid_pressure,
+            surface_air_pressure=ps_coord,
+        )
+        lat_coord = DimCoord(
+            [0, 10],
+            standard_name='latitude',
+            var_name='lat',
+            units='degrees',
+        )
+        lat_coord_rev = DimCoord(
+            [10, -10],
+            standard_name='latitude',
+            var_name='lat',
+            units='degrees',
+        )
+        lat_coord_2d = AuxCoord(
+            [[10, -10]],
+            standard_name='latitude',
+            var_name='wrong_name',
+            units='degrees',
+        )
+        lon_coord = DimCoord(
+            [-180, 0],
+            standard_name='longitude',
+            var_name='lon',
+            units='degrees',
+        )
+        lon_coord_unstructured = AuxCoord(
+            [-180, 0],
+            bounds=[[-200, -180, -160], [-20, 0, 20]],
+            standard_name='longitude',
+            var_name='lon',
+            units='degrees',
+        )
+        lon_coord_2d = AuxCoord(
+            [[370, 380]],
+            standard_name='longitude',
+            var_name='wrong_name',
+            units='degrees',
+        )
+        height2m_coord = AuxCoord(
+            2.0,
+            standard_name='height',
+            var_name='height',
+            units='m',
+        )
+
+        coord_spec_3d = [
+            (time_coord, 0),
+            (lat_coord, 1),
+            (lon_coord, 2),
+        ]
+        self.cube_3d = Cube(
+            da.arange(2 * 2 * 2, dtype=np.float32).reshape(2, 2, 2),
+            standard_name='air_pressure',
+            long_name='Air Pressure',
+            var_name='tas',
+            units='celsius',
+            dim_coords_and_dims=coord_spec_3d,
+            aux_coords_and_dims=[(height2m_coord, ())],
+            attributes={},
+        )
+
+        coord_spec_4d = [
+            (time_coord, 0),
+            (plev_coord_rev, 1),
+            (lat_coord_rev, 2),
+            (lon_coord, 3),
+        ]
+        cube_4d = Cube(
+            da.arange(2 * 3 * 2 * 2, dtype=np.float32).reshape(2, 3, 2, 2),
+            standard_name='air_pressure',
+            long_name='Air Pressure',
+            var_name='ta',
+            units='celsius',
+            dim_coords_and_dims=coord_spec_4d,
+            attributes={},
+        )
+        self.cubes_4d = CubeList([cube_4d])
+
+        coord_spec_hybrid_height_4d = [
+            (time_coord, 0),
+            (lev_coord_hybrid_height, 1),
+            (lat_coord_rev, 2),
+            (lon_coord, 3),
+        ]
+        aux_coord_spec_hybrid_height_4d = [
+            (b_coord, 1),
+            (orog_coord, (2, 3)),
+        ]
+        cube_hybrid_height_4d = Cube(
+            da.arange(2 * 3 * 2 * 2, dtype=np.float32).reshape(2, 3, 2, 2),
+            standard_name='air_pressure',
+            long_name='Air Pressure',
+            var_name='ta',
+            units='celsius',
+            dim_coords_and_dims=coord_spec_hybrid_height_4d,
+            aux_coords_and_dims=aux_coord_spec_hybrid_height_4d,
+            aux_factories=[hybrid_height_factory],
+            attributes={},
+        )
+        self.cubes_hybrid_height_4d = CubeList([cube_hybrid_height_4d])
+
+        coord_spec_hybrid_pressure_4d = [
+            (time_coord, 0),
+            (lev_coord_hybrid_pressure, 1),
+            (lat_coord_rev, 2),
+            (lon_coord, 3),
+        ]
+        aux_coord_spec_hybrid_pressure_4d = [
+            (ap_coord, 1),
+            (ps_coord, (0, 2, 3)),
+        ]
+        cube_hybrid_pressure_4d = Cube(
+            da.arange(2 * 3 * 2 * 2, dtype=np.float32).reshape(2, 3, 2, 2),
+            standard_name='air_pressure',
+            long_name='Air Pressure',
+            var_name='ta',
+            units='celsius',
+            dim_coords_and_dims=coord_spec_hybrid_pressure_4d,
+            aux_coords_and_dims=aux_coord_spec_hybrid_pressure_4d,
+            aux_factories=[hybrid_pressure_factory],
+            attributes={},
+        )
+        self.cubes_hybrid_pressure_4d = CubeList([cube_hybrid_pressure_4d])
+
+        coord_spec_unstrucutred = [
+            (height2m_coord, ()),
+            (lat_coord_rev, 1),
+            (lon_coord_unstructured, 1),
+        ]
+        cube_unstructured = Cube(
+            da.zeros((2, 2)),
+            standard_name='air_pressure',
+            long_name='Air Pressure',
+            var_name='tas',
+            units='celsius',
+            dim_coords_and_dims=[(time_coord, 0)],
+            aux_coords_and_dims=coord_spec_unstrucutred,
+            attributes={},
+        )
+        self.cubes_unstructured = CubeList([cube_unstructured])
+
+        coord_spec_2d = [
+            (height2m_coord, ()),
+            (lat_coord_2d, (1, 2)),
+            (lon_coord_2d, (1, 2)),
+        ]
+        cube_2d_latlon = Cube(
+            da.zeros((2, 1, 2)),
+            standard_name='air_pressure',
+            long_name='Air Pressure',
+            var_name='tas',
+            units='celsius',
+            dim_coords_and_dims=[(time_coord, 0)],
+            aux_coords_and_dims=coord_spec_2d,
+            attributes={},
+        )
+        self.cubes_2d_latlon = CubeList([cube_2d_latlon])
+
+    def assert_time_metadata(self, cube):
+        """Assert time metadata is correct."""
+        assert cube.coord('time').standard_name == 'time'
+        assert cube.coord('time').var_name == 'time'
+        assert cube.coord('time').units == Unit(
+            'days since 1850-01-01', calendar='365_day'
+        )
+        assert cube.coord('time').attributes == {'test': 1}
+
+    def assert_time_data(self, cube, time_has_bounds=True):
+        """Assert time data is correct."""
+        np.testing.assert_allclose(cube.coord('time').points, [380, 410])
+        if time_has_bounds:
+            np.testing.assert_allclose(
+                cube.coord('time').bounds, [[365, 396], [396, 424]],
+            )
+        else:
+            assert cube.coord('time').bounds is None
+
+    def assert_plev_metadata(self, cube):
+        """Assert plev metadata is correct."""
+        assert cube.coord('air_pressure').standard_name == 'air_pressure'
+        assert cube.coord('air_pressure').var_name == 'plev'
+        assert cube.coord('air_pressure').units == 'Pa'
+        assert cube.coord('air_pressure').attributes == {}
+
+    def assert_lat_metadata(self, cube):
+        """Assert lat metadata is correct."""
+        assert cube.coord('latitude').standard_name == 'latitude'
+        assert cube.coord('latitude').var_name == 'lat'
+        assert str(cube.coord('latitude').units) == 'degrees_north'
+        assert cube.coord('latitude').attributes == {}
+
+    def assert_lon_metadata(self, cube):
+        """Assert lon metadata is correct."""
+        assert cube.coord('longitude').standard_name == 'longitude'
+        assert cube.coord('longitude').var_name == 'lon'
+        assert str(cube.coord('longitude').units) == 'degrees_east'
+        assert cube.coord('longitude').attributes == {}
+
+    def assert_ta_metadata(self, cube):
+        """Assert ta metadata is correct."""
+        # Variable metadata
+        assert cube.standard_name == 'air_temperature'
+        assert cube.long_name == 'Air Temperature'
+        assert cube.var_name == 'ta'
+        assert cube.units == 'K'
+        assert cube.attributes == {}
+
+    def assert_ta_data(self, cube, time_has_bounds=True):
+        """Assert ta data is correct."""
+        assert cube.has_lazy_data()
+        np.testing.assert_allclose(
+            cube.data,
+            [[[[284.15, 283.15],
+               [282.15, 281.15]],
+              [[280.15, 279.15],
+               [278.15, 277.15]],
+              [[276.15, 275.15],
+               [274.15, 273.15]]],
+             [[[296.15, 295.15],
+               [294.15, 293.15]],
+              [[292.15, 291.15],
+               [290.15, 289.15]],
+              [[288.15, 287.15],
+               [286.15, 285.15]]]],
+        )
+
+        # Time
+        self.assert_time_data(cube, time_has_bounds=time_has_bounds)
+
+        # Air pressure
+        np.testing.assert_allclose(
+            cube.coord('air_pressure').points,
+            [85000.0, 50000.0, 25000.0],
+            atol=1e-8,
+        )
+        assert cube.coord('air_pressure').bounds is None
+
+        # Latitude
+        np.testing.assert_allclose(
+            cube.coord('latitude').points, [-10.0, 10.0]
+        )
+        np.testing.assert_allclose(
+            cube.coord('latitude').bounds, [[-20.0, 0.0], [0.0, 20.0]]
+        )
+
+        # Longitude
+        np.testing.assert_allclose(
+            cube.coord('longitude').points, [0.0, 180.0]
+        )
+        np.testing.assert_allclose(
+            cube.coord('longitude').bounds, [[-90.0, 90.0], [90.0, 270.0]]
+        )
+
+    def assert_tas_metadata(self, cube):
+        """Assert tas metadata is correct."""
+        assert cube.standard_name == 'air_temperature'
+        assert cube.long_name == 'Near-Surface Air Temperature'
+        assert cube.var_name == 'tas'
+        assert cube.units == 'K'
+        assert cube.attributes == {}
+
+        # Height 2m coordinate
+        assert cube.coord('height').standard_name == 'height'
+        assert cube.coord('height').var_name == 'height'
+        assert cube.coord('height').units == 'm'
+        assert cube.coord('height').attributes == {}
+        np.testing.assert_allclose(cube.coord('height').points, 2.0)
+        assert cube.coord('height').bounds is None
+
+    def test_fix_metadata_amon_ta(self):
+        """Test ``fix_metadata``."""
+        short_name = 'ta'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'Amon'
+
+        fixed_cubes = fix_metadata(
+            self.cubes_4d,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        self.assert_ta_metadata(fixed_cube)
+        self.assert_time_metadata(fixed_cube)
+        self.assert_plev_metadata(fixed_cube)
+        self.assert_lat_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+        self.assert_ta_data(fixed_cube)
+
+        cmor_check_metadata(fixed_cube, project, mip, short_name)
+
+        assert self.mock_debug.call_count == 3
+        assert self.mock_warning.call_count == 9
+
+    def test_fix_metadata_amon_ta_wrong_lat_units(self):
+        """Test ``fix_metadata``."""
+        short_name = 'ta'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'Amon'
+
+        # Change units of latitude
+        self.cubes_4d[0].coord('latitude').units = 'K'
+
+        fixed_cubes = fix_metadata(
+            self.cubes_4d,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        self.assert_ta_metadata(fixed_cube)
+        self.assert_time_metadata(fixed_cube)
+        self.assert_plev_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+        self.assert_ta_data(fixed_cube)
+
+        # CMOR check will fail because of wrong latitude units
+        assert fixed_cube.coord('latitude').units == 'K'
+        with pytest.raises(CMORCheckError):
+            cmor_check_metadata(fixed_cube, project, mip, short_name)
+
+        print(self.mock_debug.mock_calls)
+        print(self.mock_warning.mock_calls)
+
+        assert self.mock_debug.call_count == 3
+        assert self.mock_warning.call_count == 9
+
+    def test_fix_metadata_cfmon_ta_hybrid_height(self):
+        """Test ``fix_metadata`` with hybrid height coordinate."""
+        short_name = 'ta'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'CFmon'
+
+        fixed_cubes = fix_metadata(
+            self.cubes_hybrid_height_4d,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        hybrid_coord = fixed_cube.coord('atmosphere_hybrid_height_coordinate')
+        assert hybrid_coord.var_name == 'lev'
+        assert hybrid_coord.long_name is None
+        assert hybrid_coord.units == 'm'
+        np.testing.assert_allclose(hybrid_coord.points, [0.0, 0.5, 1.0])
+        assert fixed_cube.coords('altitude')
+        assert fixed_cube.coord_dims('altitude') == (1, 2, 3)
+
+        self.assert_ta_metadata(fixed_cube)
+        self.assert_time_metadata(fixed_cube)
+        self.assert_lat_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+
+        cmor_check_metadata(fixed_cube, project, mip, short_name)
+
+        assert self.mock_debug.call_count == 4
+        assert self.mock_warning.call_count == 9
+
+    def test_fix_metadata_cfmon_ta_hybrid_pressure(self):
+        """Test ``fix_metadata`` with hybrid pressure coordinate."""
+        short_name = 'ta'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'CFmon'
+
+        fixed_cubes = fix_metadata(
+            self.cubes_hybrid_pressure_4d,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        hybrid_coord = fixed_cube.coord(
+            'atmosphere_hybrid_sigma_pressure_coordinate'
+        )
+        assert hybrid_coord.var_name == 'lev'
+        assert hybrid_coord.long_name is None
+        assert hybrid_coord.units == '1'
+        np.testing.assert_allclose(hybrid_coord.points, [1.0, 0.5, 0.0])
+        assert fixed_cube.coords('air_pressure')
+        assert fixed_cube.coord_dims('air_pressure') == (0, 1, 2, 3)
+
+        self.assert_ta_metadata(fixed_cube)
+        self.assert_time_metadata(fixed_cube)
+        self.assert_lat_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+
+        cmor_check_metadata(fixed_cube, project, mip, short_name)
+
+        assert self.mock_debug.call_count == 4
+        assert self.mock_warning.call_count == 9
+
+    def test_fix_metadata_cfmon_ta_alternative(self):
+        """Test ``fix_metadata`` with alternative generic level coordinate."""
+        short_name = 'ta'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'CFmon'
+
+        fixed_cubes = fix_metadata(
+            self.cubes_4d,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        self.assert_ta_metadata(fixed_cube)
+        self.assert_time_metadata(fixed_cube)
+        self.assert_plev_metadata(fixed_cube)
+        self.assert_lat_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+        self.assert_ta_data(fixed_cube)
+
+        cmor_check_metadata(fixed_cube, project, mip, short_name)
+
+        assert self.mock_debug.call_count == 4
+        assert self.mock_warning.call_count == 9
+
+    def test_fix_metadata_cfmon_ta_no_alternative(self, mocker):
+        """Test ``fix_metadata`` with  no alternative coordinate."""
+        short_name = 'ta'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'CFmon'
+
+        # Remove alternative coordinate
+        self.cubes_4d[0].remove_coord('air_pressure')
+
+        fixed_cubes = fix_metadata(
+            self.cubes_4d,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        self.assert_ta_metadata(fixed_cube)
+        self.assert_time_metadata(fixed_cube)
+        self.assert_time_data(fixed_cube)
+        self.assert_lat_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+
+        # CMOR check will fail because of missing alevel coordinate
+        assert not fixed_cube.coords('air_pressure')
+        with pytest.raises(CMORCheckError):
+            cmor_check_metadata(fixed_cube, project, mip, short_name)
+
+        assert self.mock_debug.call_count == 2
+        assert self.mock_warning.call_count == 8
+
+    def test_fix_metadata_e1hr_ta(self):
+        """Test ``fix_metadata`` with plev3."""
+        short_name = 'ta'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'E1hr'
+
+        # Slightly adapt plev to test fixing of requested levels
+        self.cubes_4d[0].coord('air_pressure').points = [
+            250.0 + 9e-8, 500.0 + 9e-8, 850.0 + 9e-8
+        ]
+
+        fixed_cubes = fix_metadata(
+            self.cubes_4d,
+            short_name,
+            project,
+            dataset,
+            mip,
+            frequency='mon',
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        self.assert_ta_metadata(fixed_cube)
+        self.assert_time_metadata(fixed_cube)
+        self.assert_plev_metadata(fixed_cube)
+        self.assert_lat_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+        self.assert_ta_data(fixed_cube, time_has_bounds=False)
+
+        cmor_check_metadata(
+            fixed_cube, project, mip, short_name, frequency='mon'
+        )
+
+        assert self.mock_debug.call_count == 4
+        assert self.mock_warning.call_count == 8
+
+    def test_fix_metadata_amon_tas_unstructured(self):
+        """Test ``fix_metadata`` with unstructured grid."""
+        short_name = 'tas'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'Amon'
+
+        fixed_cubes = fix_metadata(
+            self.cubes_unstructured,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        self.assert_tas_metadata(fixed_cube)
+        self.assert_time_metadata(fixed_cube)
+        self.assert_lat_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+
+        # Latitude
+        np.testing.assert_allclose(
+            fixed_cube.coord('latitude').points, [10.0, -10.0]
+        )
+        assert fixed_cube.coord('latitude').bounds is None
+
+        # Longitude
+        np.testing.assert_allclose(
+            fixed_cube.coord('longitude').points, [180.0, 0.0]
+        )
+        np.testing.assert_allclose(
+            fixed_cube.coord('longitude').bounds,
+            [[160.0, 180.0, 200.0], [340.0, 0.0, 20.0]],
+        )
+
+        # Variable data
+        assert fixed_cube.has_lazy_data()
+        np.testing.assert_allclose(
+            fixed_cube.data, [[273.15, 273.15], [273.15, 273.15]]
+        )
+
+        cmor_check_metadata(fixed_cube, project, mip, short_name)
+
+        assert self.mock_debug.call_count == 2
+        assert self.mock_warning.call_count == 6
+
+    def test_fix_metadata_amon_tas_2d_latlon(self):
+        """Test ``fix_metadata`` with 2D latitude/longitude."""
+        short_name = 'tas'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'Amon'
+
+        fixed_cubes = fix_metadata(
+            self.cubes_2d_latlon,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        self.assert_tas_metadata(fixed_cube)
+        self.assert_time_metadata(fixed_cube)
+        self.assert_lat_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+
+        # Latitude
+        np.testing.assert_allclose(
+            fixed_cube.coord('latitude').points, [[10.0, -10.0]]
+        )
+        assert fixed_cube.coord('latitude').bounds is None
+
+        # Longitude
+        np.testing.assert_allclose(
+            fixed_cube.coord('longitude').points, [[10.0, 20.0]]
+        )
+        assert fixed_cube.coord('longitude').bounds is None
+
+        # Variable data
+        assert fixed_cube.has_lazy_data()
+        np.testing.assert_allclose(
+            fixed_cube.data, [[[273.15, 273.15]], [[273.15, 273.15]]]
+        )
+
+        cmor_check_metadata(fixed_cube, project, mip, short_name)
+
+        assert self.mock_debug.call_count == 3
+        assert self.mock_warning.call_count == 8
+
+    def test_fix_metadata_amon_tas_invalid_time_units(self):
+        """Test ``fix_metadata`` with invalid time units."""
+        short_name = 'tas'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'Amon'
+
+        self.cubes_2d_latlon[0].remove_coord('time')
+        aux_time_coord = AuxCoord(
+            [1, 2],
+            standard_name='time',
+            var_name='time',
+            units='kg',
+        )
+        self.cubes_2d_latlon[0].add_aux_coord(aux_time_coord, 0)
+
+        fixed_cubes = fix_metadata(
+            self.cubes_2d_latlon,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        self.assert_lat_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+
+        assert fixed_cube.coord('time').units == 'kg'
+
+        # CMOR checks fail because calendar is not defined
+        with pytest.raises(ValueError):
+            cmor_check_metadata(fixed_cube, project, mip, short_name)
+
+        assert self.mock_debug.call_count == 3
+        assert self.mock_warning.call_count == 7
+
+    def test_fix_metadata_amon_tas_invalid_time_attrs(self):
+        """Test ``fix_metadata`` with invalid time attributes."""
+        short_name = 'tas'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'Amon'
+
+        self.cubes_2d_latlon[0].attributes = {
+            'parent_time_units': 'this is certainly not a unit',
+            'branch_time_in_parent': 'BRANCH TIME IN PARENT',
+            'branch_time_in_child': 'BRANCH TIME IN CHILD',
+        }
+
+        fixed_cubes = fix_metadata(
+            self.cubes_2d_latlon,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        self.assert_time_metadata(fixed_cube)
+        self.assert_lat_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+
+        assert fixed_cube.attributes == {
+            'parent_time_units': 'this is certainly not a unit',
+            'branch_time_in_parent': 'BRANCH TIME IN PARENT',
+            'branch_time_in_child': 'BRANCH TIME IN CHILD',
+        }
+
+        cmor_check_metadata(fixed_cube, project, mip, short_name)
+
+        assert self.mock_debug.call_count == 3
+        assert self.mock_warning.call_count == 8
+
+    def test_fix_metadata_oimon_ssi(self):
+        """Test ``fix_metadata`` with psu units."""
+        short_name = 'ssi'
+        project = 'CMIP5'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'OImon'
+
+        self.cubes_2d_latlon[0].var_name = 'ssi'
+        self.cubes_2d_latlon[0].attributes = {
+            'invalid_units': 'psu',
+            'parent_time_units': 'no parent',
+        }
+
+        # Also test 2D longitude that already has bounds
+        self.cubes_2d_latlon[0].coord('latitude').var_name = 'lat'
+        self.cubes_2d_latlon[0].coord('longitude').var_name = 'lon'
+        self.cubes_2d_latlon[0].coord('longitude').bounds = [
+            [[365.0, 375.0], [375.0, 400.0]]
+        ]
+
+        fixed_cubes = fix_metadata(
+            self.cubes_2d_latlon,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert len(fixed_cubes) == 1
+        fixed_cube = fixed_cubes[0]
+
+        # Variable metadata
+        assert fixed_cube.standard_name == 'sea_ice_salinity'
+        assert fixed_cube.long_name == 'Sea Ice Salinity'
+        assert fixed_cube.var_name == 'ssi'
+        assert fixed_cube.units == '1'
+        assert fixed_cube.attributes == {'parent_time_units': 'no parent'}
+
+        # Coordinates
+        self.assert_time_metadata(fixed_cube)
+        self.assert_lat_metadata(fixed_cube)
+        self.assert_lon_metadata(fixed_cube)
+
+        # Latitude
+        np.testing.assert_allclose(
+            fixed_cube.coord('latitude').points, [[10.0, -10.0]]
+        )
+        assert fixed_cube.coord('latitude').bounds is None
+
+        # Longitude
+        np.testing.assert_allclose(
+            fixed_cube.coord('longitude').points, [[10.0, 20.0]]
+        )
+        np.testing.assert_allclose(
+            fixed_cube.coord('longitude').bounds,
+            [[[5.0, 15.0], [15.0, 40.0]]],
+        )
+
+        # Variable data
+        assert fixed_cube.has_lazy_data()
+        np.testing.assert_allclose(
+            fixed_cube.data, [[[0.0, 0.0]], [[0.0, 0.0]]],
+        )
+
+        cmor_check_metadata(fixed_cube, project, mip, short_name)
+
+        assert self.mock_debug.call_count == 2
+        assert self.mock_warning.call_count == 6
+
+    def test_fix_data_amon_tas(self):
+        """Test ``fix_data``."""
+        short_name = 'tas'
+        project = 'CMIP6'
+        dataset = '__MODEL_WITH_NO_EXPLICIT_FIX__'
+        mip = 'Amon'
+
+        fixed_cube = fix_data(
+            self.cube_3d,
+            short_name,
+            project,
+            dataset,
+            mip,
+        )
+
+        assert fixed_cube.has_lazy_data()
+
+        cmor_check_data(fixed_cube, project, mip, short_name)
+
+        assert self.mock_debug.call_count == 0
+        assert self.mock_warning.call_count == 0
+
+    def test_deprecate_check_level_fix_metadata(self):
+        """Test deprecation of check level in ``fix_metadata``."""
+        with pytest.warns(ESMValCoreDeprecationWarning):
+            fix_metadata(
+                self.cubes_4d,
+                'ta',
+                'CMIP6',
+                'MODEL',
+                'Amon',
+                check_level=CheckLevels.RELAXED,
+            )
+
+    def test_deprecate_check_level_fix_data(self):
+        """Test deprecation of check level in ``fix_data``."""
+        with pytest.warns(ESMValCoreDeprecationWarning):
+            fix_metadata(
+                self.cubes_4d,
+                'ta',
+                'CMIP6',
+                'MODEL',
+                'Amon',
+                check_level=CheckLevels.RELAXED,
+            )
diff --git a/tests/integration/cmor/test_read_cmor_tables.py b/tests/integration/cmor/test_read_cmor_tables.py
index facb94f96b..32a472b316 100644
--- a/tests/integration/cmor/test_read_cmor_tables.py
+++ b/tests/integration/cmor/test_read_cmor_tables.py
@@ -19,6 +19,14 @@
 }
 
 
+def test_read_cmor_tables_raiser():
+    """Test func raiser."""
+    cfg_file = {"cow": "moo"}
+    with pytest.raises(TypeError) as exc:
+        read_cmor_tables(cfg_file)
+        assert "cow" in str(exc)
+
+
 def test_read_cmor_tables():
     """Test that the function `read_cmor_tables` loads the tables correctly."""
     table_path = Path(root).parent / 'tables'
@@ -45,15 +53,11 @@ def test_read_cmor_tables():
     assert table.strict is False
 
 
-@pytest.mark.parametrize('behaviour', ['current', 'deprecated'])
-def test_read_custom_cmor_tables(tmp_path, behaviour):
+def test_read_custom_cmor_tables(tmp_path):
     """Test reading of custom CMOR tables."""
     cfg_file = tmp_path / 'config-developer.yml'
-    if behaviour == 'deprecated':
-        cfg_file = CUSTOM_CFG_DEVELOPER
-    else:
-        with cfg_file.open('w', encoding='utf-8') as file:
-            yaml.safe_dump(CUSTOM_CFG_DEVELOPER, file)
+    with cfg_file.open('w', encoding='utf-8') as file:
+        yaml.safe_dump(CUSTOM_CFG_DEVELOPER, file)
 
     read_cmor_tables(cfg_file)
 
diff --git a/tests/integration/cmor/test_table.py b/tests/integration/cmor/test_table.py
index 7b25b8d719..8b8d63e57c 100644
--- a/tests/integration/cmor/test_table.py
+++ b/tests/integration/cmor/test_table.py
@@ -3,6 +3,8 @@
 import os
 import unittest
 
+import pytest
+
 import esmvalcore.cmor
 from esmvalcore.cmor.table import (
     CMIP3Info,
@@ -10,6 +12,7 @@
     CMIP6Info,
     CustomInfo,
     _update_cmor_facets,
+    get_var_info,
 )
 
 
@@ -485,3 +488,41 @@ def test_get_variable_ch4s(self):
         self.assertEqual(var.long_name,
                          'Atmosphere CH4 surface')
         self.assertEqual(var.units, '1e-09')
+
+
+@pytest.mark.parametrize(
+    'project,mip,short_name,frequency',
+    [
+        ('CMIP5', 'Amon', 'tas', 'mon'),
+        ('CMIP5', 'day', 'tas', 'day'),
+        ('CMIP6', 'Amon', 'tas', 'mon'),
+        ('CMIP6', 'day', 'tas', 'day'),
+        ('CORDEX', '3hr', 'tas', '3hr'),
+    ]
+)
+def test_get_var_info(project, mip, short_name, frequency):
+    """Test ``get_var_info``."""
+    var_info = get_var_info(project, mip, short_name)
+
+    assert var_info.short_name == short_name
+    assert var_info.frequency == frequency
+
+
+@pytest.mark.parametrize(
+    'mip,short_name',
+    [
+        ('INVALID_MIP', 'tas'),
+        ('Amon', 'INVALID_VAR'),
+    ]
+)
+def test_get_var_info_invalid_mip_short_name(mip, short_name):
+    """Test ``get_var_info``."""
+    var_info = get_var_info('CMIP6', mip, short_name)
+
+    assert var_info is None
+
+
+def test_get_var_info_invalid_project():
+    """Test ``get_var_info``."""
+    with pytest.raises(KeyError):
+        get_var_info('INVALID_PROJECT', 'Amon', 'tas')
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index 1dbb948940..2771db32c0 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -5,25 +5,24 @@
 import pytest
 
 import esmvalcore.local
-from esmvalcore.config import CFG, _config
+from esmvalcore.config import CFG
 from esmvalcore.config._config_object import CFG_DEFAULT
+from esmvalcore.local import (
+    LocalFile,
+    _replace_tags,
+    _select_drs,
+    _select_files,
+)
 
 
 @pytest.fixture
-def session(tmp_path, monkeypatch):
+def session(tmp_path: Path, monkeypatch):
+    CFG.clear()
+    CFG.update(CFG_DEFAULT)
+    monkeypatch.setitem(CFG, 'rootpath', {'default': str(tmp_path)})
+
     session = CFG.start_session('recipe_test')
-    session.clear()
-    session.update(CFG_DEFAULT)
     session['output_dir'] = tmp_path / 'esmvaltool_output'
-
-    # The patched_datafinder fixture does not return the correct input
-    # directory structure, so make sure it is set to flat for every project
-    monkeypatch.setitem(CFG, 'drs', {})
-    for project in _config.CFG:
-        monkeypatch.setitem(_config.CFG[project]['input_dir'], 'default', '/')
-    # The patched datafinder fixture does not return any facets, so automatic
-    # supplementary definition does not work with it.
-    session['use_legacy_supplementaries'] = True
     return session
 
 
@@ -40,8 +39,10 @@ def create_test_file(filename, tracking_id=None):
     iris.save(cube, filename)
 
 
-def _get_filenames(root_path, filename, tracking_id):
-    filename = Path(filename).name
+def _get_files(root_path, facets, tracking_id):
+    file_template = _select_drs('input_file', facets['project'])
+    file_globs = _replace_tags(file_template, facets)
+    filename = Path(file_globs[0]).name
     filename = str(root_path / 'input' / filename)
     filenames = []
     if filename.endswith('[_.]*nc'):
@@ -50,23 +51,37 @@ def _get_filenames(root_path, filename, tracking_id):
         filename = filename.replace('[_.]*nc', '_*.nc')
     if filename.endswith('*.nc'):
         filename = filename[:-len('*.nc')] + '_'
-        intervals = [
-            '1990_1999',
-            '2000_2009',
-            '2010_2019',
-        ]
+        if facets['frequency'] == 'fx':
+            intervals = ['']
+        else:
+            intervals = [
+                '1990_1999',
+                '2000_2009',
+                '2010_2019',
+            ]
         for interval in intervals:
             filenames.append(filename + interval + '.nc')
     else:
         filenames.append(filename)
 
+    if 'timerange' in facets:
+        filenames = _select_files(filenames, facets['timerange'])
+
     for filename in filenames:
         create_test_file(filename, next(tracking_id))
-    return filenames
+
+    files = []
+    for filename in filenames:
+        file = LocalFile(filename)
+        file.facets = facets
+        files.append(file)
+
+    return files, file_globs
 
 
 @pytest.fixture
 def patched_datafinder(tmp_path, monkeypatch):
+
     def tracking_ids(i=0):
         while True:
             yield i
@@ -74,14 +89,18 @@ def tracking_ids(i=0):
 
     tracking_id = tracking_ids()
 
-    def glob(file_glob):
-        return _get_filenames(tmp_path, file_glob, tracking_id)
+    def find_files(*, debug: bool = False, **facets):
+        files, file_globs = _get_files(tmp_path, facets, tracking_id)
+        if debug:
+            return files, file_globs
+        return files
 
-    monkeypatch.setattr(esmvalcore.local, 'glob', glob)
+    monkeypatch.setattr(esmvalcore.local, 'find_files', find_files)
 
 
 @pytest.fixture
 def patched_failing_datafinder(tmp_path, monkeypatch):
+
     def tracking_ids(i=0):
         while True:
             yield i
@@ -89,16 +108,12 @@ def tracking_ids(i=0):
 
     tracking_id = tracking_ids()
 
-    def glob(filename):
-        # Fail for specified fx variables
-        if 'fx_' in filename:
-            return []
-        if 'sftlf' in filename:
-            return []
-        if 'IyrAnt_' in filename:
-            return []
-        if 'IyrGre_' in filename:
-            return []
-        return _get_filenames(tmp_path, filename, tracking_id)
-
-    monkeypatch.setattr(esmvalcore.local, 'glob', glob)
+    def find_files(*, debug: bool = False, **facets):
+        files, file_globs = _get_files(tmp_path, facets, tracking_id)
+        if 'fx' == facets['frequency']:
+            files = []
+        if debug:
+            return files, file_globs
+        return files
+
+    monkeypatch.setattr(esmvalcore.local, 'find_files', find_files)
diff --git a/tests/integration/data_finder.yml b/tests/integration/data_finder.yml
index 7179014173..3724154d64 100644
--- a/tests/integration/data_finder.yml
+++ b/tests/integration/data_finder.yml
@@ -1153,3 +1153,86 @@ get_input_filelist:
     found_files:
       - f.e21.FHIST_BGC.f09_f09_mg17.CMIP6-AMIP.001_cosp1/gcomp/proc/tseries/month_1/f.e21.FHIST_BGC.f09_f09_mg17.CMIP6-AMIP.001_cosp1.scomp.h1.TREFHT.201001-201912.nc
       - f.e21.FHIST_BGC.f09_f09_mg17.CMIP6-AMIP.001_cosp1/gcomp/proc/tseries/month_1/f.e21.FHIST_BGC.f09_f09_mg17.CMIP6-AMIP.001_cosp1.scomp.h1.TREFHT.202001-202912.nc
+
+  # CORDEX
+
+  - drs: ESGF
+    variable:
+      short_name: tas
+      frequency: mon
+      mip: mon
+      project: CORDEX
+      dataset: RegCM4-6
+      rcm_version: v1
+      driver: ICHEC-EC-EARTH
+      institute: ICTP
+      domain: EUR-11
+      exp: historical
+      ensemble: r12i1p1
+      timerange: '1998/2002'
+      version: 'v20190502'
+    available_files:
+      - cordex/output/EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_197001-198012.nc
+      - cordex/output/EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_198101-199012.nc
+      - cordex/output/EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_199101-200012.nc
+      - cordex/output/EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_200101-200512.nc
+    dirs:
+      - cordex/output/EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/RegCM4-6/v1/mon/tas/v20190502
+    file_patterns:
+      - tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon*.nc
+    found_files:
+      - cordex/output/EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_199101-200012.nc
+      - cordex/output/EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_200101-200512.nc
+
+  - drs: BADC
+    variable:
+      short_name: tas
+      frequency: mon
+      mip: mon
+      project: CORDEX
+      dataset: REMO2009
+      rcm_version: v1
+      driver: MPI-M-MPI-ESM-LR
+      institute: MPI-CSC
+      domain: EUR-11
+      exp: rcp26
+      ensemble: r1i1p1
+      timerange: '2008/2010'
+      version: 'v20160525'
+    available_files:
+      - EUR-11/MPI-CSC/MPI-M-MPI-ESM-LR/rcp26/r1i1p1/MPI-CSC-REMO2009/v1/mon/tas/v20160525/tas_EUR-11_MPI-M-MPI-ESM-LR_rcp26_r1i1p1_MPI-CSC-REMO2009_v1_mon_200601-201012.nc
+      - EUR-11/MPI-CSC/MPI-M-MPI-ESM-LR/rcp26/r1i1p1/MPI-CSC-REMO2009/v1/mon/tas/v20160525/tas_EUR-11_MPI-M-MPI-ESM-LR_rcp26_r1i1p1_MPI-CSC-REMO2009_v1_mon_201101-202012.nc
+    dirs:
+      - EUR-11/MPI-CSC/MPI-M-MPI-ESM-LR/rcp26/r1i1p1/MPI-CSC-REMO2009/v1/mon/tas/v20160525
+    file_patterns:
+      - tas_EUR-11_MPI-M-MPI-ESM-LR_rcp26_r1i1p1_MPI-CSC-REMO2009_v1_mon*.nc
+    found_files:
+      - EUR-11/MPI-CSC/MPI-M-MPI-ESM-LR/rcp26/r1i1p1/MPI-CSC-REMO2009/v1/mon/tas/v20160525/tas_EUR-11_MPI-M-MPI-ESM-LR_rcp26_r1i1p1_MPI-CSC-REMO2009_v1_mon_200601-201012.nc
+
+  - drs: DKRZ
+    variable:
+      short_name: tas
+      frequency: mon
+      mip: mon
+      project: CORDEX
+      dataset: RegCM4-6
+      rcm_version: v1
+      driver: ICHEC-EC-EARTH
+      institute: ICTP
+      domain: EUR-11
+      exp: historical
+      ensemble: r12i1p1
+      timerange: '1998/2002'
+      version: 'v20190502'
+    available_files:
+      - EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/ICTP-RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_197001-198012.nc
+      - EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/ICTP-RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_198101-199012.nc
+      - EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/ICTP-RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_199101-200012.nc
+      - EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/ICTP-RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_200101-200512.nc
+    dirs:
+      - EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/ICTP-RegCM4-6/v1/mon/tas/v20190502
+    file_patterns:
+      - tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon*.nc
+    found_files:
+      - EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/ICTP-RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_199101-200012.nc
+      - EUR-11/ICTP/ICHEC-EC-EARTH/historical/r12i1p1/ICTP-RegCM4-6/v1/mon/tas/v20190502/tas_EUR-11_ICHEC-EC-EARTH_historical_r12i1p1_ICTP-RegCM4-6_v1_mon_200101-200512.nc
diff --git a/tests/integration/esgf/test_search_download.py b/tests/integration/esgf/test_search_download.py
index 29e215be1d..ea34aab897 100644
--- a/tests/integration/esgf/test_search_download.py
+++ b/tests/integration/esgf/test_search_download.py
@@ -116,7 +116,7 @@ def test_mock_search(variable, mocker):
         # Skip cases where the raw search results were too large to save.
         pytest.skip(f"Raw search results in {raw_results} not available.")
 
-    with raw_results.open('r') as file:
+    with raw_results.open('r', encoding='utf-8') as file:
         search_results = [
             FileResult(json=j, context=None) for j in json.load(file)
         ]
diff --git a/tests/integration/preprocessor/_io/test_cleanup.py b/tests/integration/preprocessor/_io/test_cleanup.py
deleted file mode 100644
index 3ef98b8574..0000000000
--- a/tests/integration/preprocessor/_io/test_cleanup.py
+++ /dev/null
@@ -1,48 +0,0 @@
-"""Integration tests for :func:`esmvalcore.preprocessor._io.cleanup`"""
-
-import os
-import tempfile
-import unittest
-
-import pytest
-
-from esmvalcore.exceptions import ESMValCoreDeprecationWarning
-from esmvalcore.preprocessor import _io
-
-
-class TestCleanup(unittest.TestCase):
-    """Tests for :func:`esmvalcore.preprocessor._io.cleanup`"""
-
-    def setUp(self):
-        """Prepare tests."""
-        self.temp_paths = []
-        descriptor, temp_file = tempfile.mkstemp('.nc')
-        os.close(descriptor)
-        self.temp_paths.append(temp_file)
-        self.temp_paths.append(tempfile.mkdtemp())
-
-    def tearDown(self):
-        for path in self.temp_paths:
-            if os.path.isfile(path):
-                os.remove(path)
-            elif os.path.isdir(path):
-                os.rmdir(path)
-
-    def test_cleanup(self):
-        """Test cleanup"""
-        _io.cleanup([], self.temp_paths)
-        for path in self.temp_paths:
-            self.assertFalse(os.path.exists(path))
-
-    def test_cleanup_when_files_removed(self):
-        """Test cleanup works even with missing files or folders"""
-        self.tearDown()
-        _io.cleanup([], self.temp_paths)
-        for path in self.temp_paths:
-            self.assertFalse(os.path.exists(path))
-
-    def test_deprecation(self):
-        """Test that deprecation warning is properly raised."""
-        msg = "cleanup"
-        with pytest.warns(ESMValCoreDeprecationWarning, match=msg):
-            _io.cleanup([], [])
diff --git a/tests/integration/preprocessor/_io/test_concatenate.py b/tests/integration/preprocessor/_io/test_concatenate.py
index a5fef83380..3171c27a25 100644
--- a/tests/integration/preprocessor/_io/test_concatenate.py
+++ b/tests/integration/preprocessor/_io/test_concatenate.py
@@ -15,21 +15,25 @@
 from iris.coords import AuxCoord, DimCoord
 from iris.cube import Cube, CubeList
 
+from esmvalcore.cmor.check import CheckLevels
 from esmvalcore.preprocessor import _io
 
 
 def get_hybrid_pressure_cube():
     """Return cube with hybrid pressure coordinate."""
     ap_coord = AuxCoord([1.0], bounds=[[0.0, 2.0]], var_name='ap', units='Pa')
-    b_coord = AuxCoord([0.0], bounds=[[-0.5, 1.5]],
-                       var_name='b', units=Unit('1'))
+    b_coord = AuxCoord([0.0],
+                       bounds=[[-0.5, 1.5]],
+                       var_name='b',
+                       units=Unit('1'))
     ps_coord = AuxCoord([[[100000]]], var_name='ps', units='Pa')
     x_coord = AuxCoord(
         0.0,
         var_name='x',
         standard_name='atmosphere_hybrid_sigma_pressure_coordinate',
     )
-    cube = Cube([[[[0.0]]]], var_name='x',
+    cube = Cube([[[[0.0]]]],
+                var_name='x',
                 aux_coords_and_dims=[(ap_coord, 1), (b_coord, 1),
                                      (ps_coord, (0, 2, 3)), (x_coord, ())])
     return cube
@@ -54,7 +58,9 @@ def get_hybrid_pressure_cube_list():
 
 def get_time_coord(time_point):
     """Time coordinate."""
-    return DimCoord([time_point], var_name='time', standard_name='time',
+    return DimCoord([time_point],
+                    var_name='time',
+                    standard_name='time',
                     units='days since 6453-2-1')
 
 
@@ -73,11 +79,14 @@ def mock_atmosphere_sigma_cube():
     """Return mocked cube with atmosphere sigma coordinate."""
     cube = unittest.mock.create_autospec(Cube, spec_set=True, instance=True)
     ptop_coord = AuxCoord([1.0], var_name='ptop', units='Pa')
-    lev_coord = AuxCoord([0.0], bounds=[[-0.5, 1.5]], var_name='lev',
+    lev_coord = AuxCoord([0.0],
+                         bounds=[[-0.5, 1.5]],
+                         var_name='lev',
                          units='1')
     ps_coord = AuxCoord([[[100000]]], var_name='ps', units='Pa')
-    cube.coord.side_effect = [ptop_coord, lev_coord, ps_coord,
-                              ptop_coord, lev_coord, ps_coord]
+    cube.coord.side_effect = [
+        ptop_coord, lev_coord, ps_coord, ptop_coord, lev_coord, ps_coord
+    ]
     cube.coords.return_value = [
         ptop_coord,
         lev_coord,
@@ -100,8 +109,9 @@ def mock_hybrid_height_cube():
     lev_coord = AuxCoord([1.0], bounds=[[0.0, 2.0]], var_name='lev', units='m')
     b_coord = AuxCoord([0.0], bounds=[[-0.5, 1.5]], var_name='b')
     orog_coord = AuxCoord([[[100000]]], var_name='orog', units='m')
-    cube.coord.side_effect = [lev_coord, b_coord, orog_coord,
-                              lev_coord, b_coord, orog_coord]
+    cube.coord.side_effect = [
+        lev_coord, b_coord, orog_coord, lev_coord, b_coord, orog_coord
+    ]
     cube.coords.return_value = [
         lev_coord,
         b_coord,
@@ -122,11 +132,14 @@ def mock_hybrid_pressure_cube():
     """Return mocked cube with hybrid pressure coordinate."""
     cube = unittest.mock.create_autospec(Cube, spec_set=True, instance=True)
     ap_coord = AuxCoord([1.0], bounds=[[0.0, 2.0]], var_name='ap', units='Pa')
-    b_coord = AuxCoord([0.0], bounds=[[-0.5, 1.5]],
-                       var_name='b', units=Unit('1'))
+    b_coord = AuxCoord([0.0],
+                       bounds=[[-0.5, 1.5]],
+                       var_name='b',
+                       units=Unit('1'))
     ps_coord = AuxCoord([[[100000]]], var_name='ps', units='Pa')
-    cube.coord.side_effect = [ap_coord, b_coord, ps_coord,
-                              ap_coord, b_coord, ps_coord]
+    cube.coord.side_effect = [
+        ap_coord, b_coord, ps_coord, ap_coord, b_coord, ps_coord
+    ]
     cube.coords.return_value = [
         ap_coord,
         b_coord,
@@ -182,9 +195,10 @@ def test_fix_aux_factories_atmosphere_sigma(mock_atmosphere_sigma_cube):
     # Test with aux_factory object
     _io._fix_aux_factories(mock_atmosphere_sigma_cube)
     mock_atmosphere_sigma_cube.coords.assert_called_once_with()
-    mock_atmosphere_sigma_cube.coord.assert_has_calls([call(var_name='ptop'),
-                                                       call(var_name='lev'),
-                                                       call(var_name='ps')])
+    mock_atmosphere_sigma_cube.coord.assert_has_calls(
+        [call(var_name='ptop'),
+         call(var_name='lev'),
+         call(var_name='ps')])
     mock_atmosphere_sigma_cube.add_aux_factory.assert_not_called()
 
     # Test without aux_factory object
@@ -192,9 +206,10 @@ def test_fix_aux_factories_atmosphere_sigma(mock_atmosphere_sigma_cube):
     mock_atmosphere_sigma_cube.aux_factories = ['dummy']
     _io._fix_aux_factories(mock_atmosphere_sigma_cube)
     mock_atmosphere_sigma_cube.coords.assert_called_once_with()
-    mock_atmosphere_sigma_cube.coord.assert_has_calls([call(var_name='ptop'),
-                                                       call(var_name='lev'),
-                                                       call(var_name='ps')])
+    mock_atmosphere_sigma_cube.coord.assert_has_calls(
+        [call(var_name='ptop'),
+         call(var_name='lev'),
+         call(var_name='ps')])
     mock_atmosphere_sigma_cube.add_aux_factory.assert_called_once()
 
 
@@ -205,9 +220,10 @@ def test_fix_aux_factories_hybrid_height(mock_hybrid_height_cube):
     # Test with aux_factory object
     _io._fix_aux_factories(mock_hybrid_height_cube)
     mock_hybrid_height_cube.coords.assert_called_once_with()
-    mock_hybrid_height_cube.coord.assert_has_calls([call(var_name='lev'),
-                                                    call(var_name='b'),
-                                                    call(var_name='orog')])
+    mock_hybrid_height_cube.coord.assert_has_calls(
+        [call(var_name='lev'),
+         call(var_name='b'),
+         call(var_name='orog')])
     mock_hybrid_height_cube.add_aux_factory.assert_not_called()
 
     # Test without aux_factory object
@@ -215,9 +231,10 @@ def test_fix_aux_factories_hybrid_height(mock_hybrid_height_cube):
     mock_hybrid_height_cube.aux_factories = ['dummy']
     _io._fix_aux_factories(mock_hybrid_height_cube)
     mock_hybrid_height_cube.coords.assert_called_once_with()
-    mock_hybrid_height_cube.coord.assert_has_calls([call(var_name='lev'),
-                                                    call(var_name='b'),
-                                                    call(var_name='orog')])
+    mock_hybrid_height_cube.coord.assert_has_calls(
+        [call(var_name='lev'),
+         call(var_name='b'),
+         call(var_name='orog')])
     mock_hybrid_height_cube.add_aux_factory.assert_called_once()
 
 
@@ -228,9 +245,10 @@ def test_fix_aux_factories_hybrid_pressure(mock_hybrid_pressure_cube):
     # Test with aux_factory object
     _io._fix_aux_factories(mock_hybrid_pressure_cube)
     mock_hybrid_pressure_cube.coords.assert_called_once_with()
-    mock_hybrid_pressure_cube.coord.assert_has_calls([call(var_name='ap'),
-                                                      call(var_name='b'),
-                                                      call(var_name='ps')])
+    mock_hybrid_pressure_cube.coord.assert_has_calls(
+        [call(var_name='ap'),
+         call(var_name='b'),
+         call(var_name='ps')])
     mock_hybrid_pressure_cube.add_aux_factory.assert_not_called()
 
     # Test without aux_factory object
@@ -238,9 +256,10 @@ def test_fix_aux_factories_hybrid_pressure(mock_hybrid_pressure_cube):
     mock_hybrid_pressure_cube.aux_factories = ['dummy']
     _io._fix_aux_factories(mock_hybrid_pressure_cube)
     mock_hybrid_pressure_cube.coords.assert_called_once_with()
-    mock_hybrid_pressure_cube.coord.assert_has_calls([call(var_name='ap'),
-                                                      call(var_name='b'),
-                                                      call(var_name='ps')])
+    mock_hybrid_pressure_cube.coord.assert_has_calls(
+        [call(var_name='ap'),
+         call(var_name='b'),
+         call(var_name='ps')])
     mock_hybrid_pressure_cube.add_aux_factory.assert_called_once()
 
 
@@ -250,8 +269,10 @@ def test_fix_aux_factories_real_cube(real_hybrid_pressure_cube):
     assert not real_hybrid_pressure_cube.coords('air_pressure')
     _io._fix_aux_factories(real_hybrid_pressure_cube)
     air_pressure_coord = real_hybrid_pressure_cube.coord('air_pressure')
-    expected_coord = AuxCoord([[[[1.0]]]], bounds=[[[[[-50000., 150002.]]]]],
-                              standard_name='air_pressure', units='Pa')
+    expected_coord = AuxCoord([[[[1.0]]]],
+                              bounds=[[[[[-50000., 150002.]]]]],
+                              standard_name='air_pressure',
+                              units='Pa')
     assert air_pressure_coord == expected_coord
 
 
@@ -268,6 +289,18 @@ def test_concatenation_with_aux_factory(real_hybrid_pressure_cube_list):
     assert air_pressure_coord == expected_coord
 
 
+@pytest.mark.parametrize('check_level',
+                         [CheckLevels.RELAXED, CheckLevels.IGNORE])
+def test_relax_concatenation(check_level, caplog):
+    caplog.set_level('DEBUG')
+    cubes = get_hybrid_pressure_cube_list()
+    _io.concatenate(cubes, check_level)
+    msg = ('Concatenation will be performed without checking '
+           'auxiliary coordinates, cell measures, ancillaries '
+           'and derived coordinates present in the cubes.')
+    assert msg in caplog.text
+
+
 class TestConcatenate(unittest.TestCase):
     """Tests for :func:`esmvalcore.preprocessor._io.concatenate`."""
 
@@ -306,7 +339,7 @@ def test_concatenate_noop(self):
         np.testing.assert_array_equal(
             concatenated.coord('time').points, np.array([1, 2]))
 
-    def test_concatenate_with_overlap(self):
+    def test_concatenate_with_overlap(self, ):
         """Test concatenation of time overalapping cubes."""
         self._add_cube([6.5, 7.5], [6., 7.])
         concatenated = _io.concatenate(self.raw_cubes)
@@ -439,9 +472,26 @@ def test_concatenate_differing_attributes(self):
             concatenated.coord('time').points, np.array([1, 2, 3, 4, 5, 6]))
         self.assertEqual(
             concatenated.attributes,
-            {'equal_attr': 1, 'different_attr': '1 2 3'},
+            {
+                'equal_attr': 1,
+                'different_attr': '1 2 3'
+            },
         )
 
+    def test_convert_calendar_concatenate_with_overlap(self):
+        """Test compatible calendars get converted."""
+        time_coord = DimCoord([4., 5.],
+                              var_name='time',
+                              standard_name='time',
+                              units=Unit('days since 1950-01-01',
+                                         calendar='proleptic_gregorian'))
+        self.raw_cubes.append(
+            Cube([33., 55.],
+                 var_name='sample',
+                 dim_coords_and_dims=((time_coord, 0), )))
+        concatenated = _io.concatenate(self.raw_cubes)
+        assert concatenated.coord('time').units.calendar == 'standard'
+
     def test_fail_on_calendar_concatenate_with_overlap(self):
         """Test fail of concatenation with overlap."""
         time_coord = DimCoord([3., 7000.],
@@ -453,42 +503,9 @@ def test_fail_on_calendar_concatenate_with_overlap(self):
             Cube([33., 55.],
                  var_name='sample',
                  dim_coords_and_dims=((time_coord, 0), )))
-        with self.assertRaises((TypeError, ValueError)):
+        with self.assertRaises(TypeError):
             _io.concatenate(self.raw_cubes)
 
-    def test_fail_on_units_concatenate_with_overlap(self):
-        """Test fail of concatenation with overlap."""
-        time_coord_1 = DimCoord([3., 7000.],
-                                var_name='time',
-                                standard_name='time',
-                                units=Unit('days since 1950-01-01',
-                                           calendar='360_day'))
-        time_coord_2 = DimCoord([3., 9000.],
-                                var_name='time',
-                                standard_name='time',
-                                units=Unit('days since 1950-01-01',
-                                           calendar='360_day'))
-        time_coord_3 = DimCoord([3., 9000.],
-                                var_name='time',
-                                standard_name='time',
-                                units=Unit('days since 1850-01-01',
-                                           calendar='360_day'))
-        raw_cubes = []
-        raw_cubes.append(
-            Cube([33., 55.],
-                 var_name='sample',
-                 dim_coords_and_dims=((time_coord_1, 0), )))
-        raw_cubes.append(
-            Cube([33., 55.],
-                 var_name='sample',
-                 dim_coords_and_dims=((time_coord_2, 0), )))
-        raw_cubes.append(
-            Cube([33., 55.],
-                 var_name='sample',
-                 dim_coords_and_dims=((time_coord_3, 0), )))
-        with self.assertRaises(ValueError):
-            _io.concatenate(raw_cubes)
-
     def test_fail_metadata_differs(self):
         """Test exception raised if two cubes have different metadata."""
         self.raw_cubes[0].units = 'm'
diff --git a/tests/integration/preprocessor/_io/test_load.py b/tests/integration/preprocessor/_io/test_load.py
index 99247bdc5a..c0ad0bba88 100644
--- a/tests/integration/preprocessor/_io/test_load.py
+++ b/tests/integration/preprocessor/_io/test_load.py
@@ -10,7 +10,7 @@
 from iris.coords import DimCoord
 from iris.cube import Cube, CubeList
 
-from esmvalcore.preprocessor._io import concatenate_callback, load
+from esmvalcore.preprocessor._io import load
 
 
 def _create_sample_cube():
@@ -60,7 +60,7 @@ def test_callback_remove_attributes(self):
                 cube.attributes[attr] = attr
             self._save_cube(cube)
         for temp_file in self.temp_files:
-            cubes = load(temp_file, callback='default')
+            cubes = load(temp_file)
             cube = cubes[0]
             self.assertEqual(1, len(cubes))
             self.assertTrue((cube.data == np.array([1, 2])).all())
@@ -79,7 +79,7 @@ def test_callback_remove_attributes_from_coords(self):
                     coord.attributes[attr] = attr
             self._save_cube(cube)
         for temp_file in self.temp_files:
-            cubes = load(temp_file, callback='default')
+            cubes = load(temp_file)
             cube = cubes[0]
             self.assertEqual(1, len(cubes))
             self.assertTrue((cube.data == np.array([1, 2])).all())
@@ -94,7 +94,7 @@ def test_callback_fix_lat_units(self):
         cube = _create_sample_cube()
         temp_file = self._save_cube(cube)
 
-        cubes = load(temp_file, callback=concatenate_callback)
+        cubes = load(temp_file)
         cube = cubes[0]
         self.assertEqual(1, len(cubes))
         self.assertTrue((cube.data == np.array([1, 2])).all())
diff --git a/tests/integration/preprocessor/_supplementary_vars/test_add_fx_variables.py b/tests/integration/preprocessor/_supplementary_vars/test_add_fx_variables.py
deleted file mode 100644
index 415a5849c4..0000000000
--- a/tests/integration/preprocessor/_supplementary_vars/test_add_fx_variables.py
+++ /dev/null
@@ -1,296 +0,0 @@
-"""Test add_fx_variables.
-
-Integration tests for the
-:func:`esmvalcore.preprocessor._supplementary_vars` module.
-"""
-import logging
-
-import iris
-import numpy as np
-import pytest
-
-from esmvalcore.cmor.check import CheckLevels
-from esmvalcore.preprocessor._supplementary_vars import (
-    _is_fx_broadcastable,
-    add_ancillary_variable,
-    add_cell_measure,
-    add_fx_variables,
-    remove_fx_variables,
-)
-from esmvalcore.preprocessor._time import clip_timerange
-
-logger = logging.getLogger(__name__)
-
-SHAPES_TO_BROADCAST = [
-    ((), (1, ), True),
-    ((), (10, 10), True),
-    ((1, ), (10, ), True),
-    ((1, ), (10, 10), True),
-    ((2, ), (10, ), False),
-    ((10, ), (), False),
-    ((10, ), (1, ), False),
-    ((10, ), (10, ), True),
-    ((10, ), (10, 10), True),
-    ((10, ), (7, 1), False),
-    ((10, ), (10, 7), False),
-    ((10, ), (7, 1, 10), True),
-    ((10, ), (7, 1, 1), False),
-    ((10, ), (7, 1, 7), False),
-    ((10, ), (7, 10, 7), False),
-    ((10, 1), (1, 1), False),
-    ((10, 1), (1, 100), False),
-    ((10, 1), (10, 7), True),
-    ((10, 12), (10, 1), False),
-    ((10, 1), (10, 12), True),
-    ((10, 12), (), False),
-    ((), (10, 12), True),
-    ((10, 12), (1, ), False),
-    ((1, ), (10, 12), True),
-    ((10, 12), (12, ), False),
-    ((10, 12), (1, 1), False),
-    ((1, 1), (10, 12), True),
-    ((10, 12), (1, 12), False),
-    ((1, 12), (10, 12), True),
-    ((10, 12), (10, 10, 1), False),
-    ((10, 12), (10, 12, 1), False),
-    ((10, 12), (10, 12, 12), False),
-    ((10, 12), (10, 10, 12), True)]
-
-
-@pytest.mark.parametrize('shape_1,shape_2,out', SHAPES_TO_BROADCAST)
-def test_shape_is_broadcastable(shape_1, shape_2, out):
-    """Test check if two shapes are broadcastable."""
-    fx_cube = iris.cube.Cube(np.ones(shape_1))
-    cube = iris.cube.Cube(np.ones(shape_2))
-    is_broadcastable = _is_fx_broadcastable(fx_cube, cube)
-    assert is_broadcastable == out
-
-
-class Test:
-    """Test class."""
-    @pytest.fixture(autouse=True)
-    def setUp(self):
-        """Assemble a stock cube."""
-        fx_area_data = np.ones((3, 3))
-        fx_volume_data = np.ones((3, 3, 3))
-        self.new_cube_data = np.empty((3, 3))
-        self.new_cube_data[:] = 200.
-        self.new_cube_3D_data = np.empty((3, 3, 3))
-        self.new_cube_3D_data[:] = 200.
-        crd_sys = iris.coord_systems.GeogCS(iris.fileformats.pp.EARTH_RADIUS)
-        self.lons = iris.coords.DimCoord([0, 1.5, 3],
-                                         standard_name='longitude',
-                                         bounds=[[0, 1], [1, 2], [2, 3]],
-                                         units='degrees_east',
-                                         coord_system=crd_sys)
-        self.lats = iris.coords.DimCoord([0, 1.5, 3],
-                                         standard_name='latitude',
-                                         bounds=[[0, 1], [1, 2], [2, 3]],
-                                         units='degrees_north',
-                                         coord_system=crd_sys)
-        self.depth = iris.coords.DimCoord([0, 1.5, 3],
-                                          standard_name='depth',
-                                          bounds=[[0, 1], [1, 2], [2, 3]],
-                                          units='m',
-                                          long_name='ocean depth coordinate')
-        self.monthly_times = iris.coords.DimCoord(
-            [15.5, 45, 74.5, 105, 135.5, 166,
-             196.5, 227.5, 258, 288.5, 319, 349.5],
-            standard_name='time',
-            var_name='time',
-            bounds=[[0, 31], [31, 59], [59, 90],
-                    [90, 120], [120, 151], [151, 181],
-                    [181, 212], [212, 243], [243, 273],
-                    [273, 304], [304, 334], [334, 365]],
-            units='days since 1950-01-01 00:00:00')
-        self.yearly_times = iris.coords.DimCoord(
-            [182.5, 547.5],
-            standard_name='time',
-            bounds=[[0, 365], [365, 730]],
-            units='days since 1950-01-01 00:00')
-        self.coords_spec = [(self.lats, 0), (self.lons, 1)]
-        self.fx_area = iris.cube.Cube(fx_area_data,
-                                      dim_coords_and_dims=self.coords_spec)
-        self.fx_volume = iris.cube.Cube(fx_volume_data,
-                                        dim_coords_and_dims=[
-                                            (self.depth, 0),
-                                            (self.lats, 1),
-                                            (self.lons, 2)
-                                            ])
-        self.monthly_volume = iris.cube.Cube(np.ones((12, 3, 3, 3)),
-                                             dim_coords_and_dims=[
-                                             (self.monthly_times, 0),
-                                             (self.depth, 1),
-                                             (self.lats, 2),
-                                             (self.lons, 3)
-                                             ])
-
-    def test_add_cell_measure_area(self, tmp_path):
-        """Test add area fx variables as cell measures."""
-        fx_vars = {
-            'areacella': {
-                'short_name': 'areacella',
-                'project': 'CMIP6',
-                'dataset': 'EC-Earth3',
-                'mip': 'fx',
-                'frequency': 'fx'},
-            'areacello': {
-                'short_name': 'areacello',
-                'project': 'CMIP6',
-                'dataset': 'EC-Earth3',
-                'mip': 'Ofx',
-                'frequency': 'fx'
-            }
-            }
-        for fx_var in fx_vars:
-            self.fx_area.var_name = fx_var
-            self.fx_area.standard_name = 'cell_area'
-            self.fx_area.units = 'm2'
-            fx_file = str(tmp_path / f'{fx_var}.nc')
-            fx_vars[fx_var].update({'filename': fx_file})
-            iris.save(self.fx_area, fx_file)
-            cube = iris.cube.Cube(self.new_cube_data,
-                                  dim_coords_and_dims=self.coords_spec)
-            cube = add_fx_variables(
-                cube, {fx_var: fx_vars[fx_var]}, CheckLevels.IGNORE)
-            assert cube.cell_measure(self.fx_area.standard_name) is not None
-
-    def test_add_cell_measure_volume(self, tmp_path):
-        """Test add volume as cell measure."""
-        fx_vars = {
-            'volcello': {
-                'short_name': 'volcello',
-                'project': 'CMIP6',
-                'dataset': 'EC-Earth3',
-                'mip': 'Ofx',
-                'frequency': 'fx'}
-            }
-        self.fx_volume.var_name = 'volcello'
-        self.fx_volume.standard_name = 'ocean_volume'
-        self.fx_volume.units = 'm3'
-        fx_file = str(tmp_path / 'volcello.nc')
-        iris.save(self.fx_volume, fx_file)
-        fx_vars['volcello'].update({'filename': fx_file})
-        cube = iris.cube.Cube(self.new_cube_3D_data,
-                              dim_coords_and_dims=[
-                                  (self.depth, 0),
-                                  (self.lats, 1),
-                                  (self.lons, 2)])
-        cube = add_fx_variables(cube, fx_vars, CheckLevels.IGNORE)
-        assert cube.cell_measure(self.fx_volume.standard_name) is not None
-
-    def test_clip_volume_timerange(self, tmp_path):
-        """Test timerange is clipped in time dependent measures."""
-        cell_measures = {
-            'volcello': {
-                'short_name': 'volcello',
-                'project': 'CMIP6',
-                'dataset': 'EC-Earth3',
-                'mip': 'Omon',
-                'frequency': 'mon',
-                'timerange': '195001/195003'}
-            }
-        self.monthly_volume.var_name = 'volcello'
-        self.monthly_volume.standard_name = 'ocean_volume'
-        self.monthly_volume.units = 'm3'
-        cell_measure_file = str(tmp_path / 'volcello.nc')
-        iris.save(self.monthly_volume, cell_measure_file)
-        cell_measures['volcello'].update(
-            {'filename': cell_measure_file})
-        cube = iris.cube.Cube(np.ones((12, 3, 3, 3)),
-                              dim_coords_and_dims=[
-                                  (self.monthly_times, 0),
-                                  (self.depth, 1),
-                                  (self.lats, 2),
-                                  (self.lons, 3)])
-        cube = clip_timerange(cube, '195001/195003')
-        cube = add_fx_variables(cube, cell_measures, CheckLevels.IGNORE)
-        cell_measure = cube.cell_measure(self.fx_volume.standard_name)
-        assert cell_measure is not None
-        assert cell_measure.shape == (3, 3, 3, 3)
-
-    def test_no_cell_measure(self):
-        """Test no cell measure is added."""
-        cube = iris.cube.Cube(self.new_cube_3D_data,
-                              dim_coords_and_dims=[
-                                  (self.depth, 0),
-                                  (self.lats, 1),
-                                  (self.lons, 2)])
-        cube = add_fx_variables(cube, {'areacello': None}, CheckLevels.IGNORE)
-        assert cube.cell_measures() == []
-
-    def test_add_ancillary_variables(self, tmp_path):
-        """Test invalid variable is not added as cell measure."""
-        self.fx_area.var_name = 'sftlf'
-        self.fx_area.standard_name = "land_area_fraction"
-        self.fx_area.units = '%'
-        fx_file = str(tmp_path / f'{self.fx_area.var_name}.nc')
-        iris.save(self.fx_area, fx_file)
-        fx_vars = {
-            'sftlf': {
-                'short_name': 'sftlf',
-                'project': 'CMIP6',
-                'dataset': 'EC-Earth3',
-                'mip': 'fx',
-                'frequency': 'fx',
-                'filename': fx_file}
-        }
-        cube = iris.cube.Cube(self.new_cube_data,
-                              dim_coords_and_dims=self.coords_spec)
-        cube = add_fx_variables(cube, fx_vars, CheckLevels.IGNORE)
-        assert cube.ancillary_variable(self.fx_area.standard_name) is not None
-
-    def test_wrong_shape(self, tmp_path):
-        """Test fx_variable is not added if it's not broadcastable to cube."""
-        volume_data = np.ones((2, 3, 3, 3))
-        volume_cube = iris.cube.Cube(
-            volume_data,
-            dim_coords_and_dims=[(self.yearly_times, 0),
-                                 (self.depth, 1),
-                                 (self.lats, 2),
-                                 (self.lons, 3)])
-        volume_cube.standard_name = 'ocean_volume'
-        volume_cube.var_name = 'volcello'
-        volume_cube.units = 'm3'
-        fx_file = str(tmp_path / f'{volume_cube.var_name}.nc')
-        iris.save(volume_cube, fx_file)
-        fx_vars = {
-            'volcello': {
-                'short_name': 'volcello',
-                'project': 'CMIP6',
-                'dataset': 'EC-Earth3',
-                'mip': 'Oyr',
-                'frequency': 'yr',
-                'filename': fx_file,
-                'timerange': '1950/1951'}
-            }
-        data = np.ones((12, 3, 3, 3))
-        cube = iris.cube.Cube(
-            data,
-            dim_coords_and_dims=[(self.monthly_times, 0),
-                                 (self.depth, 1),
-                                 (self.lats, 2),
-                                 (self.lons, 3)])
-        cube.var_name = 'thetao'
-        cube = add_fx_variables(cube, fx_vars, CheckLevels.IGNORE)
-        assert cube.cell_measures() == []
-
-    def test_remove_fx_vars(self):
-        """Test fx_variables are removed from cube."""
-        cube = iris.cube.Cube(self.new_cube_3D_data,
-                              dim_coords_and_dims=[(self.depth, 0),
-                                                   (self.lats, 1),
-                                                   (self.lons, 2)])
-        self.fx_area.var_name = 'areacella'
-        self.fx_area.standard_name = 'cell_area'
-        self.fx_area.units = 'm2'
-        add_cell_measure(cube, self.fx_area, measure='area')
-        assert cube.cell_measure(self.fx_area.standard_name) is not None
-        self.fx_area.var_name = 'sftlf'
-        self.fx_area.standard_name = "land_area_fraction"
-        self.fx_area.units = '%'
-        add_ancillary_variable(cube, self.fx_area)
-        assert cube.ancillary_variable(self.fx_area.standard_name) is not None
-        cube = remove_fx_variables(cube)
-        assert cube.cell_measures() == []
-        assert cube.ancillary_variables() == []
diff --git a/tests/integration/preprocessor/_supplementary_vars/test_add_supplementary_variables.py b/tests/integration/preprocessor/_supplementary_vars/test_add_supplementary_variables.py
index 9a3fe8169c..d4a9b0b217 100644
--- a/tests/integration/preprocessor/_supplementary_vars/test_add_supplementary_variables.py
+++ b/tests/integration/preprocessor/_supplementary_vars/test_add_supplementary_variables.py
@@ -8,7 +8,6 @@
 import numpy as np
 import pytest
 
-import esmvalcore.config
 from esmvalcore.preprocessor._supplementary_vars import (
     add_ancillary_variable,
     add_cell_measure,
@@ -120,14 +119,8 @@ def test_add_supplementary_vars(self):
         cube = add_supplementary_variables(cube, [self.fx_area])
         assert cube.ancillary_variable(self.fx_area.standard_name) is not None
 
-    @pytest.mark.parametrize('use_legacy_supplementaries', [True, False])
-    def test_wrong_shape(self, use_legacy_supplementaries, monkeypatch):
+    def test_wrong_shape(self, monkeypatch):
         """Test variable is not added if it's not broadcastable to cube."""
-        monkeypatch.setitem(
-            esmvalcore.config.CFG,
-            'use_legacy_supplementaries',
-            use_legacy_supplementaries,
-        )
         volume_data = np.ones((2, 3, 3, 3))
         volume_cube = iris.cube.Cube(
             volume_data,
@@ -146,12 +139,8 @@ def test_wrong_shape(self, use_legacy_supplementaries, monkeypatch):
                                  (self.lats, 2),
                                  (self.lons, 3)])
         cube.var_name = 'thetao'
-        if use_legacy_supplementaries:
+        with pytest.raises(iris.exceptions.CannotAddError):
             add_supplementary_variables(cube, [volume_cube])
-            assert cube.cell_measures() == []
-        else:
-            with pytest.raises(iris.exceptions.CannotAddError):
-                add_supplementary_variables(cube, [volume_cube])
 
     def test_remove_supplementary_vars(self):
         """Test supplementary variables are removed from cube."""
diff --git a/tests/integration/preprocessor/test_preprocessing_task.py b/tests/integration/preprocessor/test_preprocessing_task.py
index 81f980c9e8..3b33e8f44e 100644
--- a/tests/integration/preprocessor/test_preprocessing_task.py
+++ b/tests/integration/preprocessor/test_preprocessing_task.py
@@ -16,7 +16,7 @@ def test_load_save_task(tmp_path):
     iris.save(cube, in_file)
     dataset = Dataset(short_name='tas')
     dataset.files = [in_file]
-    dataset._load_with_callback = lambda _: cube.copy()
+    dataset.load = lambda: cube.copy()
 
     # Create task
     task = PreprocessingTask([
@@ -57,11 +57,11 @@ def test_load_save_and_other_task(tmp_path, monkeypatch):
 
     dataset1 = Dataset(short_name='tas', dataset='dataset1')
     dataset1.files = [file1]
-    dataset1._load_with_callback = lambda _: in_cube.copy()
+    dataset1.load = lambda: in_cube.copy()
 
     dataset2 = Dataset(short_name='tas', dataset='dataset1')
     dataset2.files = [file2]
-    dataset2._load_with_callback = lambda _: in_cube.copy()
+    dataset2.load = lambda: in_cube.copy()
 
     # Create some mock preprocessor functions and patch
     # `esmvalcore.preprocessor` so it uses them.
diff --git a/tests/integration/recipe/test_check.py b/tests/integration/recipe/test_check.py
index 367983a0cc..5694cd2eec 100644
--- a/tests/integration/recipe/test_check.py
+++ b/tests/integration/recipe/test_check.py
@@ -305,31 +305,6 @@ def test_reference_for_bias_preproc_two_refs():
     }
 
 
-def test_invalid_multi_model_settings():
-    valid_keys = [
-        'groupby',
-        'ignore_scalar_coords',
-        'keep_input_datasets',
-        'span',
-        'statistics',
-    ]
-    with pytest.raises(RecipeError) as rec_err:
-        check._verify_arguments(INVALID_MM_SETTINGS, valid_keys)
-    assert str(rec_err.value) == (
-        "Unexpected keyword argument encountered: wrong_parametre. "
-        "Valid keywords are: "
-        "['groupby', 'ignore_scalar_coords', 'keep_input_datasets', "
-        "'span', 'statistics'].")
-
-
-def test_invalid_multi_model_statistics():
-    msg = (r"Invalid value encountered for `statistic` in preprocessor "
-           r"multi_model_statistics. Valid values are .* Got 'wrong'.")
-    with pytest.raises(RecipeError, match=msg):
-        check._verify_statistics(
-            INVALID_MM_SETTINGS['statistics'], 'multi_model_statistics')
-
-
 def test_invalid_multi_model_span():
     with pytest.raises(RecipeError) as rec_err:
         check._verify_span_value(INVALID_MM_SETTINGS['span'])
@@ -366,10 +341,3 @@ def test_invalid_multi_model_ignore_scalar_coords():
     assert str(rec_err.value) == (
         'Invalid value encountered for `ignore_scalar_coords`.'
         'Must be defined as a boolean (true or false). Got wrong.')
-
-
-def test_invalid_ensemble_statistics():
-    msg = (r"Invalid value encountered for `statistic` in preprocessor "
-           r"ensemble_statistics. Valid values are .* Got 'wrong'.")
-    with pytest.raises(RecipeError, match=msg):
-        check._verify_statistics(['wrong'], 'ensemble_statistics')
diff --git a/tests/integration/recipe/test_recipe.py b/tests/integration/recipe/test_recipe.py
index ba53388ddf..8b7bfedb86 100644
--- a/tests/integration/recipe/test_recipe.py
+++ b/tests/integration/recipe/test_recipe.py
@@ -82,7 +82,6 @@
 )
 
 DEFAULT_PREPROCESSOR_STEPS = (
-    'load',
     'remove_supplementary_variables',
     'save',
 )
@@ -106,9 +105,6 @@ def create_test_file(filename, tracking_id=None):
 def _get_default_settings_for_chl(save_filename):
     """Get default preprocessor settings for chl."""
     defaults = {
-        'load': {
-            'callback': 'default'
-        },
         'remove_supplementary_variables': {},
         'save': {
             'compress': False,
@@ -120,6 +116,7 @@ def _get_default_settings_for_chl(save_filename):
 
 @pytest.fixture
 def patched_tas_derivation(monkeypatch):
+
     def get_required(short_name, _):
         if short_name != 'tas':
             assert False
@@ -557,9 +554,6 @@ def test_default_fx_preprocessor(tmp_path, patched_datafinder, session):
     assert preproc_dir.startswith(str(tmp_path))
 
     defaults = {
-        'load': {
-            'callback': 'default'
-        },
         'remove_supplementary_variables': {},
         'save': {
             'compress': False,
@@ -1257,7 +1251,7 @@ def simulate_diagnostic_run(diagnostic_task):
     plot_file = create_test_image('test', cfg)
     provenance = os.path.join(cfg['run_dir'], 'diagnostic_provenance.yml')
     os.makedirs(cfg['run_dir'])
-    with open(provenance, 'w') as file:
+    with open(provenance, 'w', encoding='utf-8') as file:
         yaml.safe_dump({diagnostic_file: record, plot_file: record}, file)
 
     diagnostic_task._collect_provenance()
@@ -1381,8 +1375,8 @@ def test_alias_generation(tmp_path, patched_datafinder, session):
                   - {project: CMIP6, activity: CMP, dataset: GF2, ensemble: r1, institute: fake}
                   - {project: CMIP6, activity: HRMP, dataset: EC, ensemble: r1, institute: fake}
                   - {project: CMIP6, activity: HRMP, dataset: HA, ensemble: r1, institute: fake}
-                  - {project: CORDEX, driver: ICHEC-EC-EARTH, dataset: SMHI-RCA4, ensemble: r1, mip: mon}
-                  - {project: CORDEX, driver: MIROC-MIROC5, dataset: SMHI-RCA4, ensemble: r1, mip: mon}
+                  - {project: CORDEX, driver: ICHEC-EC-EARTH, dataset: RCA4, ensemble: r1, mip: mon, institute: SMHI}
+                  - {project: CORDEX, driver: MIROC-MIROC5, dataset: RCA4, ensemble: r1, mip: mon, institute: SMHI}
             scripts: null
         """)  # noqa:
 
@@ -1825,6 +1819,9 @@ def test_weighting_landsea_fraction(tmp_path, patched_datafinder, session):
                   - {dataset: CanESM2}
                   - {dataset: TEST, project: obs4MIPs, level: 1, version: 1,
                      tier: 1}
+                supplementary_variables:
+                  - short_name: sftlf
+                    mip: fx
             scripts: null
         """)
     recipe = get_recipe(tmp_path, content, session)
@@ -1843,16 +1840,8 @@ def test_weighting_landsea_fraction(tmp_path, patched_datafinder, session):
         assert settings['area_type'] == 'land'
         assert len(product.datasets) == 1
         dataset = product.datasets[0]
-        short_names = {
-            ds.facets['short_name']
-            for ds in dataset.supplementaries
-        }
-        if dataset.facets['project'] == 'obs4MIPs':
-            assert len(dataset.supplementaries) == 1
-            assert {'sftlf'} == short_names
-        else:
-            assert len(dataset.supplementaries) == 2
-            assert {'sftlf', 'sftof'} == short_names
+        assert len(dataset.supplementaries) == 1
+        assert dataset.supplementaries[0].facets['short_name'] == 'sftlf'
 
 
 def test_weighting_landsea_fraction_no_fx(tmp_path, patched_failing_datafinder,
@@ -1910,8 +1899,8 @@ def test_weighting_landsea_fraction_exclude(tmp_path, patched_datafinder,
                 additional_datasets:
                   - {dataset: CanESM2}
                   - {dataset: GFDL-CM3}
-                  - {dataset: TEST, project: obs4MIPs, level: 1, version: 1,
-                     tier: 1}
+                  - {dataset: TEST, project: obs4MIPs,
+                     supplementary_variables: [{short_name: sftlf, mip: fx}]}
             scripts: null
         """)
     recipe = get_recipe(tmp_path, content, session)
@@ -1991,6 +1980,9 @@ def test_area_statistics(tmp_path, patched_datafinder, session):
                   - {dataset: CanESM2}
                   - {dataset: TEST, project: obs4MIPs, level: 1, version: 1,
                      tier: 1}
+                supplementary_variables:
+                  - short_name: areacella
+                    mip: fx
             scripts: null
         """)
     recipe = get_recipe(tmp_path, content, session)
@@ -2009,14 +2001,8 @@ def test_area_statistics(tmp_path, patched_datafinder, session):
         assert settings['operator'] == 'mean'
         assert len(product.datasets) == 1
         dataset = product.datasets[0]
-        short_names = {
-            ds.facets['short_name']
-            for ds in dataset.supplementaries
-        }
-        if dataset.facets['project'] == 'obs4MIPs':
-            assert short_names == {'areacella'}
-        else:
-            assert short_names == {'areacella', 'areacello'}
+        assert len(dataset.supplementaries) == 1
+        assert dataset.supplementaries[0].facets['short_name'] == 'areacella'
 
 
 def test_landmask(tmp_path, patched_datafinder, session):
@@ -2041,6 +2027,9 @@ def test_landmask(tmp_path, patched_datafinder, session):
                   - {dataset: CanESM2}
                   - {dataset: TEST, project: obs4MIPs, level: 1, version: 1,
                      tier: 1}
+                supplementary_variables:
+                  - short_name: sftlf
+                    mip: fx
             scripts: null
         """)
     recipe = get_recipe(tmp_path, content, session)
@@ -2059,223 +2048,8 @@ def test_landmask(tmp_path, patched_datafinder, session):
         assert settings['mask_out'] == 'sea'
         assert len(product.datasets) == 1
         dataset = product.datasets[0]
-        if dataset.facets['project'] == 'obs4MIPs':
-            assert len(dataset.supplementaries) == 1
-        else:
-            assert len(dataset.supplementaries) == 2
-
-
-def test_empty_fxvar_none(tmp_path, patched_datafinder, session):
-    """Test that no fx variables are added if explicitly specified."""
-    content = dedent("""
-        preprocessors:
-          landmask:
-            mask_landsea:
-              mask_out: sea
-              fx_variables: null
-        diagnostics:
-          diagnostic_name:
-            variables:
-              gpp:
-                preprocessor: landmask
-                project: CMIP5
-                mip: Lmon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1
-                additional_datasets:
-                  - {dataset: CanESM2}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check that no custom fx variables are present
-    task = recipe.tasks.pop()
-    product = task.products.pop()
-    dataset = product.datasets[0]
-    assert dataset.supplementaries == []
-
-
-def test_empty_fxvar_list(tmp_path, patched_datafinder, session):
-    """Test that no fx variables are added if explicitly specified."""
-    content = dedent("""
-        preprocessors:
-          landmask:
-            mask_landsea:
-              mask_out: sea
-              fx_variables: []
-        diagnostics:
-          diagnostic_name:
-            variables:
-              gpp:
-                preprocessor: landmask
-                project: CMIP5
-                mip: Lmon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1
-                additional_datasets:
-                  - {dataset: CanESM2}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check that no custom fx variables are present
-    task = recipe.tasks.pop()
-    product = task.products.pop()
-    dataset = product.datasets[0]
-    assert dataset.supplementaries == []
-
-
-def test_empty_fxvar_dict(tmp_path, patched_datafinder, session):
-    """Test that no fx variables are added if explicitly specified."""
-    content = dedent("""
-        preprocessors:
-          landmask:
-            mask_landsea:
-              mask_out: sea
-              fx_variables: {}
-        diagnostics:
-          diagnostic_name:
-            variables:
-              gpp:
-                preprocessor: landmask
-                project: CMIP5
-                mip: Lmon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1
-                additional_datasets:
-                  - {dataset: CanESM2}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check that no custom fx variables are present
-    task = recipe.tasks.pop()
-    product = task.products.pop()
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    assert dataset.supplementaries == []
-
-
-@pytest.mark.parametrize('content', [
-    pytest.param(dedent("""
-        preprocessors:
-          landmask:
-            mask_landsea:
-              mask_out: sea
-              fx_variables:
-                sftlf:
-                  exp: piControl
-            mask_landseaice:
-              mask_out: sea
-              fx_variables:
-                sftgif:
-                  exp: piControl
-            volume_statistics:
-              operator: mean
-            area_statistics:
-              operator: mean
-              fx_variables:
-                areacello:
-                  mip: fx
-                  exp: piControl
-        diagnostics:
-          diagnostic_name:
-            variables:
-              gpp:
-                preprocessor: landmask
-                project: CMIP5
-                mip: Lmon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1
-                additional_datasets:
-                  - {dataset: CanESM2}
-            scripts: null
-        """),
-                 id='fx_variables_as_dict_of_dicts'),
-    pytest.param(dedent("""
-        preprocessors:
-          landmask:
-            mask_landsea:
-              mask_out: sea
-              fx_variables: [{'short_name': 'sftlf', 'exp': 'piControl'}]
-            mask_landseaice:
-              mask_out: sea
-              fx_variables: [{'short_name': 'sftgif', 'exp': 'piControl'}]
-            volume_statistics:
-              operator: mean
-            area_statistics:
-              operator: mean
-              fx_variables: [{'short_name': 'areacello', 'mip': 'fx',
-                         'exp': 'piControl'}]
-        diagnostics:
-          diagnostic_name:
-            variables:
-              gpp:
-                preprocessor: landmask
-                project: CMIP5
-                mip: Lmon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1
-                additional_datasets:
-                  - {dataset: CanESM2}
-            scripts: null
-        """),
-                 id='fx_variables_as_list_of_dicts'),
-])
-def test_user_defined_fxvar(tmp_path, patched_datafinder, session, content):
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check custom fx variables
-    task = recipe.tasks.pop()
-    product = task.products.pop()
-
-    # landsea
-    settings = product.settings['mask_landsea']
-    assert len(settings) == 1
-    assert settings['mask_out'] == 'sea'
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    assert isinstance(dataset.supplementaries, list)
-    supplementaries = {
-        ds.facets['short_name']: ds
-        for ds in dataset.supplementaries
-    }
-    assert len(list(supplementaries)) == 4
-    sftlf_ds = supplementaries['sftlf']
-    assert sftlf_ds.facets['mip'] == 'fx'
-    assert sftlf_ds.facets['exp'] == 'piControl'
-
-    # landseaice
-    settings = product.settings['mask_landseaice']
-    assert len(settings) == 1
-    assert settings['mask_out'] == 'sea'
-    sftgif_ds = supplementaries['sftgif']
-    assert sftgif_ds.facets['mip'] == 'fx'
-    assert sftgif_ds.facets['exp'] == 'piControl'
-
-    # volume statistics
-    settings = product.settings['volume_statistics']
-    assert len(settings) == 1
-    assert settings['operator'] == 'mean'
-    assert 'volcello' in supplementaries
-
-    # area statistics
-    settings = product.settings['area_statistics']
-    assert len(settings) == 1
-    assert settings['operator'] == 'mean'
-    areacello_ds = supplementaries['areacello']
-    assert areacello_ds.facets['mip'] == 'fx'
-    assert areacello_ds.facets['exp'] == 'piControl'
+        assert len(dataset.supplementaries) == 1
+        assert dataset.supplementaries[0].facets['short_name'] == 'sftlf'
 
 
 def test_landmask_no_fx(tmp_path, patched_failing_datafinder, session):
@@ -2323,802 +2097,103 @@ def test_landmask_no_fx(tmp_path, patched_failing_datafinder, session):
         assert dataset.supplementaries == []
 
 
-def test_fx_vars_fixed_mip_cmip6(tmp_path, patched_datafinder, session):
-    """Test fx variables with given mips."""
-    TAGS.set_tag_values(TAGS_FOR_TESTING)
-
+def test_wrong_project(tmp_path, patched_datafinder, session):
     content = dedent("""
         preprocessors:
           preproc:
-            volume_statistics:
-              operator: mean
-              fx_variables:
-                volcello:
-                  ensemble: r2i1p1f1
-                  mip: Ofx
-            mask_landseaice:
-              mask_out: ice
-              fx_variables:
-                sftgif:
-                  mip: fx
-
+           volume_statistics:
+             operator: mean
         diagnostics:
           diagnostic_name:
             variables:
-              tas:
+              tos:
                 preprocessor: preproc
-                project: CMIP6
-                mip: Amon
+                project: CMIP7
+                mip: Omon
                 exp: historical
                 start_year: 2000
                 end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
+                ensemble: r1i1p1
                 additional_datasets:
-                  - {dataset: CanESM5}
+                  - {dataset: CanESM2}
             scripts: null
         """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check generated tasks
-    assert len(recipe.tasks) == 1
-    task = recipe.tasks.pop()
-    assert task.name == 'diagnostic_name' + TASKSEP + 'tas'
-    assert len(task.products) == 1
-    product = task.products.pop()
-
-    # Check volume_statistics
-    assert 'volume_statistics' in product.settings
-    settings = product.settings['volume_statistics']
-    assert len(settings) == 1
-    assert settings['operator'] == 'mean'
-
-    # Check legacy method of adding supplementary variables
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    supplementaries = {
-        ds.facets['short_name']: ds
-        for ds in dataset.supplementaries
-    }
-    assert len(list(supplementaries)) == 2
-    sftgif_ds = supplementaries['sftgif']
-    assert sftgif_ds.facets['mip'] == 'fx'
-    volcello_ds = supplementaries['volcello']
-    assert volcello_ds.facets['ensemble'] == 'r2i1p1f1'
-    assert volcello_ds.facets['mip'] == 'Ofx'
-
+    msg = ("Unable to load CMOR table (project) 'CMIP7' for variable 'tos' "
+           "with mip 'Omon'")
+    with pytest.raises(RecipeError) as wrong_proj:
+        get_recipe(tmp_path, content, session)
+    assert str(wrong_proj.value) == msg
 
-def test_fx_vars_invalid_mip_cmip6(tmp_path, patched_datafinder, session):
-    """Test fx variables with invalid mip."""
-    TAGS.set_tag_values(TAGS_FOR_TESTING)
 
+def test_multimodel_mask(tmp_path, patched_datafinder, session):
+    """Test ``mask_multimodel``."""
     content = dedent("""
         preprocessors:
           preproc:
-           area_statistics:
-             operator: mean
-             fx_variables:
-               areacella:
-                 mip: INVALID
+            mask_multimodel:
 
         diagnostics:
           diagnostic_name:
             variables:
               tas:
                 preprocessor: preproc
-                project: CMIP6
+                project: CMIP5
                 mip: Amon
                 exp: historical
-                start_year: 2000
+                start_year: 2005
                 end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
+                ensemble: r1i1p1
                 additional_datasets:
-                  - {dataset: CanESM5}
+                  - {dataset: BNU-ESM}
+                  - {dataset: CanESM2}
+                  - {dataset: HadGEM2-ES}
             scripts: null
         """)
-    msg = ("Unable to load CMOR table (project) 'CMIP6' for variable "
-           "'areacella' with mip 'INVALID'")
-    with pytest.raises(RecipeError) as rec_err_exp:
-        get_recipe(tmp_path, content, session)
-    assert str(rec_err_exp.value) == INITIALIZATION_ERROR_MSG
-    assert msg in rec_err_exp.value.failed_tasks[0].message
+    recipe = get_recipe(tmp_path, content, session)
 
+    # Check generated tasks
+    assert len(recipe.tasks) == 1
+    task = recipe.tasks.pop()
+    assert task.name == f'diagnostic_name{TASKSEP}tas'
 
-def test_fx_vars_invalid_mip_for_var_cmip6(tmp_path, patched_datafinder,
-                                           session):
-    """Test fx variables with invalid mip for variable."""
-    TAGS.set_tag_values(TAGS_FOR_TESTING)
+    # Check mask_multimodel
+    assert len(task.products) == 3
+    for product in task.products:
+        assert 'mask_multimodel' in product.settings
+        assert product.settings['mask_multimodel'] == {}
 
-    content = dedent("""
-        preprocessors:
-          preproc:
-           area_statistics:
-             operator: mean
-             fx_variables:
-               areacella:
-                 mip: Lmon
 
+def test_obs4mips_case_correct(tmp_path, patched_datafinder, session):
+    """Test that obs4mips is corrected to obs4MIPs."""
+    content = dedent("""
         diagnostics:
           diagnostic_name:
             variables:
               tas:
-                preprocessor: preproc
-                project: CMIP6
+                project: CMIP5
                 mip: Amon
                 exp: historical
                 start_year: 2000
                 end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
+                ensemble: r1i1p1
                 additional_datasets:
-                  - {dataset: CanESM5}
+                  - {dataset: TEST, project: obs4mips,
+                     version: 1, tier: 1, level: 1}
             scripts: null
         """)
-    msg = ("Unable to load CMOR table (project) 'CMIP6' for variable "
-           "'areacella' with mip 'Lmon'")
-    with pytest.raises(RecipeError) as rec_err_exp:
-        get_recipe(tmp_path, content, session)
-    assert str(rec_err_exp.value) == INITIALIZATION_ERROR_MSG
-    assert msg in rec_err_exp.value.failed_tasks[0].message
-
+    recipe = get_recipe(tmp_path, content, session)
+    dataset = recipe.datasets[0]
+    assert dataset['project'] == 'obs4MIPs'
 
-def test_fx_vars_mip_search_cmip6(tmp_path, patched_datafinder, session):
-    """Test mip tables search for different fx variables."""
-    TAGS.set_tag_values(TAGS_FOR_TESTING)
 
+def test_recipe_run(tmp_path, patched_datafinder, session, mocker):
     content = dedent("""
-        preprocessors:
-          preproc:
-           area_statistics:
-             operator: mean
-             fx_variables:
-               areacella:
-               areacello:
-           mask_landsea:
-             mask_out: sea
-
         diagnostics:
           diagnostic_name:
             variables:
-              tas:
-                preprocessor: preproc
-                project: CMIP6
-                mip: Amon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
-                additional_datasets:
-                  - {dataset: CanESM5}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check generated tasks
-    assert len(recipe.tasks) == 1
-    task = recipe.tasks.pop()
-    assert task.name == 'diagnostic_name' + TASKSEP + 'tas'
-    assert len(task.products) == 1
-    product = task.products.pop()
-
-    # Check area_statistics
-    assert 'area_statistics' in product.settings
-    settings = product.settings['area_statistics']
-    assert len(settings) == 1
-    assert settings['operator'] == 'mean'
-
-    # Check mask_landsea
-    assert 'mask_landsea' in product.settings
-    settings = product.settings['mask_landsea']
-    assert len(settings) == 1
-    assert settings['mask_out'] == 'sea'
-
-    # Check legacy method of adding supplementary variables
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    assert len(dataset.supplementaries) == 4
-    supplementaries = {
-        ds.facets['short_name']: ds
-        for ds in dataset.supplementaries
-    }
-    assert supplementaries['areacella'].facets['mip'] == 'fx'
-    assert supplementaries['areacello'].facets['mip'] == 'Ofx'
-    assert supplementaries['sftlf'].facets['mip'] == 'fx'
-    assert supplementaries['sftof'].facets['mip'] == 'Ofx'
-
-
-def test_fx_list_mip_search_cmip6(tmp_path, patched_datafinder, session):
-    """Test mip tables search for list of different fx variables."""
-    content = dedent("""
-        preprocessors:
-          preproc:
-            area_statistics:
-              operator: mean
-              fx_variables: [
-                'areacella',
-                'areacello',
-              ]
-            mask_landsea:
-              mask_out: sea
-              fx_variables: [
-                'sftlf',
-                'sftof',
-              ]
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tas:
-                preprocessor: preproc
-                project: CMIP6
-                mip: Amon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
-                additional_datasets:
-                  - {dataset: CanESM5}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check generated tasks
-    assert len(recipe.tasks) == 1
-    task = recipe.tasks.pop()
-    assert task.name == 'diagnostic_name' + TASKSEP + 'tas'
-    assert len(task.products) == 1
-    product = task.products.pop()
-
-    # Check area_statistics
-    assert 'area_statistics' in product.settings
-    settings = product.settings['area_statistics']
-    assert len(settings) == 1
-    assert settings['operator'] == 'mean'
-
-    # Check legacy method of adding supplementary variables
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    assert len(dataset.supplementaries) == 4
-    supplementaries = {
-        ds.facets['short_name']: ds
-        for ds in dataset.supplementaries
-    }
-    assert supplementaries['areacella'].facets['mip'] == 'fx'
-    assert supplementaries['areacello'].facets['mip'] == 'Ofx'
-    assert supplementaries['sftlf'].facets['mip'] == 'fx'
-    assert supplementaries['sftof'].facets['mip'] == 'Ofx'
-
-
-def test_fx_vars_volcello_in_ofx_cmip6(tmp_path, patched_datafinder, session):
-    TAGS.set_tag_values(TAGS_FOR_TESTING)
-
-    content = dedent("""
-        preprocessors:
-          preproc:
-           volume_statistics:
-             operator: mean
-             fx_variables:
-               volcello:
-                 mip: Ofx
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tos:
-                preprocessor: preproc
-                project: CMIP6
-                mip: Omon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
-                additional_datasets:
-                  - {dataset: CanESM5}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check generated tasks
-    assert len(recipe.tasks) == 1
-    task = recipe.tasks.pop()
-    assert task.name == 'diagnostic_name' + TASKSEP + 'tos'
-    assert len(task.products) == 1
-    product = task.products.pop()
-
-    # Check volume_statistics
-    assert 'volume_statistics' in product.settings
-    settings = product.settings['volume_statistics']
-    assert len(settings) == 1
-    assert settings['operator'] == 'mean'
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    assert len(dataset.supplementaries) == 1
-    volcello_ds = dataset.supplementaries[0]
-    assert volcello_ds.facets['mip'] == 'Ofx'
-
-
-def test_fx_dicts_volcello_in_ofx_cmip6(tmp_path, patched_datafinder, session):
-    content = dedent("""
-        preprocessors:
-          preproc:
-           volume_statistics:
-             operator: mean
-             fx_variables:
-               volcello:
-                 mip: Oyr
-                 exp: piControl
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tos:
-                preprocessor: preproc
-                project: CMIP6
-                mip: Omon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
-                additional_datasets:
-                  - {dataset: CanESM5}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check generated tasks
-    assert len(recipe.tasks) == 1
-    task = recipe.tasks.pop()
-    assert task.name == 'diagnostic_name' + TASKSEP + 'tos'
-    assert len(task.products) == 1
-    product = task.products.pop()
-
-    # Check volume_statistics
-    assert 'volume_statistics' in product.settings
-    settings = product.settings['volume_statistics']
-    assert len(settings) == 1
-    assert settings['operator'] == 'mean'
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    assert len(dataset.supplementaries) == 1
-    volcello_ds = dataset.supplementaries[0]
-    assert volcello_ds.facets['short_name'] == 'volcello'
-    assert volcello_ds.facets['mip'] == 'Oyr'
-    assert volcello_ds.facets['exp'] == 'piControl'
-
-
-def test_fx_vars_list_no_preproc_cmip6(tmp_path, patched_datafinder, session):
-    content = dedent("""
-        preprocessors:
-          preproc:
-           regrid:
-             target_grid: 1x1
-             scheme: linear
-           extract_volume:
-             z_min: 0
-             z_max: 100
-           annual_statistics:
-             operator: mean
-           convert_units:
-             units: K
-           area_statistics:
-             operator: mean
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tos:
-                preprocessor: preproc
-                project: CMIP6
-                mip: Omon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
-                additional_datasets:
-                  - {dataset: CanESM5}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check generated tasks
-    assert len(recipe.tasks) == 1
-    task = recipe.tasks.pop()
-    assert task.name == 'diagnostic_name' + TASKSEP + 'tos'
-    assert len(task.ancestors) == 0
-    assert len(task.products) == 1
-    product = task.products.pop()
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    assert product.attributes['short_name'] == 'tos'
-    assert dataset.files
-    assert 'area_statistics' in product.settings
-    settings = product.settings['area_statistics']
-    assert len(settings) == 1
-    assert settings['operator'] == 'mean'
-    assert len(dataset.supplementaries) == 2
-
-
-def test_fx_vars_volcello_in_omon_cmip6(tmp_path, patched_failing_datafinder,
-                                        session):
-    content = dedent("""
-        preprocessors:
-          preproc:
-           volume_statistics:
-             operator: mean
-             fx_variables:
-               volcello:
-                 mip: Omon
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tos:
-                preprocessor: preproc
-                project: CMIP6
-                mip: Omon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
-                additional_datasets:
-                  - {dataset: CanESM5}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check generated tasks
-    assert len(recipe.tasks) == 1
-    task = recipe.tasks.pop()
-    assert task.name == 'diagnostic_name' + TASKSEP + 'tos'
-    assert len(task.products) == 1
-    product = task.products.pop()
-
-    # Check volume_statistics
-    assert 'volume_statistics' in product.settings
-    settings = product.settings['volume_statistics']
-    assert len(settings) == 1
-    assert settings['operator'] == 'mean'
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    assert len(dataset.supplementaries) == 1
-    volcello_ds = dataset.supplementaries[0]
-    assert volcello_ds.facets['mip'] == 'Omon'
-
-
-def test_fx_vars_volcello_in_oyr_cmip6(tmp_path, patched_failing_datafinder,
-                                       session):
-    content = dedent("""
-        preprocessors:
-          preproc:
-           volume_statistics:
-             operator: mean
-             fx_variables:
-               volcello:
-                 mip: Oyr
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              o2:
-                preprocessor: preproc
-                project: CMIP6
-                mip: Oyr
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
-                additional_datasets:
-                  - {dataset: CanESM5}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check generated tasks
-    assert len(recipe.tasks) == 1
-    task = recipe.tasks.pop()
-    assert task.name == 'diagnostic_name' + TASKSEP + 'o2'
-    assert len(task.products) == 1
-    product = task.products.pop()
-
-    # Check volume_statistics
-    assert 'volume_statistics' in product.settings
-    settings = product.settings['volume_statistics']
-    assert len(settings) == 1
-    assert settings['operator'] == 'mean'
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    assert len(dataset.supplementaries) == 1
-    volcello_ds = dataset.supplementaries[0]
-    assert volcello_ds.facets['short_name'] == 'volcello'
-    assert volcello_ds.facets['mip'] == 'Oyr'
-
-
-def test_fx_vars_volcello_in_fx_cmip5(tmp_path, patched_datafinder, session):
-    content = dedent("""
-        preprocessors:
-          preproc:
-           volume_statistics:
-             operator: mean
-             fx_variables:
-               volcello:
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tos:
-                preprocessor: preproc
-                project: CMIP5
-                mip: Omon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1
-                additional_datasets:
-                  - {dataset: CanESM2}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check generated tasks
-    assert len(recipe.tasks) == 1
-    task = recipe.tasks.pop()
-    assert task.name == 'diagnostic_name' + TASKSEP + 'tos'
-    assert len(task.products) == 1
-    product = task.products.pop()
-
-    # Check volume_statistics
-    assert 'volume_statistics' in product.settings
-    settings = product.settings['volume_statistics']
-    assert len(settings) == 1
-    assert settings['operator'] == 'mean'
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    assert len(dataset.supplementaries) == 1
-    volcello_ds = dataset.supplementaries[0]
-    assert volcello_ds.facets['short_name'] == 'volcello'
-    assert volcello_ds.facets['mip'] == 'fx'
-
-
-def test_wrong_project(tmp_path, patched_datafinder, session):
-    content = dedent("""
-        preprocessors:
-          preproc:
-           volume_statistics:
-             operator: mean
-             fx_variables:
-               volcello:
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tos:
-                preprocessor: preproc
-                project: CMIP7
-                mip: Omon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1
-                additional_datasets:
-                  - {dataset: CanESM2}
-            scripts: null
-        """)
-    msg = ("Unable to load CMOR table (project) 'CMIP7' for variable 'tos' "
-           "with mip 'Omon'")
-    with pytest.raises(RecipeError) as wrong_proj:
-        get_recipe(tmp_path, content, session)
-    assert str(wrong_proj.value) == INITIALIZATION_ERROR_MSG
-    assert str(wrong_proj.value.failed_tasks[0].message) == msg
-
-
-def test_invalid_fx_var_cmip6(tmp_path, patched_datafinder, session):
-    """Test that error is raised for invalid fx variable."""
-    TAGS.set_tag_values(TAGS_FOR_TESTING)
-
-    content = dedent("""
-        preprocessors:
-          preproc:
-           area_statistics:
-             operator: mean
-             fx_variables:
-               areacella:
-               wrong_fx_variable:
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tas:
-                preprocessor: preproc
-                project: CMIP6
-                mip: Amon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
-                additional_datasets:
-                  - {dataset: CanESM5}
-            scripts: null
-        """)
-    msg = ("Preprocessor function 'area_statistics' does not support "
-           "supplementary variable 'wrong_fx_variable'")
-    with pytest.raises(RecipeError) as rec_err_exp:
-        get_recipe(tmp_path, content, session)
-    assert str(rec_err_exp.value) == INITIALIZATION_ERROR_MSG
-    assert msg in rec_err_exp.value.failed_tasks[0].message
-
-
-def test_ambiguous_fx_var_cmip6(tmp_path, patched_datafinder, session):
-    """Test that error is raised for fx files available in multiple mips."""
-    TAGS.set_tag_values(TAGS_FOR_TESTING)
-
-    content = dedent("""
-        preprocessors:
-          preproc:
-           volume_statistics:
-             operator: mean
-             fx_variables:
-               volcello:
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tas:
-                preprocessor: preproc
-                project: CMIP6
-                mip: Amon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
-                additional_datasets:
-                  - {dataset: CanESM5}
-            scripts: null
-        """)
-    msg = ("Requested fx variable 'volcello' for dataset 'CanESM5' of project "
-           "'CMIP6' is available in more than one CMOR MIP table for 'CMIP6': "
-           "['Odec', 'Ofx', 'Omon', 'Oyr']")
-    with pytest.raises(RecipeError) as rec_err_exp:
-        get_recipe(tmp_path, content, session)
-    assert str(rec_err_exp.value) == INITIALIZATION_ERROR_MSG
-    assert msg in rec_err_exp.value.failed_tasks[0].message
-
-
-def test_unique_fx_var_in_multiple_mips_cmip6(tmp_path,
-                                              patched_failing_datafinder,
-                                              session):
-    """Test that no error is raised for fx files available in one mip."""
-    TAGS.set_tag_values(TAGS_FOR_TESTING)
-
-    content = dedent("""
-        preprocessors:
-          preproc:
-           mask_landseaice:
-             mask_out: ice
-             fx_variables:
-               sftgif:
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tas:
-                preprocessor: preproc
-                project: CMIP6
-                mip: Amon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1f1
-                grid: gn
-                additional_datasets:
-                  - {dataset: CanESM5}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check generated tasks
-    assert len(recipe.tasks) == 1
-    task = recipe.tasks.pop()
-    assert task.name == 'diagnostic_name' + TASKSEP + 'tas'
-    assert len(task.products) == 1
-    product = task.products.pop()
-
-    # Check mask_landseaice
-    assert 'mask_landseaice' in product.settings
-    settings = product.settings['mask_landseaice']
-    assert len(settings) == 1
-    assert settings['mask_out'] == 'ice'
-
-    # Check legacy method of adding supplementary variables
-    # Due to failing datafinder, only files in LImon are found even though
-    # sftgif is available in the tables fx, IyrAnt, IyrGre and LImon
-    assert len(product.datasets) == 1
-    dataset = product.datasets[0]
-    assert len(dataset.supplementaries) == 1
-    sftgif_ds = dataset.supplementaries[0]
-    assert sftgif_ds.facets['short_name'] == 'sftgif'
-    assert sftgif_ds.facets['mip'] == 'LImon'
-    assert len(sftgif_ds.files) == 1
-
-
-def test_multimodel_mask(tmp_path, patched_datafinder, session):
-    """Test ``mask_multimodel``."""
-    content = dedent("""
-        preprocessors:
-          preproc:
-            mask_multimodel:
-
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tas:
-                preprocessor: preproc
-                project: CMIP5
-                mip: Amon
-                exp: historical
-                start_year: 2005
-                end_year: 2005
-                ensemble: r1i1p1
-                additional_datasets:
-                  - {dataset: BNU-ESM}
-                  - {dataset: CanESM2}
-                  - {dataset: HadGEM2-ES}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-
-    # Check generated tasks
-    assert len(recipe.tasks) == 1
-    task = recipe.tasks.pop()
-    assert task.name == f'diagnostic_name{TASKSEP}tas'
-
-    # Check mask_multimodel
-    assert len(task.products) == 3
-    for product in task.products:
-        assert 'mask_multimodel' in product.settings
-        assert product.settings['mask_multimodel'] == {}
-
-
-def test_obs4mips_case_correct(tmp_path, patched_datafinder, session):
-    """Test that obs4mips is corrected to obs4MIPs."""
-    content = dedent("""
-        diagnostics:
-          diagnostic_name:
-            variables:
-              tas:
-                project: CMIP5
-                mip: Amon
-                exp: historical
-                start_year: 2000
-                end_year: 2005
-                ensemble: r1i1p1
-                additional_datasets:
-                  - {dataset: TEST, project: obs4mips,
-                     version: 1, tier: 1, level: 1}
-            scripts: null
-        """)
-    recipe = get_recipe(tmp_path, content, session)
-    dataset = recipe.datasets[0]
-    assert dataset['project'] == 'obs4MIPs'
-
-
-def test_recipe_run(tmp_path, patched_datafinder, session, mocker):
-    content = dedent("""
-        diagnostics:
-          diagnostic_name:
-            variables:
-              areacella:
-                project: CMIP5
-                mip: fx
+              areacella:
+                project: CMIP5
+                mip: fx
                 exp: historical
                 ensemble: r1i1p1
                 additional_datasets:
@@ -3363,3 +2438,332 @@ def test_diag_selection(tmp_path, patched_datafinder, session, diags_to_run,
     task_names = {task.name for task in recipe.tasks.flatten()}
 
     assert tasks_run == task_names
+
+
+@pytest.mark.parametrize(
+    'preproc', ['multi_model_statistics', 'ensemble_statistics']
+)
+def test_mm_stats_invalid_arg(preproc, tmp_path, patched_datafinder, session):
+    content = dedent(f"""
+        preprocessors:
+          test:
+            {preproc}:
+              span: overlap
+              statistics: [mean]
+              invalid_argument: 1
+
+        diagnostics:
+          diagnostic_name:
+            variables:
+              chl_default:
+                short_name: chl
+                mip: Oyr
+                preprocessor: test
+                timerange: '2000/2010'
+                additional_datasets:
+                  - project: CMIP5
+                    dataset: CanESM2
+                    exp: historical
+                    ensemble: r1i1p1
+            scripts: null
+        """)
+    with pytest.raises(ValueError):
+        get_recipe(tmp_path, content, session)
+
+
+@pytest.mark.parametrize(
+    'preproc', ['multi_model_statistics', 'ensemble_statistics']
+)
+def test_mm_stats_missing_arg(preproc, tmp_path, patched_datafinder, session):
+    content = dedent(f"""
+        preprocessors:
+          test:
+            {preproc}:
+
+        diagnostics:
+          diagnostic_name:
+            variables:
+              chl_default:
+                short_name: chl
+                mip: Oyr
+                preprocessor: test
+                timerange: '2000/2010'
+                additional_datasets:
+                  - project: CMIP5
+                    dataset: CanESM2
+                    exp: historical
+                    ensemble: r1i1p1
+            scripts: null
+        """)
+    with pytest.raises(ValueError):
+        get_recipe(tmp_path, content, session)
+
+
+@pytest.mark.parametrize(
+    'preproc', ['multi_model_statistics', 'ensemble_statistics']
+)
+def test_mm_stats_invalid_stats(
+    preproc, tmp_path, patched_datafinder, session
+):
+    content = dedent(f"""
+        preprocessors:
+          test:
+            {preproc}:
+              span: overlap
+              statistics:
+                - operator_is_missing: here
+                  but_we_need: it
+
+        diagnostics:
+          diagnostic_name:
+            variables:
+              chl_default:
+                short_name: chl
+                mip: Oyr
+                preprocessor: test
+                timerange: '2000/2010'
+                additional_datasets:
+                  - project: CMIP5
+                    dataset: CanESM2
+                    exp: historical
+                    ensemble: r1i1p1
+            scripts: null
+        """)
+    msg = (
+        "`statistic` given as dictionary, but missing required key `operator`"
+    )
+    with pytest.raises(RecipeError) as rec_err_exp:
+        get_recipe(tmp_path, content, session)
+    assert str(rec_err_exp.value) == INITIALIZATION_ERROR_MSG
+    assert msg in str(rec_err_exp.value.failed_tasks[0].message)
+
+
+@pytest.mark.parametrize(
+    'statistics',
+    [
+        {'invalid_value': 1},
+        {'percent': 10, 'invalid_value': 1},
+        {'percent': 10, 'weights': False},
+    ]
+)
+@pytest.mark.parametrize(
+    'preproc', ['multi_model_statistics', 'ensemble_statistics']
+)
+def test_mm_stats_invalid_stat_kwargs(
+    preproc, statistics, tmp_path, patched_datafinder, session
+):
+    statistics['operator'] = 'wpercentile'
+    content = dedent(f"""
+        preprocessors:
+          test:
+            {preproc}:
+              span: overlap
+              statistics: [{statistics}]
+
+        diagnostics:
+          diagnostic_name:
+            variables:
+              chl_default:
+                short_name: chl
+                mip: Oyr
+                preprocessor: test
+                timerange: '2000/2010'
+                additional_datasets:
+                  - project: CMIP5
+                    dataset: CanESM2
+                    exp: historical
+                    ensemble: r1i1p1
+            scripts: null
+        """)
+    msg = (
+        f"Invalid options for {preproc}: Invalid kwargs for operator "
+        f"'wpercentile': "
+    )
+    with pytest.raises(RecipeError) as rec_err_exp:
+        get_recipe(tmp_path, content, session)
+    assert str(rec_err_exp.value) == INITIALIZATION_ERROR_MSG
+    assert msg in str(rec_err_exp.value.failed_tasks[0].message)
+
+
+@pytest.mark.parametrize(
+    'preproc',
+    [
+        'area_statistics',
+        'axis_statistics',
+        'meridional_statistics',
+        'volume_statistics',
+        'zonal_statistics',
+        'rolling_window_statistics',
+    ]
+)
+def test_statistics_missing_operator_no_default_fail(
+    preproc, tmp_path, patched_datafinder, session
+):
+    content = dedent(f"""
+        preprocessors:
+          test:
+            {preproc}:
+
+        diagnostics:
+          diagnostic_name:
+            variables:
+              chl_default:
+                short_name: chl
+                mip: Oyr
+                preprocessor: test
+                timerange: '2000/2010'
+                additional_datasets:
+                  - project: CMIP5
+                    dataset: CanESM2
+                    exp: historical
+                    ensemble: r1i1p1
+            scripts: null
+        """)
+    msg = "Missing required argument"
+    with pytest.raises(ValueError, match=msg):
+        get_recipe(tmp_path, content, session)
+
+
+@pytest.mark.parametrize(
+    'preproc,option',
+    [
+        ('annual_statistics', ''),
+        ('climate_statistics', ''),
+        ('daily_statistics', ''),
+        ('decadal_statistics', ''),
+        ('hourly_statistics', 'hours: 1'),
+        ('monthly_statistics', ''),
+        ('seasonal_statistics', ''),
+    ]
+)
+def test_statistics_missing_operator_with_default(
+    preproc, option, tmp_path, patched_datafinder, session
+):
+    content = dedent(f"""
+        preprocessors:
+          test:
+            {preproc}:
+              {option}
+
+        diagnostics:
+          diagnostic_name:
+            variables:
+              chl_default:
+                short_name: chl
+                mip: Oyr
+                preprocessor: test
+                timerange: '2000/2010'
+                additional_datasets:
+                  - project: CMIP5
+                    dataset: CanESM2
+                    exp: historical
+                    ensemble: r1i1p1
+            scripts: null
+        """)
+    get_recipe(tmp_path, content, session)
+
+
+@pytest.mark.parametrize(
+    'preproc,preproc_kwargs',
+    [
+        ('annual_statistics', {'invalid_value': 1}),
+        ('area_statistics', {'percent': 10, 'invalid_value': 1}),
+        ('axis_statistics', {'percent': 10, 'weights': False}),
+        ('climate_statistics', {'invalid_value': 1}),
+        ('daily_statistics', {'percent': 10, 'invalid_value': 1}),
+        ('decadal_statistics', {'percent': 10, 'weights': False}),
+        ('hourly_statistics', {'invalid_value': 1, 'hours': 2}),
+        ('meridional_statistics', {'percent': 10, 'invalid_value': 1}),
+        ('monthly_statistics', {'percent': 10, 'weights': False}),
+        ('seasonal_statistics', {'invalid_value': 1}),
+        ('volume_statistics', {'percent': 10, 'weights': False}),
+        ('zonal_statistics', {'invalid_value': 1}),
+        ('rolling_window_statistics', {'percent': 10, 'invalid_value': 1}),
+    ]
+)
+def test_statistics_invalid_kwargs(
+    preproc, preproc_kwargs, tmp_path, patched_datafinder, session
+):
+    preproc_kwargs['operator'] = 'wpercentile'
+    content = dedent(f"""
+        preprocessors:
+          test:
+            {preproc}: {preproc_kwargs}
+
+        diagnostics:
+          diagnostic_name:
+            variables:
+              chl_default:
+                short_name: chl
+                mip: Oyr
+                preprocessor: test
+                timerange: '2000/2010'
+                additional_datasets:
+                  - project: CMIP5
+                    dataset: CanESM2
+                    exp: historical
+                    ensemble: r1i1p1
+            scripts: null
+        """)
+    msg = (
+        f"Invalid options for {preproc}: Invalid kwargs for operator "
+        f"'wpercentile': "
+    )
+    with pytest.raises(RecipeError) as rec_err_exp:
+        get_recipe(tmp_path, content, session)
+    assert str(rec_err_exp.value) == INITIALIZATION_ERROR_MSG
+    assert msg in str(rec_err_exp.value.failed_tasks[0].message)
+
+
+def test_hourly_statistics(tmp_path, patched_datafinder, session):
+    content = dedent("""
+        preprocessors:
+          test:
+            hourly_statistics:
+              hours: 10
+              operator: percentile
+              percent: 50
+
+        diagnostics:
+          diagnostic_name:
+            variables:
+              chl_default:
+                short_name: chl
+                mip: Oyr
+                preprocessor: test
+                timerange: '2000/2010'
+                additional_datasets:
+                  - project: CMIP5
+                    dataset: CanESM2
+                    exp: historical
+                    ensemble: r1i1p1
+            scripts: null
+        """)
+    get_recipe(tmp_path, content, session)
+
+
+def test_invalid_stat_preproc(tmp_path, patched_datafinder, session):
+    content = dedent("""
+        preprocessors:
+          test:
+            invalid_statistics:
+              operator: mean
+
+        diagnostics:
+          diagnostic_name:
+            variables:
+              chl_default:
+                short_name: chl
+                mip: Oyr
+                preprocessor: test
+                timerange: '2000/2010'
+                additional_datasets:
+                  - project: CMIP5
+                    dataset: CanESM2
+                    exp: historical
+                    ensemble: r1i1p1
+            scripts: null
+        """)
+    msg = "Unknown preprocessor function"
+    with pytest.raises(ValueError, match=msg):
+        get_recipe(tmp_path, content, session)
diff --git a/tests/integration/test_citation.py b/tests/integration/test_citation.py
index 3f1075d43f..339cd253a0 100644
--- a/tests/integration/test_citation.py
+++ b/tests/integration/test_citation.py
@@ -33,7 +33,7 @@ def test_references(tmp_path, monkeypatch):
 
     _write_citation_files(filename, provenance)
     citation_file = tmp_path / 'output_citation.bibtex'
-    citation = citation_file.read_text()
+    citation = citation_file.read_text(encoding='utf-8')
     assert citation == '\n'.join([ESMVALTOOL_PAPER, fake_bibtex])
 
 
@@ -84,7 +84,7 @@ def test_cmip6_data_citation(tmp_path, monkeypatch):
         \tdoi = {{{doi}}},
         }}
         """).lstrip()
-    assert citation_file.read_text() == '\n'.join(
+    assert citation_file.read_text(encoding='utf-8') == '\n'.join(
         [ESMVALTOOL_PAPER, fake_bibtex_entry])
 
 
@@ -114,4 +114,4 @@ def test_cmip6_data_citation_url(tmp_path):
         f"- {CMIP6_URL_STEM}/cmip6?input={fake_url_prefix}",
         '',
     ])
-    assert citation_url.read_text() == text
+    assert citation_url.read_text(encoding='utf-8') == text
diff --git a/tests/integration/test_deprecated_config.py b/tests/integration/test_deprecated_config.py
index 8bcf246190..8dec085134 100644
--- a/tests/integration/test_deprecated_config.py
+++ b/tests/integration/test_deprecated_config.py
@@ -1,8 +1,6 @@
 import warnings
 from pathlib import Path
 
-import pytest
-
 import esmvalcore
 from esmvalcore.config import CFG, Config
 from esmvalcore.exceptions import ESMValCoreDeprecationWarning
@@ -24,139 +22,3 @@ def test_no_deprecation_user_cfg():
         cfg = Config(CFG.copy())
         cfg.load_from_file(config_file)
         cfg.start_session('my_session')
-
-
-def test_offline_default_cfg():
-    """Test that ``offline`` is added for backwards-compatibility."""
-    assert CFG['search_esgf'] == 'never'
-    assert CFG['offline'] is True
-
-
-def test_offline_user_cfg():
-    """Test that ``offline`` is added for backwards-compatibility."""
-    config_file = Path(esmvalcore.__file__).parent / 'config-user.yml'
-    cfg = Config(CFG.copy())
-    cfg.load_from_file(config_file)
-    assert cfg['search_esgf'] == 'never'
-    assert cfg['offline'] is True
-
-
-def test_offline_default_session():
-    """Test that ``offline`` is added for backwards-compatibility."""
-    session = CFG.start_session('my_session')
-    assert session['search_esgf'] == 'never'
-    assert session['offline'] is True
-
-
-def test_offline_user_session():
-    """Test that ``offline`` is added for backwards-compatibility."""
-    config_file = Path(esmvalcore.__file__).parent / 'config-user.yml'
-    cfg = Config(CFG.copy())
-    cfg.load_from_file(config_file)
-    session = cfg.start_session('my_session')
-    assert session['search_esgf'] == 'never'
-    assert session['offline'] is True
-
-
-def test_offline_deprecation_session_setitem():
-    """Test that the usage of offline is deprecated."""
-    msg = "offline"
-    session = CFG.start_session('my_session')
-    session.pop('search_esgf')  # test automatic addition of search_esgf
-    with pytest.warns(ESMValCoreDeprecationWarning, match=msg):
-        session['offline'] = True
-    assert session['offline'] is True
-    assert session['search_esgf'] == 'never'
-
-
-def test_offline_deprecation_session_update():
-    """Test that the usage of offline is deprecated."""
-    msg = "offline"
-    session = CFG.start_session('my_session')
-    session.pop('search_esgf')  # test automatic addition of search_esgf
-    with pytest.warns(ESMValCoreDeprecationWarning, match=msg):
-        session.update({'offline': False})
-    assert session['offline'] is False
-    assert session['search_esgf'] == 'when_missing'
-
-
-def test_offline_true_deprecation_config(monkeypatch):
-    """Test that the usage of offline is deprecated."""
-    msg = "offline"
-    monkeypatch.delitem(CFG, 'search_esgf')
-    with pytest.warns(ESMValCoreDeprecationWarning, match=msg):
-        monkeypatch.setitem(CFG, 'offline', True)
-    assert CFG['offline'] is True
-    assert CFG['search_esgf'] == 'never'
-
-
-def test_offline_false_deprecation_config(monkeypatch):
-    """Test that the usage of offline is deprecated."""
-    msg = "offline"
-    monkeypatch.delitem(CFG, 'search_esgf')
-    with pytest.warns(ESMValCoreDeprecationWarning, match=msg):
-        monkeypatch.setitem(CFG, 'offline', False)
-    assert CFG['offline'] is False
-    assert CFG['search_esgf'] == 'when_missing'
-
-
-def test_use_legacy_supplementaries_default_cfg():
-    """Test that option is added for backwards-compatibility."""
-    assert CFG['use_legacy_supplementaries'] is None
-
-
-def test_use_legacy_supplementaries_user_cfg():
-    """Test that option is added for backwards-compatibility."""
-    config_file = Path(esmvalcore.__file__).parent / 'config-user.yml'
-    cfg = Config(CFG.copy())
-    cfg.load_from_file(config_file)
-    assert cfg['use_legacy_supplementaries'] is None
-
-
-def test_use_legacy_supplementaries_default_session():
-    """Test that option is added for backwards-compatibility."""
-    session = CFG.start_session('my_session')
-    assert session['use_legacy_supplementaries'] is None
-
-
-def test_use_legacy_supplementaries_user_session():
-    """Test that option is added for backwards-compatibility."""
-    config_file = Path(esmvalcore.__file__).parent / 'config-user.yml'
-    cfg = Config(CFG.copy())
-    cfg.load_from_file(config_file)
-    session = cfg.start_session('my_session')
-    assert session['use_legacy_supplementaries'] is None
-
-
-def test_use_legacy_supplementaries_deprecation_session_setitem():
-    """Test that the usage of use_legacy_supplementaries is deprecated."""
-    msg = "use_legacy_supplementaries"
-    session = CFG.start_session('my_session')
-    with pytest.warns(ESMValCoreDeprecationWarning, match=msg):
-        session['use_legacy_supplementaries'] = True
-    assert session['use_legacy_supplementaries'] is True
-
-
-def test_use_legacy_supplementaries_deprecation_session_update():
-    """Test that the usage of use_legacy_supplementaries is deprecated."""
-    msg = "use_legacy_supplementaries"
-    session = CFG.start_session('my_session')
-    with pytest.warns(ESMValCoreDeprecationWarning, match=msg):
-        session.update({'use_legacy_supplementaries': False})
-    assert session['use_legacy_supplementaries'] is False
-
-
-def test_use_legacy_supplementaries_true_deprecation_config(monkeypatch):
-    """Test that the usage of use_legacy_supplementaries is deprecated."""
-    msg = "use_legacy_supplementaries"
-    with pytest.warns(ESMValCoreDeprecationWarning, match=msg):
-        monkeypatch.setitem(CFG, 'use_legacy_supplementaries', True)
-    assert CFG['use_legacy_supplementaries'] is True
-
-
-def test_use_legacy_supplementaries_false_deprecation_config(monkeypatch):
-    """Test that the usage of use_legacy_supplementaries is deprecated."""
-    msg = "use_legacy_supplementaries"
-    with pytest.warns(ESMValCoreDeprecationWarning, match=msg):
-        monkeypatch.setitem(CFG, 'use_legacy_supplementaries', False)
-    assert CFG['use_legacy_supplementaries'] is False
diff --git a/tests/integration/test_diagnostic_run.py b/tests/integration/test_diagnostic_run.py
index 243d4c6a28..7816508458 100644
--- a/tests/integration/test_diagnostic_run.py
+++ b/tests/integration/test_diagnostic_run.py
@@ -56,7 +56,7 @@ def arguments(*args):
 
 def check(result_file):
     """Check the results."""
-    result = yaml.safe_load(result_file.read_text())
+    result = yaml.safe_load(result_file.read_text(encoding='utf-8'))
 
     required_keys = {
         'input_files',
@@ -80,7 +80,7 @@ def check(result_file):
         import yaml
         import shutil
 
-        with open("settings.yml", 'r') as file:
+        with open("settings.yml", 'r', encoding='utf-8') as file:
             settings = yaml.safe_load(file)
 
         shutil.copy("settings.yml", settings["setting_name"])
diff --git a/tests/integration/test_local.py b/tests/integration/test_local.py
index 02982177a9..811431b336 100644
--- a/tests/integration/test_local.py
+++ b/tests/integration/test_local.py
@@ -10,7 +10,9 @@
 from esmvalcore.local import LocalFile, _get_output_file, find_files
 
 # Load test configuration
-with open(os.path.join(os.path.dirname(__file__), 'data_finder.yml')) as file:
+with open(os.path.join(os.path.dirname(__file__),
+                       'data_finder.yml'),
+          encoding='utf-8') as file:
     CONFIG = yaml.safe_load(file)
 
 
@@ -40,7 +42,7 @@ def create_file(filename):
     if not os.path.exists(dirname):
         os.makedirs(dirname)
 
-    with open(filename, 'a'):
+    with open(filename, 'a', encoding='utf-8'):
         pass
 
 
diff --git a/tests/integration/test_main.py b/tests/integration/test_main.py
index 3ea26c56ed..94d209ffb5 100644
--- a/tests/integration/test_main.py
+++ b/tests/integration/test_main.py
@@ -81,7 +81,7 @@ def test_empty_run(tmp_path):
     Config.get_config_user(path=tmp_path)
     log_dir = f'{tmp_path}/esmvaltool_output'
     config_file = f"{tmp_path}/config-user.yml"
-    with open(config_file, 'r+') as file:
+    with open(config_file, 'r+', encoding='utf-8') as file:
         config = yaml.safe_load(file)
         config['output_dir'] = log_dir
         yaml.safe_dump(config, file, sort_keys=False)
@@ -119,12 +119,6 @@ def test_run_with_max_datasets():
         run()
 
 
-@patch('esmvalcore._main.ESMValTool.run', new=wrapper(ESMValTool.run))
-def test_run_with_offline():
-    with arguments('esmvaltool', 'run', 'recipe.yml', '--offline'):
-        run()
-
-
 @patch('esmvalcore._main.ESMValTool.run', new=wrapper(ESMValTool.run))
 def test_run_with_search_esgf():
     with arguments('esmvaltool', 'run', 'recipe.yml', '--search_esgf=always'):
diff --git a/tests/integration/test_task.py b/tests/integration/test_task.py
index 3c9801f189..7ea9964585 100644
--- a/tests/integration/test_task.py
+++ b/tests/integration/test_task.py
@@ -216,7 +216,7 @@ def _get_single_diagnostic_task(tmp_path, diag_script, write_diag=True):
     diag_run_dir = diag_output_dir / 'run_dir'
     diag_settings = {'run_dir': diag_run_dir, 'profile_diagnostic': False}
     if write_diag:
-        with open(diag_script, "w") as fil:
+        with open(diag_script, "w", encoding='utf-8') as fil:
             fil.write("import os\n\nprint(os.getcwd())")
 
     task = DiagnosticTask(
@@ -273,7 +273,7 @@ def _get_diagnostic_tasks(tmp_path, diagnostic_text, extension):
         'exit_on_ncl_warning': False
     }
 
-    with open(diag_script, "w") as fil:
+    with open(diag_script, "w", encoding='utf-8') as fil:
         fil.write(diagnostic_text)
 
     task = DiagnosticTask(
diff --git a/tests/unit/cmor/test_cmor_check.py b/tests/unit/cmor/test_cmor_check.py
index f3135558a2..957136fd42 100644
--- a/tests/unit/cmor/test_cmor_check.py
+++ b/tests/unit/cmor/test_cmor_check.py
@@ -1,5 +1,6 @@
 """Unit tests for the CMORCheck class."""
 
+import logging
 import unittest
 from copy import deepcopy
 
@@ -10,6 +11,7 @@
 import iris.cube
 import iris.util
 import numpy as np
+import pytest
 from cf_units import Unit
 
 from esmvalcore.cmor.check import (
@@ -18,6 +20,9 @@
     CMORCheckError,
     _get_cmor_checker,
 )
+from esmvalcore.exceptions import ESMValCoreDeprecationWarning
+
+logger = logging.getLogger(__name__)
 
 
 class VariableInfoMock:
@@ -142,33 +147,39 @@ def test_check(self):
         """Test checks succeeds for a good cube."""
         self._check_cube()
 
-    def _check_cube(self, automatic_fixes=False, frequency=None,
+    def _check_cube(self, frequency=None,
                     check_level=CheckLevels.DEFAULT):
-        """Apply checks and optionally automatic fixes to self.cube."""
+        """Apply checks to self.cube."""
         def checker(cube):
             return CMORCheck(
                 cube,
                 self.var_info,
-                automatic_fixes=automatic_fixes,
                 frequency=frequency,
                 check_level=check_level)
 
         self.cube = checker(self.cube).check_metadata()
         self.cube = checker(self.cube).check_data()
 
-    def _check_cube_metadata(self, automatic_fixes=False, frequency=None,
+    def _check_cube_metadata(self, frequency=None,
                              check_level=CheckLevels.DEFAULT):
-        """Apply checks and optionally automatic fixes to self.cube."""
+        """Apply checks to self.cube."""
         def checker(cube):
             return CMORCheck(
                 cube,
                 self.var_info,
-                automatic_fixes=automatic_fixes,
                 frequency=frequency,
                 check_level=check_level)
 
         self.cube = checker(self.cube).check_metadata()
 
+    def test_check_with_custom_logger(self):
+        """Test checks with custom logger."""
+        def checker(cube):
+            return CMORCheck(cube, self.var_info)
+
+        self.cube = checker(self.cube).check_metadata(logger=logger)
+        self.cube = checker(self.cube).check_data(logger=logger)
+
     def test_check_with_month_number(self):
         """Test checks succeeds for a good cube with month number."""
         iris.coord_categorisation.add_month_number(self.cube, 'time')
@@ -189,13 +200,6 @@ def test_check_with_year(self):
         iris.coord_categorisation.add_year(self.cube, 'time')
         self._check_cube()
 
-    def test_check_with_time_attributes(self):
-        """Test checks succeeds for a good cube with year."""
-        self.cube.coord('time').attributes['time_origin'] = "cow"
-        assert self.cube.coord('time').attributes['time_origin'] == "cow"
-        self._check_cube()
-        assert 'time_origin' not in self.cube.coord('time').attributes
-
     def test_check_no_multiple_coords_same_stdname(self):
         """Test checks fails if two coords have the same standard_name."""
         self.cube.add_aux_coord(
@@ -209,43 +213,20 @@ def test_check_no_multiple_coords_same_stdname(self):
         )
         self._check_fails_in_metadata()
 
-    def test_check_bad_standard_name_auto_fix(self):
-        """Test check pass for a bad standard_name with automatic fixes."""
-        self.cube.standard_name = 'wind_speed'
-        self._check_cube(automatic_fixes=True)
-        self._check_cube()
-
     def test_check_bad_standard_name(self):
         """Test check fails for a bad short_name."""
         self.cube.standard_name = 'wind_speed'
-        self._check_fails_in_metadata(automatic_fixes=False)
-
-    def test_check_bad_long_name_auto_fix(self):
-        """Test check pass for a bad standard_name with automatic fixes."""
-        self.cube.long_name = 'bad_name'
-        self._check_cube(automatic_fixes=True)
-        self._check_cube()
-
-    def test_check_bad_long_name_auto_fix_report_warning(self):
-        """Test check pass for a bad standard_name with automatic fixes."""
-        self.cube.long_name = 'bad_name'
-        self._check_warnings_on_metadata(automatic_fixes=True)
+        self._check_fails_in_metadata()
 
     def test_check_bad_long_name(self):
         """Test check fails for a bad short_name."""
         self.cube.long_name = 'bad_name'
         self._check_fails_in_metadata()
 
-    def test_check_with_unit_conversion(self):
-        """Test check succeeds for a good cube requiring unit conversion."""
+    def test_check_bad_units(self):
+        """Test check fails for bad units."""
         self.cube.units = 'days'
-        self._check_cube()
-
-    def test_check_with_psu_units(self):
-        """Test check succeeds for a good cube with psu units."""
-        self.var_info.units = 'psu'
-        self.cube = self.get_cube(self.var_info)
-        self._check_cube(automatic_fixes=True)
+        self._check_fails_in_metadata()
 
     def test_check_with_positive(self):
         """Check variable with positive attribute."""
@@ -288,25 +269,6 @@ def test_rank_unstructured_grid(self):
         self.cube = self._get_unstructed_grid_cube()
         self._check_cube()
 
-    def test_unstructured_grid_automatic_fixes(self):
-        """Check succeeds even if two required coordinates share dimensions."""
-        self.cube = self._get_unstructed_grid_cube(correct_lon=False,
-                                                   n_bounds=3)
-
-        lon_coord = self.cube.coord('longitude')
-        np.testing.assert_allclose(lon_coord.points.min(), -180.0)
-        np.testing.assert_allclose(lon_coord.points.max(), 162.0)
-        np.testing.assert_allclose(lon_coord.bounds.min(), -180.0)
-        np.testing.assert_allclose(lon_coord.bounds.max(), 171.0)
-
-        self._check_cube(automatic_fixes=True)
-
-        lon_coord = self.cube.coord('longitude')
-        np.testing.assert_allclose(lon_coord.points.min(), 0.0)
-        np.testing.assert_allclose(lon_coord.points.max(), 342.0)
-        np.testing.assert_allclose(lon_coord.bounds.min(), 0.0)
-        np.testing.assert_allclose(lon_coord.bounds.max(), 351.0)
-
     def test_bad_generic_level(self):
         """Test check fails in metadata if generic level coord
         has wrong var_name."""
@@ -328,6 +290,14 @@ def test_valid_generic_level(self):
         checker.check_metadata()
         checker.check_data()
 
+    # TODO: remove in v2.12
+    def test_valid_generic_level_automatic_fixes(self):
+        """Test valid generic level coordinate with automatic fixes."""
+        self._setup_generic_level_var()
+        checker = CMORCheck(self.cube, self.var_info, automatic_fixes=True)
+        checker.check_metadata()
+        checker.check_data()
+
     def test_invalid_generic_level(self):
         """Test invalid generic level coordinate."""
         self._setup_generic_level_var()
@@ -376,19 +346,19 @@ def test_check_bad_var_standard_name_strict_flag(self):
         """Test check fails for a bad variable standard_name with
         --cmor-check strict."""
         self.cube.standard_name = 'wind_speed'
-        self._check_fails_in_metadata(automatic_fixes=False)
+        self._check_fails_in_metadata()
 
     def test_check_bad_var_long_name_strict_flag(self):
         """Test check fails for a bad variable long_name with
         --cmor-check strict."""
         self.cube.long_name = "Near-Surface Wind Speed"
-        self._check_fails_in_metadata(automatic_fixes=False)
+        self._check_fails_in_metadata()
 
     def test_check_bad_var_units_strict_flag(self):
         """Test check fails for a bad variable units with
         --cmor-check strict."""
         self.cube.units = "kg"
-        self._check_fails_in_metadata(automatic_fixes=False)
+        self._check_fails_in_metadata()
 
     def test_check_bad_attributes_strict_flag(self):
         """Test check fails for a bad variable attribute with
@@ -397,7 +367,7 @@ def test_check_bad_attributes_strict_flag(self):
         self.var_info.positive = "up"
         self.cube = self.get_cube(self.var_info)
         self.cube.attributes['positive'] = "Wrong attribute"
-        self._check_fails_in_metadata(automatic_fixes=False)
+        self._check_fails_in_metadata()
 
     def test_check_bad_rank_strict_flag(self):
         """Test check fails for a bad variable rank with
@@ -405,32 +375,32 @@ def test_check_bad_rank_strict_flag(self):
         lat = iris.coords.AuxCoord.from_coord(self.cube.coord('latitude'))
         self.cube.remove_coord('latitude')
         self.cube.add_aux_coord(lat, self.cube.coord_dims('longitude'))
-        self._check_fails_in_metadata(automatic_fixes=False)
+        self._check_fails_in_metadata()
 
     def test_check_bad_coord_var_name_strict_flag(self):
         """Test check fails for bad coord var_name with
         --cmor-check strict"""
         self.var_info.table_type = 'CMIP5'
         self.cube.coord('longitude').var_name = 'bad_name'
-        self._check_fails_in_metadata(automatic_fixes=False)
+        self._check_fails_in_metadata()
 
     def test_check_missing_lon_strict_flag(self):
         """Test check fails for missing longitude with --cmor-check strict"""
         self.var_info.table_type = 'CMIP5'
         self.cube.remove_coord('longitude')
-        self._check_fails_in_metadata(automatic_fixes=False)
+        self._check_fails_in_metadata()
 
     def test_check_missing_lat_strict_flag(self):
         """Test check fails for missing latitude with --cmor-check strict"""
         self.var_info.table_type = 'CMIP5'
         self.cube.remove_coord('latitude')
-        self._check_fails_in_metadata(automatic_fixes=False)
+        self._check_fails_in_metadata()
 
     def test_check_missing_time_strict_flag(self):
         """Test check fails for missing time with --cmor-check strict"""
         self.var_info.table_type = 'CMIP5'
         self.cube.remove_coord('time')
-        self._check_fails_in_metadata(automatic_fixes=False)
+        self._check_fails_in_metadata()
 
     def test_check_missing_coord_strict_flag(self):
         """Test check fails for missing coord other than lat and lon
@@ -438,28 +408,25 @@ def test_check_missing_coord_strict_flag(self):
         self.var_info.coordinates.update(
             {'height2m': CoordinateInfoMock('height2m')}
         )
-        self._check_fails_in_metadata(automatic_fixes=False)
+        self._check_fails_in_metadata()
 
     def test_check_bad_var_standard_name_relaxed_flag(self):
         """Test check reports warning for a bad variable standard_name with
         --cmor-check relaxed."""
         self.cube.standard_name = 'wind_speed'
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.RELAXED)
+        self._check_warnings_on_metadata(check_level=CheckLevels.RELAXED)
 
     def test_check_bad_var_long_name_relaxed_flag(self):
         """Test check reports warning for a bad variable long_name with
         --cmor-check relaxed."""
         self.cube.long_name = "Near-Surface Wind Speed"
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.RELAXED)
+        self._check_warnings_on_metadata(check_level=CheckLevels.RELAXED)
 
     def test_check_bad_var_units_relaxed_flag(self):
         """Test check reports warning for a bad variable units with
         --cmor-check relaxed."""
         self.cube.units = "kg"
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.RELAXED)
+        self._check_warnings_on_metadata(check_level=CheckLevels.RELAXED)
 
     def test_check_bad_attributes_relaxed_flag(self):
         """Test check report warnings for a bad variable attribute with
@@ -468,8 +435,7 @@ def test_check_bad_attributes_relaxed_flag(self):
         self.var_info.positive = "up"
         self.cube = self.get_cube(self.var_info)
         self.cube.attributes['positive'] = "Wrong attribute"
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.RELAXED)
+        self._check_warnings_on_metadata(check_level=CheckLevels.RELAXED)
 
     def test_check_bad_rank_relaxed_flag(self):
         """Test check report warnings for a bad variable rank with
@@ -477,37 +443,32 @@ def test_check_bad_rank_relaxed_flag(self):
         lat = iris.coords.AuxCoord.from_coord(self.cube.coord('latitude'))
         self.cube.remove_coord('latitude')
         self.cube.add_aux_coord(lat, self.cube.coord_dims('longitude'))
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.RELAXED)
+        self._check_warnings_on_metadata(check_level=CheckLevels.RELAXED)
 
     def test_check_bad_coord_standard_name_relaxed_flag(self):
         """Test check reports warning for bad coord var_name with
         --cmor-check relaxed"""
         self.var_info.table_type = 'CMIP5'
         self.cube.coord('longitude').var_name = 'bad_name'
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.RELAXED)
+        self._check_warnings_on_metadata(check_level=CheckLevels.RELAXED)
 
     def test_check_missing_lon_relaxed_flag(self):
         """Test check fails for missing longitude with --cmor-check relaxed"""
         self.var_info.table_type = 'CMIP5'
         self.cube.remove_coord('longitude')
-        self._check_fails_in_metadata(automatic_fixes=False,
-                                      check_level=CheckLevels.RELAXED)
+        self._check_fails_in_metadata(check_level=CheckLevels.RELAXED)
 
     def test_check_missing_lat_relaxed_flag(self):
         """Test check fails for missing latitude with --cmor-check relaxed"""
         self.var_info.table_type = 'CMIP5'
         self.cube.remove_coord('latitude')
-        self._check_fails_in_metadata(automatic_fixes=False,
-                                      check_level=CheckLevels.RELAXED)
+        self._check_fails_in_metadata(check_level=CheckLevels.RELAXED)
 
     def test_check_missing_time_relaxed_flag(self):
         """Test check fails for missing latitude with --cmor-check relaxed"""
         self.var_info.table_type = 'CMIP5'
         self.cube.remove_coord('time')
-        self._check_fails_in_metadata(automatic_fixes=False,
-                                      check_level=CheckLevels.RELAXED)
+        self._check_fails_in_metadata(check_level=CheckLevels.RELAXED)
 
     def test_check_missing_coord_relaxed_flag(self):
         """Test check reports warning for missing coord other than lat and lon
@@ -515,29 +476,25 @@ def test_check_missing_coord_relaxed_flag(self):
         self.var_info.coordinates.update(
             {'height2m': CoordinateInfoMock('height2m')}
         )
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.RELAXED)
+        self._check_warnings_on_metadata(check_level=CheckLevels.RELAXED)
 
     def test_check_bad_var_standard_name_none_flag(self):
         """Test check reports warning for a bad variable standard_name with
         --cmor-check ignore."""
         self.cube.standard_name = 'wind_speed'
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.IGNORE)
+        self._check_warnings_on_metadata(check_level=CheckLevels.IGNORE)
 
     def test_check_bad_var_long_name_none_flag(self):
         """Test check reports warning for a bad variable long_name with
         --cmor-check ignore."""
         self.cube.long_name = "Near-Surface Wind Speed"
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.IGNORE)
+        self._check_warnings_on_metadata(check_level=CheckLevels.IGNORE)
 
     def test_check_bad_var_units_none_flag(self):
         """Test check reports warning for a bad variable unit with
         --cmor-check ignore."""
         self.cube.units = "kg"
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.IGNORE)
+        self._check_warnings_on_metadata(check_level=CheckLevels.IGNORE)
 
     def test_check_bad_attributes_none_flag(self):
         """Test check reports warning for a bad variable attribute with
@@ -546,8 +503,7 @@ def test_check_bad_attributes_none_flag(self):
         self.var_info.positive = "up"
         self.cube = self.get_cube(self.var_info)
         self.cube.attributes['positive'] = "Wrong attribute"
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.IGNORE)
+        self._check_warnings_on_metadata(check_level=CheckLevels.IGNORE)
 
     def test_check_bad_rank_none_flag(self):
         """Test check reports warning for a bad variable rank with
@@ -555,40 +511,35 @@ def test_check_bad_rank_none_flag(self):
         lat = iris.coords.AuxCoord.from_coord(self.cube.coord('latitude'))
         self.cube.remove_coord('latitude')
         self.cube.add_aux_coord(lat, self.cube.coord_dims('longitude'))
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.IGNORE)
+        self._check_warnings_on_metadata(check_level=CheckLevels.IGNORE)
 
     def test_check_bad_coord_standard_name_none_flag(self):
         """Test check reports warning for bad coord var_name with
         --cmor-check ignore."""
         self.var_info.table_type = 'CMIP5'
         self.cube.coord('longitude').var_name = 'bad_name'
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.IGNORE)
+        self._check_warnings_on_metadata(check_level=CheckLevels.IGNORE)
 
     def test_check_missing_lon_none_flag(self):
         """Test check reports warning for missing longitude with
         --cmor-check ignore"""
         self.var_info.table_type = 'CMIP5'
         self.cube.remove_coord('longitude')
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.IGNORE)
+        self._check_warnings_on_metadata(check_level=CheckLevels.IGNORE)
 
     def test_check_missing_lat_none_flag(self):
         """Test check reports warning for missing latitude with
         --cmor-check ignore"""
         self.var_info.table_type = 'CMIP5'
         self.cube.remove_coord('latitude')
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.IGNORE)
+        self._check_warnings_on_metadata(check_level=CheckLevels.IGNORE)
 
     def test_check_missing_time_none_flag(self):
         """Test check reports warning for missing time
         with --cmor-check ignore"""
         self.var_info.table_type = 'CMIP5'
         self.cube.remove_coord('time')
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.IGNORE)
+        self._check_warnings_on_metadata(check_level=CheckLevels.IGNORE)
 
     def test_check_missing_coord_none_flag(self):
         """Test check reports warning for missing coord other than lat, lon and
@@ -596,8 +547,7 @@ def test_check_missing_coord_none_flag(self):
         self.var_info.coordinates.update(
             {'height2m': CoordinateInfoMock('height2m')}
         )
-        self._check_warnings_on_metadata(automatic_fixes=False,
-                                         check_level=CheckLevels.IGNORE)
+        self._check_warnings_on_metadata(check_level=CheckLevels.IGNORE)
 
     def test_check_lazy(self):
         """Test checker does not realise data or aux_coords."""
@@ -627,29 +577,28 @@ def test_check_lazy(self):
         self.assertTrue(self.cube.coord('longitude').has_lazy_points())
         self.assertTrue(self.cube.has_lazy_data())
 
-    def _check_fails_in_metadata(self, automatic_fixes=False, frequency=None,
+    def _check_fails_in_metadata(self, frequency=None,
                                  check_level=CheckLevels.DEFAULT):
         checker = CMORCheck(
             self.cube,
             self.var_info,
-            automatic_fixes=automatic_fixes,
             frequency=frequency,
-            check_level=check_level)
+            check_level=check_level,
+        )
         with self.assertRaises(CMORCheckError):
             checker.check_metadata()
 
-    def _check_warnings_on_metadata(self, automatic_fixes=False,
-                                    check_level=CheckLevels.DEFAULT):
+    def _check_warnings_on_metadata(self, check_level=CheckLevels.DEFAULT):
         checker = CMORCheck(
-            self.cube, self.var_info, automatic_fixes=automatic_fixes,
-            check_level=check_level
+            self.cube, self.var_info, check_level=check_level
         )
         checker.check_metadata()
         self.assertTrue(checker.has_warnings())
 
-    def _check_debug_messages_on_metadata(self, automatic_fixes=False):
+    def _check_debug_messages_on_metadata(self):
         checker = CMORCheck(
-            self.cube, self.var_info, automatic_fixes=automatic_fixes)
+            self.cube, self.var_info,
+        )
         checker.check_metadata()
         self.assertTrue(checker.has_debug_messages())
 
@@ -667,20 +616,6 @@ def test_non_requested(self):
         checker.check_metadata()
         self.assertTrue(checker.has_warnings())
 
-    def test_almost_requested(self):
-        """Automatically fix tiny deviations from the requested values."""
-        coord = self.cube.coord('air_pressure')
-        values = np.array(coord.points)
-        values[0] += 1.e-7
-        values[-1] += 1.e-7
-        self._update_coordinate_values(self.cube, coord, values)
-        checker = CMORCheck(self.cube, self.var_info, automatic_fixes=True)
-        checker.check_metadata()
-        reference = np.array(
-            self.var_info.coordinates['air_pressure'].requested, dtype=float)
-        np.testing.assert_array_equal(
-            self.cube.coord('air_pressure').points, reference)
-
     def test_requested_str_values(self):
         """
         Warning if requested values are not present.
@@ -728,65 +663,40 @@ def test_non_increasing(self):
         self._update_coordinate_values(self.cube, coord, values)
         self._check_fails_in_metadata()
 
-    def test_non_increasing_fix(self):
-        """Check automatic fix for direction."""
-        coord = self.cube.coord('latitude')
-        values = np.linspace(
-            coord.points[-1],
-            coord.points[0],
-            len(coord.points)
-        )
-        self._update_coordinate_values(self.cube, coord, values)
-        self._check_cube(automatic_fixes=True)
-        self._check_cube()
-        # test bounds are contiguous
-        bounds = self.cube.coord('latitude').bounds
-        right_bounds = bounds[:-2, 1]
-        left_bounds = bounds[1:-1, 0]
-        self.assertTrue(np.all(left_bounds == right_bounds))
-
     def test_non_decreasing(self):
         """Fail in metadata if decreasing coordinate is increasing."""
         self.var_info.coordinates['lat'].stored_direction = 'decreasing'
         self._check_fails_in_metadata()
 
-    def test_non_decreasing_fix(self):
-        """Check automatic fix for non decreasing coordinate."""
-        self.cube.data[0, 0, 0, 0, 0] = 70
+    # TODO: remove in v2.12
+    def test_non_decreasing_automatic_fix_metadata(self):
+        """Automatic fix for decreasing coordinate."""
         self.var_info.coordinates['lat'].stored_direction = 'decreasing'
-        self._check_cube(automatic_fixes=True)
-        self._check_cube()
-        index = [0, 0, 0, 0, 0]
-        index[self.cube.coord_dims('latitude')[0]] = -1
-        self.assertEqual(self.cube.data.item(tuple(index)), 70)
-        self.assertEqual(self.cube.data[0, 0, 0, 0, 0], 50)
-        cube_points = self.cube.coord('latitude').points
-        reference = np.linspace(90, -90, 20, endpoint=True)
-        for index in range(20):
-            np.testing.assert_allclose(cube_points[index], reference[index])
-        # test bounds are contiguous
-        bounds = self.cube.coord('latitude').bounds
-        right_bounds = bounds[:-2, 1]
-        left_bounds = bounds[1:-1, 0]
-        self.assertTrue(np.all(left_bounds == right_bounds))
+        checker = CMORCheck(self.cube, self.var_info, automatic_fixes=True)
+        checker.check_metadata()
 
-    def test_not_bounds(self):
-        """Warning if bounds are not available."""
-        self.cube.coord('longitude').bounds = None
-        self._check_warnings_on_metadata(automatic_fixes=False)
-        self.assertFalse(self.cube.coord('longitude').has_bounds())
+    # TODO: remove in v2.12
+    def test_non_decreasing_automatic_fix_data(self):
+        """Automatic fix for decreasing coordinate."""
+        self.var_info.coordinates['lat'].stored_direction = 'decreasing'
+        checker = CMORCheck(self.cube, self.var_info, automatic_fixes=True)
+        checker.check_data()
 
-    def test_guess_bounds_with_fixes(self):
-        """Warning if bounds added with automatic fixes."""
-        self.cube.coord('longitude').bounds = None
-        self._check_warnings_on_metadata(automatic_fixes=True)
-        self.assertTrue(self.cube.coord('longitude').has_bounds())
+    def test_lat_non_monotonic(self):
+        """Test fail for non monotonic latitude."""
+        lat = self.cube.coord('latitude')
+        points = np.array(lat.points)
+        points[-1] = points[0]
+        dims = self.cube.coord_dims(lat)
+        self.cube.remove_coord(lat)
+        lat = iris.coords.AuxCoord.from_coord(lat)
+        self.cube.add_aux_coord(lat.copy(points), dims)
+        self._check_fails_in_metadata()
 
-    def test_not_guess_bounds_with_fixes(self):
-        """Warning if bounds added with automatic fixes."""
+    def test_not_bounds(self):
+        """Warning if bounds are not available."""
         self.cube.coord('longitude').bounds = None
-        self.var_info.coordinates['lon'].must_have_bounds = "no"
-        self._check_cube(automatic_fixes=True)
+        self._check_warnings_on_metadata()
         self.assertFalse(self.cube.coord('longitude').has_bounds())
 
     def test_not_correct_lons(self):
@@ -794,34 +704,15 @@ def test_not_correct_lons(self):
         self.cube = self.cube.intersection(longitude=(-180., 180.))
         self._check_fails_in_metadata()
 
-    def test_lons_automatic_fix(self):
-        """Test automatic fixes for bad longitudes."""
-        self.cube = self.cube.intersection(longitude=(-180., 180.))
-        self._check_cube(automatic_fixes=True)
-
-    def test_lons_automatic_fix_with_bounds(self):
-        """Test automatic fixes for bad longitudes with added bounds."""
-        self.cube.coord('longitude').bounds = None
-        self.cube = self.cube.intersection(longitude=(-180., 180.))
-        self._check_cube(automatic_fixes=True)
-        self.assertTrue(self.cube.coord('longitude').points.min() >= 0.)
-        self.assertTrue(self.cube.coord('longitude').points.max() <= 360.)
-        self.assertTrue(self.cube.coord('longitude').has_bounds())
-
-    def test_high_lons_automatic_fix(self):
-        """Test automatic fixes for high longitudes."""
-        self.cube = self.cube.intersection(longitude=(180., 520.))
-        self._check_cube(automatic_fixes=True)
-
-    def test_too_high_lons_automatic_fix_not_done(self):
-        """Test automatic fixes for bad longitudes."""
+    def test_high_lons(self):
+        """Test bad longitudes."""
         self.cube = self.cube.intersection(longitude=(720., 1080.))
-        self._check_fails_in_metadata(automatic_fixes=True)
+        self._check_fails_in_metadata()
 
-    def test_too_low_lons_automatic_fix_not_done(self):
-        """Test automatic fixes for bad longitudes."""
+    def test_low_lons(self):
+        """Test bad longitudes."""
         self.cube = self.cube.intersection(longitude=(-720., -360.))
-        self._check_fails_in_metadata(automatic_fixes=True)
+        self._check_fails_in_metadata()
 
     def test_not_valid_min(self):
         """Fail if coordinate values below valid_min."""
@@ -862,49 +753,16 @@ def test_bad_units(self):
         self.cube.coord('latitude').units = 'degrees_n'
         self._check_fails_in_metadata()
 
-    def test_units_automatic_fix(self):
-        """Test automatic fix for bad coordinate units."""
-        self.cube.coord('latitude').units = 'degrees_n'
-        self._check_cube(automatic_fixes=True)
-
-    def test_units_automatic_fix_failed(self):
-        """Test automatic fix fail for incompatible coordinate units."""
+    def test_non_convertible_units(self):
+        """Test fail for incompatible coordinate units."""
         self.cube.coord('latitude').units = 'degC'
-        self._check_fails_in_metadata(automatic_fixes=True)
+        self._check_fails_in_metadata()
 
     def test_bad_time(self):
         """Fail if time have bad units."""
         self.cube.coord('time').units = 'days'
         self._check_fails_in_metadata()
 
-    def test_time_units_automatic_fix(self):
-        """Test automatic fix for time units."""
-        self.cube.coord('time').units = 'days since 1860-1-1 00:00:00'
-        self.cube.attributes['parent_time_units'] = 'days since ' \
-                                                    '1850-1-1 00:00:00'
-        self.cube.attributes['branch_time_in_parent'] = 0.
-        self.cube.attributes['branch_time_in_child'] = 0.
-        self._check_cube()
-        assert (self.cube.coord('time').units.origin ==
-                'days since 1850-1-1 00:00:00')
-        assert self.cube.attributes['parent_time_units'] == 'days since ' \
-                                                            '1850-1-1 00:00:00'
-        assert self.cube.attributes['branch_time_in_parent'] == 0.
-        assert self.cube.attributes['branch_time_in_child'] == 3652.
-
-    def test_time_units_no_parent_exp(self):
-        """Test non-conversion of time units attributes for no parent exps."""
-        self.cube.coord('time').units = 'days since 1860-1-1 00:00:00'
-        self.cube.attributes['parent_time_units'] = 'no parent'
-        self.cube.attributes['branch_time_in_parent'] = 0.
-        self.cube.attributes['branch_time_in_child'] = 0.
-        self._check_cube()
-        assert (self.cube.coord('time').units.origin ==
-                'days since 1850-1-1 00:00:00')
-        assert self.cube.attributes['parent_time_units'] == 'no parent'
-        assert self.cube.attributes['branch_time_in_parent'] == 0.
-        assert self.cube.attributes['branch_time_in_child'] == 0.
-
     def test_wrong_parent_time_unit(self):
         """Test fail for wrong parent time units."""
         self.cube.coord('time').units = 'days since 1860-1-1 00:00:00'
@@ -916,13 +774,13 @@ def test_wrong_parent_time_unit(self):
         assert self.cube.attributes['branch_time_in_parent'] == 0.
         assert self.cube.attributes['branch_time_in_child'] == 0
 
-    def test_time_automatic_fix_failed(self):
-        """Test automatic fix fail for incompatible time units."""
+    def test_time_non_time_units(self):
+        """Test fail for incompatible time units."""
         self.cube.coord('time').units = 'K'
-        self._check_fails_in_metadata(automatic_fixes=True)
+        self._check_fails_in_metadata()
 
     def test_time_non_monotonic(self):
-        """Test automatic fix fail for non monotonic times."""
+        """Test fail for non monotonic times."""
         time = self.cube.coord('time')
         points = np.array(time.points)
         points[-1] = points[0]
@@ -930,61 +788,13 @@ def test_time_non_monotonic(self):
         self.cube.remove_coord(time)
         time = iris.coords.AuxCoord.from_coord(time)
         self.cube.add_aux_coord(time.copy(points), dims)
-        self._check_fails_in_metadata(automatic_fixes=True)
+        self._check_fails_in_metadata()
 
     def test_bad_standard_name(self):
         """Fail if coordinates have bad standard names at metadata step."""
         self.cube.coord('time').standard_name = 'region'
         self._check_fails_in_metadata()
 
-    def test_bad_out_name_multidim_latitude(self):
-        """Warning if multidimensional lat has bad var_name at metadata"""
-        self.var_info.table_type = 'CMIP6'
-        self.cube.remove_coord('latitude')
-        self.cube.add_aux_coord(
-            iris.coords.AuxCoord(
-                np.reshape(np.linspace(-90, 90, num=20*20), (20, 20)),
-                var_name='bad_name',
-                standard_name='latitude',
-                units='degrees_north'
-            ),
-            (1, 2)
-        )
-        self._check_debug_messages_on_metadata()
-
-    def test_bad_out_name_multidim_longitude(self):
-        """Warning if multidimensional lon has bad var_name at metadata"""
-        self.var_info.table_type = 'CMIP6'
-        self.cube.remove_coord('longitude')
-        self.cube.add_aux_coord(
-            iris.coords.AuxCoord(
-                np.reshape(np.linspace(-90, 90, num=20*20), (20, 20)),
-                var_name='bad_name',
-                standard_name='longitude',
-                units='degrees_east'
-            ),
-            (1, 2)
-        )
-        self._check_debug_messages_on_metadata(automatic_fixes=True)
-
-    def test_bad_bounds_in_multidim_longitude(self):
-        """Warning if multidimensional lon has bad var_name at metadata"""
-        self.var_info.table_type = 'CMIP6'
-        self.cube.remove_coord('longitude')
-        lons = np.reshape(np.linspace(180, 540, num=20*20), (20, 20))
-        bounds = np.stack([lons.copy() - 0.5, lons.copy() + 0.5], -1)
-        self.cube.add_aux_coord(
-            iris.coords.AuxCoord(
-                lons,
-                var_name='bad_name',
-                standard_name='longitude',
-                units='degrees_east',
-                bounds=bounds,
-            ),
-            (1, 2)
-        )
-        self._check_debug_messages_on_metadata(automatic_fixes=True)
-
     def test_bad_out_name_region_area_type(self):
         """Debug message if region/area_type AuxCoord has bad var_name at
         metadata."""
@@ -1086,49 +896,20 @@ def test_frequency_not_supported(self):
         """Fail at metadata if frequency is not supported."""
         self._check_fails_in_metadata(frequency='wrong_freq')
 
-    def test_time_bounds(self):
-        """Test time bounds are guessed for all frequencies"""
-        freqs = ['hr', '3hr', '6hr', 'day', 'mon', 'yr', 'dec']
-        guessed = []
-        for freq in freqs:
-            cube = self.get_cube(self.var_info, frequency=freq)
-            cube.coord('time').bounds = None
-            self.cube = cube
-            self._check_cube(automatic_fixes=True, frequency=freq)
-            if cube.coord('time').bounds is not None:
-                guessed.append(True)
-        assert len(guessed) == len(freqs)
-
-    def test_no_time_bounds(self):
-        """Test time bounds are not guessed for instantaneous data"""
-        self.var_info.coordinates['time'].must_have_bounds = 'no'
-        self.var_info.coordinates['time1'] = (
-            self.var_info.coordinates.pop('time'))
-        self.cube.coord('time').bounds = None
-        self._check_cube(automatic_fixes=True)
-        guessed_bounds = self.cube.coord('time').bounds
-        assert guessed_bounds is None
-
     def test_hr_mip_cordex(self):
         """Test hourly CORDEX tables are found."""
         checker = _get_cmor_checker('CORDEX', '3hr', 'tas', '3hr')
         assert checker(self.cube)._cmor_var.short_name == 'tas'
         assert checker(self.cube)._cmor_var.frequency == '3hr'
 
-    def test_set_range_in_0_360(self):
-        checker = _get_cmor_checker('CMIP5', 'Amon', 'tas', 'mon')
-        arr_in = np.array([[-120.0, 0.0, 20.0], [-1.0, 360.0, 400.0]])
-        arr_exp = np.array([[240.0, 0.0, 20.0], [359.0, 0.0, 40.0]])
-        arr_out = checker(self.cube)._set_range_in_0_360(arr_in)
-        np.testing.assert_allclose(arr_out, arr_exp)
-
-    def test_set_range_in_0_360_lazy(self):
-        checker = _get_cmor_checker('CMIP5', 'Amon', 'tas', 'mon')
-        arr_in = da.from_array([[-120.0, 0.0, 20.0], [-1.0, 360.0, 400.0]])
-        arr_exp = da.from_array([[240.0, 0.0, 20.0], [359.0, 0.0, 40.0]])
-        arr_out = checker(self.cube)._set_range_in_0_360(arr_in)
-        self.assertTrue(isinstance(arr_out, da.core.Array))
-        np.testing.assert_allclose(arr_out.compute(), arr_exp.compute())
+    def test_custom_variable(self):
+        checker = _get_cmor_checker('OBS', 'Amon', 'uajet', 'mon')
+        assert checker(self.cube)._cmor_var.short_name == 'uajet'
+        assert checker(self.cube)._cmor_var.long_name == (
+            'Jet position expressed as latitude of maximum meridional wind '
+            'speed'
+        )
+        assert checker(self.cube)._cmor_var.units == 'degrees'
 
     def _check_fails_on_data(self):
         checker = CMORCheck(self.cube, self.var_info)
@@ -1210,7 +991,7 @@ def get_cube(self,
 
         return cube
 
-    def _get_unstructed_grid_cube(self, correct_lon=True, n_bounds=2):
+    def _get_unstructed_grid_cube(self, n_bounds=2):
         """Get cube with unstructured grid."""
         assert n_bounds in (2, 3), "Only 2 or 3 bounds per cell supported"
 
@@ -1256,23 +1037,6 @@ def _get_unstructed_grid_cube(self, correct_lon=True, n_bounds=2):
                 ))
                 coord.bounds = np.swapaxes(new_bounds, 0, 1)
 
-        # Convert longitude to [-180, 180] to check automatic fixes if desired
-        if correct_lon:
-            return cube
-        new_lon = iris.coords.AuxCoord(
-            points=cube.coord('longitude').points,
-            bounds=cube.coord('longitude').bounds,
-            var_name='lon',
-            standard_name='longitude',
-            long_name='Longitude',
-            units='degrees_east',
-        )
-        new_lon.points = np.where(new_lon.points < 180.0, new_lon.points,
-                                  new_lon.points - 360.0)
-        new_lon.bounds = np.where(new_lon.bounds < 180.0, new_lon.bounds,
-                                  new_lon.bounds - 360.0)
-        cube.remove_coord('longitude')
-        cube.add_aux_coord(new_lon, 1)
         return cube
 
     def _setup_generic_level_var(self):
@@ -1450,5 +1214,17 @@ def _get_time_values(dim_spec):
         return np.arange(start, end, step=delta)
 
 
+def test_get_cmor_checker_invalid_project_fail():
+    """Test ``_get_cmor_checker`` with invalid project."""
+    with pytest.raises(KeyError):
+        _get_cmor_checker('INVALID_PROJECT', 'mip', 'short_name', 'frequency')
+
+
+def test_deprecate_automatic_fixes():
+    """Test deprecation of automatic_fixes."""
+    with pytest.warns(ESMValCoreDeprecationWarning):
+        CMORCheck('cube', 'var_info', 'frequency', automatic_fixes=True)
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/unit/cmor/test_fix.py b/tests/unit/cmor/test_fix.py
index 86293e2aaa..d6a06b2c11 100644
--- a/tests/unit/cmor/test_fix.py
+++ b/tests/unit/cmor/test_fix.py
@@ -1,16 +1,17 @@
 """Unit tests for :mod:`esmvalcore.cmor.fix`."""
 
 from pathlib import Path
-from unittest import TestCase
 from unittest.mock import Mock, patch, sentinel
 
-from esmvalcore.cmor.check import CheckLevels
+import pytest
+
 from esmvalcore.cmor.fix import Fix, fix_data, fix_file, fix_metadata
 
 
-class TestFixFile(TestCase):
+class TestFixFile():
     """Fix file tests."""
 
+    @pytest.fixture(autouse=True)
     def setUp(self):
         """Prepare for testing."""
         self.filename = 'filename'
@@ -26,8 +27,10 @@ def setUp(self):
                 'dataset': 'model',
                 'mip': 'mip',
                 'short_name': 'short_name',
+                'frequency': 'frequency',
             },
             'session': sentinel.session,
+            'frequency': 'frequency',
         }
 
     def test_fix(self):
@@ -42,9 +45,10 @@ def test_fix(self):
                 mip='mip',
                 output_dir=Path('output_dir'),
                 session=sentinel.session,
+                frequency='frequency',
             )
-            self.assertNotEqual(file_returned, self.filename)
-            self.assertEqual(file_returned, 'new_filename')
+            assert file_returned != self.filename
+            assert file_returned == 'new_filename'
             mock_get_fixes.assert_called_once_with(
                 **self.expected_get_fixes_call
             )
@@ -61,16 +65,18 @@ def test_nofix(self):
                 mip='mip',
                 output_dir=Path('output_dir'),
                 session=sentinel.session,
+                frequency='frequency',
             )
-            self.assertEqual(file_returned, self.filename)
+            assert file_returned == self.filename
             mock_get_fixes.assert_called_once_with(
                 **self.expected_get_fixes_call
             )
 
 
-class TestGetCube(TestCase):
+class TestGetCube():
     """Test get cube by var_name method."""
 
+    @pytest.fixture(autouse=True)
     def setUp(self):
         """Prepare for testing."""
         self.cube_1 = Mock()
@@ -84,28 +90,27 @@ def setUp(self):
 
     def test_get_first_cube(self):
         """Test selecting first cube."""
-        self.assertIs(self.cube_1,
-                      self.fix.get_cube_from_list(self.cubes, "cube1"))
+        assert self.cube_1 is self.fix.get_cube_from_list(self.cubes, "cube1")
 
     def test_get_second_cube(self):
         """Test selecting second cube."""
-        self.assertIs(self.cube_2,
-                      self.fix.get_cube_from_list(self.cubes, "cube2"))
+        assert self.cube_2 is self.fix.get_cube_from_list(self.cubes, "cube2")
 
     def test_get_default_raises(self):
         """Check that the default raises (Fix is not a cube)."""
-        with self.assertRaises(Exception):
+        with pytest.raises(Exception):
             self.fix.get_cube_from_list(self.cubes)
 
     def test_get_default(self):
         """Check that the default return the cube (fix is a cube)."""
         self.cube_1.var_name = 'fix'
-        self.assertIs(self.cube_1, self.fix.get_cube_from_list(self.cubes))
+        assert self.cube_1 is self.fix.get_cube_from_list(self.cubes)
 
 
-class TestFixMetadata(TestCase):
+class TestFixMetadata():
     """Fix metadata tests."""
 
+    @pytest.fixture(autouse=True)
     def setUp(self):
         """Prepare for testing."""
         self.cube = self._create_mock_cube()
@@ -125,9 +130,10 @@ def setUp(self):
                 'dataset': 'model',
                 'mip': 'mip',
                 'short_name': 'short_name',
-                'frequency': None,
+                'frequency': 'frequency',
             },
             'session': sentinel.session,
+            'frequency': 'frequency',
         }
 
     @staticmethod
@@ -150,9 +156,12 @@ def test_fix(self):
                     project='project',
                     dataset='model',
                     mip='mip',
+                    frequency='frequency',
                     session=sentinel.session,
                 )[0]
-                self.checker.assert_called_once_with(self.intermediate_cube)
+                self.checker.assert_called_once_with(
+                    self.intermediate_cube
+                )
                 self.check_metadata.assert_called_once_with()
                 assert cube_returned is not self.cube
                 assert cube_returned is not self.intermediate_cube
@@ -174,6 +183,7 @@ def test_nofix(self):
                     project='project',
                     dataset='model',
                     mip='mip',
+                    frequency='frequency',
                     session=sentinel.session,
                 )[0]
                 self.checker.assert_called_once_with(self.cube)
@@ -193,8 +203,7 @@ def test_select_var(self):
             with patch('esmvalcore.cmor.fix._get_cmor_checker',
                        return_value=self.checker):
                 cube_returned = fix_metadata(
-                    cubes=[self.cube,
-                           self._create_mock_cube('extra')],
+                    cubes=[self.cube, self._create_mock_cube('extra')],
                     short_name='short_name',
                     project='CMIP6',
                     dataset='model',
@@ -205,52 +214,25 @@ def test_select_var(self):
                 assert cube_returned is self.cube
 
     def test_select_var_failed_if_bad_var_name(self):
-        """Check that the same cube is returned if no fix is available."""
-        with patch('esmvalcore.cmor._fixes.fix.Fix.get_fixes',
-                   return_value=[]):
-            with self.assertRaises(ValueError):
-                fix_metadata(
-                    cubes=[
-                        self._create_mock_cube('not_me'),
-                        self._create_mock_cube('me_neither')
-                    ],
-                    short_name='short_name',
-                    project='CMIP6',
-                    dataset='model',
-                    mip='mip',
-                )
-
-    def test_cmor_checker_called(self):
-        """Check that the cmor check is done."""
-        checker = Mock()
-        checker.return_value = Mock()
-        with patch('esmvalcore.cmor._fixes.fix.Fix.get_fixes',
-                   return_value=[]):
-            with patch('esmvalcore.cmor.fix._get_cmor_checker',
-                       return_value=checker) as get_mock:
-                fix_metadata(
-                    cubes=[self.cube],
-                    short_name='short_name',
-                    project='CMIP6',
-                    dataset='dataset',
-                    mip='mip',
-                    frequency='frequency',
-                )
-                get_mock.assert_called_once_with(
-                    automatic_fixes=True,
-                    fail_on_error=False,
-                    frequency='frequency',
-                    mip='mip',
-                    short_name='short_name',
-                    table='CMIP6',
-                    check_level=CheckLevels.DEFAULT,)
-                checker.assert_called_once_with(self.cube)
-                checker.return_value.check_metadata.assert_called_once_with()
+        """Check that an error is raised if short_names do not match."""
+        msg = "More than one cube found for variable tas in CMIP6:model"
+        with pytest.raises(ValueError, match=msg):
+            fix_metadata(
+                cubes=[
+                    self._create_mock_cube('not_me'),
+                    self._create_mock_cube('me_neither')
+                ],
+                short_name='tas',
+                project='CMIP6',
+                dataset='model',
+                mip='Amon',
+            )
 
 
-class TestFixData(TestCase):
+class TestFixData():
     """Fix data tests."""
 
+    @pytest.fixture(autouse=True)
     def setUp(self):
         """Prepare for testing."""
         self.cube = Mock()
@@ -270,9 +252,10 @@ def setUp(self):
                 'dataset': 'model',
                 'mip': 'mip',
                 'short_name': 'short_name',
-                'frequency': None,
+                'frequency': 'frequency',
             },
             'session': sentinel.session,
+            'frequency': 'frequency',
         }
 
     def test_fix(self):
@@ -288,9 +271,12 @@ def test_fix(self):
                     project='project',
                     dataset='model',
                     mip='mip',
+                    frequency='frequency',
                     session=sentinel.session,
                 )
-                self.checker.assert_called_once_with(self.intermediate_cube)
+                self.checker.assert_called_once_with(
+                    self.intermediate_cube
+                )
                 self.check_data.assert_called_once_with()
                 assert cube_returned is not self.cube
                 assert cube_returned is not self.intermediate_cube
@@ -312,6 +298,7 @@ def test_nofix(self):
                     project='project',
                     dataset='model',
                     mip='mip',
+                    frequency='frequency',
                     session=sentinel.session,
                 )
                 self.checker.assert_called_once_with(self.cube)
@@ -322,25 +309,3 @@ def test_nofix(self):
                 mock_get_fixes.assert_called_once_with(
                     **self.expected_get_fixes_call
                 )
-
-    def test_cmor_checker_called(self):
-        """Check that the cmor check is done."""
-        checker = Mock()
-        checker.return_value = Mock()
-        with patch('esmvalcore.cmor._fixes.fix.Fix.get_fixes',
-                   return_value=[]):
-            with patch('esmvalcore.cmor.fix._get_cmor_checker',
-                       return_value=checker) as get_mock:
-                fix_data(self.cube, 'short_name', 'CMIP6', 'model', 'mip',
-                         'frequency')
-                get_mock.assert_called_once_with(
-                    table='CMIP6',
-                    automatic_fixes=True,
-                    check_level=CheckLevels.DEFAULT,
-                    fail_on_error=False,
-                    frequency='frequency',
-                    mip='mip',
-                    short_name='short_name',
-                )
-                checker.assert_called_once_with(self.cube)
-                checker.return_value.check_data.assert_called_once_with()
diff --git a/tests/unit/cmor/test_fixes.py b/tests/unit/cmor/test_fixes.py
index 24e4acde52..c1a87e1bc1 100644
--- a/tests/unit/cmor/test_fixes.py
+++ b/tests/unit/cmor/test_fixes.py
@@ -8,6 +8,8 @@
 @pytest.mark.parametrize('func', [
     'add_altitude_from_plev',
     'add_plev_from_altitude',
+    'get_next_month',
+    'get_time_bounds',
 ])
 def test_imports(func):
     assert func in fixes.__all__
diff --git a/tests/unit/cmor/test_generic_fix.py b/tests/unit/cmor/test_generic_fix.py
new file mode 100644
index 0000000000..4294fe0752
--- /dev/null
+++ b/tests/unit/cmor/test_generic_fix.py
@@ -0,0 +1,200 @@
+"""Unit tests for generic fixes."""
+
+from unittest.mock import sentinel
+
+import pytest
+from iris.coords import AuxCoord
+from iris.cube import Cube, CubeList
+
+from esmvalcore.cmor._fixes.fix import GenericFix
+from esmvalcore.cmor.table import get_var_info
+
+
+@pytest.fixture
+def generic_fix():
+    """Generic fix object."""
+    vardef = get_var_info('CMIP6', 'CFmon', 'ta')
+    extra_facets = {'short_name': 'ta', 'project': 'CMIP6', 'dataset': 'MODEL'}
+    return GenericFix(vardef, extra_facets=extra_facets)
+
+
+def test_generic_fix_empty_long_name(generic_fix, monkeypatch):
+    """Test ``GenericFix``."""
+    # Artificially set long_name to empty string for test
+    monkeypatch.setattr(generic_fix.vardef, 'long_name', '')
+
+    cube = generic_fix._fix_long_name(sentinel.cube)
+
+    assert cube == sentinel.cube
+
+
+def test_generic_fix_empty_units(generic_fix, monkeypatch):
+    """Test ``GenericFix``."""
+    # Artificially set latitude units to empty string for test
+    coord_info = generic_fix.vardef.coordinates['latitude']
+    monkeypatch.setattr(coord_info, 'units', '')
+
+    ret = generic_fix._fix_coord_units(
+        sentinel.cube, coord_info, sentinel.cube_coord
+    )
+
+    assert ret is None
+
+
+def test_generic_fix_no_generic_lev_coords(generic_fix, monkeypatch):
+    """Test ``GenericFix``."""
+    # Artificially remove generic_lev_coords
+    monkeypatch.setattr(
+        generic_fix.vardef.coordinates['alevel'], 'generic_lev_coords', {}
+    )
+
+    cube = generic_fix._fix_alternative_generic_level_coords(sentinel.cube)
+
+    assert cube == sentinel.cube
+
+
+def test_requested_levels_2d_coord(generic_fix, mocker):
+    """Test ``GenericFix``."""
+    cube_coord = AuxCoord([[0]], standard_name='latitude', units='rad')
+    cmor_coord = mocker.Mock(requested=True)
+
+    ret = generic_fix._fix_requested_coord_values(
+        sentinel.cube, cmor_coord, cube_coord
+    )
+
+    assert ret is None
+
+
+def test_requested_levels_invalid_arr(generic_fix, mocker):
+    """Test ``GenericFix``."""
+    cube_coord = AuxCoord([0], standard_name='latitude', units='rad')
+    cmor_coord = mocker.Mock(requested=['a', 'b'])
+
+    ret = generic_fix._fix_requested_coord_values(
+        sentinel.cube, cmor_coord, cube_coord
+    )
+
+    assert ret is None
+
+
+def test_lon_no_fix_needed(generic_fix):
+    """Test ``GenericFix``."""
+    cube_coord = AuxCoord(
+        [0.0, 180.0, 360.0], standard_name='longitude', units='rad'
+    )
+
+    ret = generic_fix._fix_longitude_0_360(
+        sentinel.cube, sentinel.cmor_coord, cube_coord
+    )
+
+    assert ret == (sentinel.cube, cube_coord)
+
+
+def test_lon_too_low_to_fix(generic_fix):
+    """Test ``GenericFix``."""
+    cube_coord = AuxCoord(
+        [-370.0, 0.0], standard_name='longitude', units='rad'
+    )
+
+    ret = generic_fix._fix_longitude_0_360(
+        sentinel.cube, sentinel.cmor_coord, cube_coord
+    )
+
+    assert ret == (sentinel.cube, cube_coord)
+
+
+def test_lon_too_high_to_fix(generic_fix):
+    """Test ``GenericFix``."""
+    cube_coord = AuxCoord([750.0, 0.0], standard_name='longitude', units='rad')
+
+    ret = generic_fix._fix_longitude_0_360(
+        sentinel.cube, sentinel.cmor_coord, cube_coord
+    )
+
+    assert ret == (sentinel.cube, cube_coord)
+
+
+def test_fix_direction_2d_coord(generic_fix):
+    """Test ``GenericFix``."""
+    cube_coord = AuxCoord([[0]], standard_name='latitude', units='rad')
+
+    ret = generic_fix._fix_coord_direction(
+        sentinel.cube, sentinel.cmor_coord, cube_coord
+    )
+
+    assert ret == (sentinel.cube, cube_coord)
+
+
+def test_fix_direction_string_coord(generic_fix):
+    """Test ``GenericFix``."""
+    cube_coord = AuxCoord(['a'], standard_name='latitude', units='rad')
+
+    ret = generic_fix._fix_coord_direction(
+        sentinel.cube, sentinel.cmor_coord, cube_coord
+    )
+
+    assert ret == (sentinel.cube, cube_coord)
+
+
+def test_fix_direction_no_stored_direction(generic_fix, mocker):
+    """Test ``GenericFix``."""
+    cube = Cube(0)
+    cube_coord = AuxCoord([0, 1], standard_name='latitude', units='rad')
+    cmor_coord = mocker.Mock(stored_direction='')
+
+    ret = generic_fix._fix_coord_direction(cube, cmor_coord, cube_coord)
+
+    assert ret == (cube, cube_coord)
+
+
+def test_fix_metadata_not_fail_with_empty_cube(generic_fix):
+    """Generic fixes should not fail with empty cubes."""
+    fixed_cubes = generic_fix.fix_metadata([Cube(0)])
+
+    assert isinstance(fixed_cubes, CubeList)
+    assert len(fixed_cubes) == 1
+    assert fixed_cubes[0] == Cube(
+        0, standard_name='air_temperature', long_name='Air Temperature'
+    )
+
+
+@pytest.mark.parametrize(
+    'extra_facets', [{}, {'project': 'P', 'dataset': 'D'}]
+)
+def test_fix_metadata_multiple_cubes_fail(extra_facets):
+    """Generic fixes should fail when multiple invalid cubes are given."""
+    vardef = get_var_info('CMIP6', 'Amon', 'ta')
+    fix = GenericFix(vardef, extra_facets=extra_facets)
+    with pytest.raises(ValueError):
+        fix.fix_metadata([Cube(0), Cube(0)])
+
+
+def test_fix_metadata_no_extra_facets():
+    """Generic fixes should not fail when no extra facets are given."""
+    vardef = get_var_info('CMIP6', 'Amon', 'ta')
+    fix = GenericFix(vardef)
+    fixed_cubes = fix.fix_metadata([Cube(0)])
+
+    assert isinstance(fixed_cubes, CubeList)
+    assert len(fixed_cubes) == 1
+    assert fixed_cubes[0] == Cube(
+        0, standard_name='air_temperature', long_name='Air Temperature'
+    )
+
+
+def test_fix_data_not_fail_with_empty_cube(generic_fix):
+    """Generic fixes should not fail with empty cubes."""
+    fixed_cube = generic_fix.fix_data(Cube(0))
+
+    assert isinstance(fixed_cube, Cube)
+    assert fixed_cube == Cube(0)
+
+
+def test_fix_data_no_extra_facets():
+    """Generic fixes should not fail when no extra facets are given."""
+    vardef = get_var_info('CMIP6', 'Amon', 'ta')
+    fix = GenericFix(vardef)
+    fixed_cube = fix.fix_data(Cube(0))
+
+    assert isinstance(fixed_cube, Cube)
+    assert fixed_cube == Cube(0)
diff --git a/tests/unit/cmor/test_utils.py b/tests/unit/cmor/test_utils.py
new file mode 100644
index 0000000000..f373524a7d
--- /dev/null
+++ b/tests/unit/cmor/test_utils.py
@@ -0,0 +1,60 @@
+"""Unit tests for :mod:`esmvalcore.cmor._utils`."""
+
+import pytest
+from iris.cube import Cube
+
+from esmvalcore.cmor._utils import _get_single_cube
+
+
+@pytest.mark.parametrize(
+    'cubes', [[Cube(0)], [Cube(0, var_name='x')], [Cube(0, var_name='y')]]
+)
+def test_get_single_cube_one_cube(cubes, caplog):
+    """Test ``_get_single_cube``."""
+    single_cube = _get_single_cube(cubes, 'x')
+    assert single_cube == cubes[0]
+    assert not caplog.records
+
+
+@pytest.mark.parametrize(
+    'dataset_str,msg', [
+        (None, "Found variable x, but"),
+        ('XYZ', "Found variable x in XYZ, but"),
+    ]
+)
+@pytest.mark.parametrize(
+    'cubes', [
+        [Cube(0), Cube(0, var_name='x')],
+        [Cube(0, var_name='x'), Cube(0)],
+        [Cube(0, var_name='x'), Cube(0, var_name='x')],
+        [Cube(0), Cube(0), Cube(0, var_name='x')],
+    ]
+)
+def test_get_single_cube_multiple_cubes(cubes, dataset_str, msg, caplog):
+    """Test ``_get_single_cube``."""
+    single_cube = _get_single_cube(cubes, 'x', dataset_str=dataset_str)
+    assert single_cube == Cube(0, var_name='x')
+    assert len(caplog.records) == 1
+    log = caplog.records[0]
+    assert log.levelname == 'WARNING'
+    assert msg in log.message
+
+
+@pytest.mark.parametrize(
+    'dataset_str,msg', [
+        (None, "More than one cube found for variable x but"),
+        ('XYZ', "More than one cube found for variable x in XYZ but"),
+    ]
+)
+@pytest.mark.parametrize(
+    'cubes', [
+        [Cube(0), Cube(0)],
+        [Cube(0, var_name='y'), Cube(0)],
+        [Cube(0, var_name='y'), Cube(0, var_name='z')],
+        [Cube(0), Cube(0), Cube(0, var_name='z')],
+    ]
+)
+def test_get_single_cube_no_cubes_fail(cubes, dataset_str, msg):
+    """Test ``_get_single_cube``."""
+    with pytest.raises(ValueError, match=msg):
+        _get_single_cube(cubes, 'x', dataset_str=dataset_str)
diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
index 79b9b33149..6372a1c041 100644
--- a/tests/unit/config/test_config.py
+++ b/tests/unit/config/test_config.py
@@ -237,7 +237,7 @@ def test_project_obs4mips_case_correction(tmp_path, monkeypatch, mocker):
     cfg_dev = {
         'obs4mips': project_cfg,
     }
-    with cfg_file.open('w') as file:
+    with cfg_file.open('w', encoding='utf-8') as file:
         yaml.safe_dump(cfg_dev, file)
 
     _config.load_config_developer(cfg_file)
@@ -251,7 +251,7 @@ def test_load_config_developer_custom(tmp_path, monkeypatch, mocker):
     mocker.patch.object(_config, 'read_cmor_tables', autospec=True)
     cfg_file = tmp_path / 'config-developer.yml'
     cfg_dev = {'custom': {'cmor_path': '/path/to/tables'}}
-    with cfg_file.open('w') as file:
+    with cfg_file.open('w', encoding='utf-8') as file:
         yaml.safe_dump(cfg_dev, file)
 
     _config.load_config_developer(cfg_file)
diff --git a/tests/unit/config/test_esgf_pyclient.py b/tests/unit/config/test_esgf_pyclient.py
index 6de2f664b0..2c1a028f7b 100644
--- a/tests/unit/config/test_esgf_pyclient.py
+++ b/tests/unit/config/test_esgf_pyclient.py
@@ -92,7 +92,7 @@ def test_read_config_file(monkeypatch, tmp_path):
             'interactive': True
         },
     }
-    with cfg_file.open('w') as file:
+    with cfg_file.open('w', encoding='utf-8') as file:
         yaml.safe_dump(reference, file)
 
     cfg = _esgf_pyclient.read_config_file()
@@ -113,7 +113,7 @@ def test_read_v25_config_file(monkeypatch, tmp_path):
             'url': 'https://some.host/path'
         },
     }
-    with cfg_file.open('w') as file:
+    with cfg_file.open('w', encoding='utf-8') as file:
         yaml.safe_dump(cfg_file_content, file)
 
     reference = {
diff --git a/tests/unit/documentation/test_changelog.py b/tests/unit/documentation/test_changelog.py
index 8a00202e46..3ca052c311 100644
--- a/tests/unit/documentation/test_changelog.py
+++ b/tests/unit/documentation/test_changelog.py
@@ -7,7 +7,7 @@
 def test_duplications_in_changelog():
     changelog_path = os.path.join(os.path.dirname(__file__), '../../..',
                                   'doc/changelog.rst')
-    with open(changelog_path) as changelog:
+    with open(changelog_path, 'r', encoding='utf-8') as changelog:
         changelog = changelog.read()
 
     # Find all pull requests
diff --git a/tests/unit/esgf/test_download.py b/tests/unit/esgf/test_download.py
index fd2d50d0f2..3b0030694d 100644
--- a/tests/unit/esgf/test_download.py
+++ b/tests/unit/esgf/test_download.py
@@ -25,7 +25,7 @@ def test_log_speed(monkeypatch, tmp_path):
                         200 * megabyte, 16)
     _download.log_speed('http://otherhost.org/other_file.nc', 4 * megabyte, 1)
 
-    with hosts_file.open('r') as file:
+    with hosts_file.open('r', encoding='utf-8') as file:
         result = yaml.safe_load(file)
 
     expected = {
@@ -53,7 +53,7 @@ def test_error(monkeypatch, tmp_path):
     _download.log_speed('http://somehost.org/some_file.nc', 3 * megabyte, 2)
     _download.log_error('http://somehost.org/some_file.nc')
 
-    with hosts_file.open('r') as file:
+    with hosts_file.open('r', encoding='utf-8') as file:
         result = yaml.safe_load(file)
 
     expected = {
diff --git a/tests/unit/experimental/test_recipe_output.py b/tests/unit/experimental/test_recipe_output.py
index 2c612130a2..756cfaad7f 100644
--- a/tests/unit/experimental/test_recipe_output.py
+++ b/tests/unit/experimental/test_recipe_output.py
@@ -28,3 +28,55 @@ def test_diagnostic_output_repr(mocker):
     assert repr(diagnostic) == text
     for task in tasks:
         task.__str__.assert_called_once()
+
+
+def test_recipe_output_add_to_filters():
+    """Coverage test for `RecipeOutput._add_to_filters`."""
+
+    filters = {}
+    valid_attr = recipe_output.RecipeOutput.FILTER_ATTRS[0]
+
+    recipe_output.RecipeOutput._add_to_filters(filters,
+                                               {valid_attr: "single value"})
+    recipe_output.RecipeOutput._add_to_filters(
+        filters, {valid_attr: ["list value 1", "repeated list value"]})
+    recipe_output.RecipeOutput._add_to_filters(
+        filters, {valid_attr: ["list value 2", "repeated list value"]})
+
+    assert len(filters) == 1
+    assert valid_attr in filters
+    assert len(filters[valid_attr]) == 4
+    assert "single value" in filters[valid_attr]
+    assert "list value 1" in filters[valid_attr]
+    assert "list value 2" in filters[valid_attr]
+    assert "repeated list value" in filters[valid_attr]
+
+
+def test_recipe_output_add_to_filters_no_attributes():
+    """Test `RecipeOutput._add_to_filters` with no attributes."""
+
+    filters = {}
+    recipe_output.RecipeOutput._add_to_filters(filters, {})
+    assert len(filters) == 0
+
+
+def test_recipe_output_add_to_filters_no_valid_attributes():
+    """Test `RecipeOutput._add_to_filters` with no valid attributes."""
+
+    filters = {}
+    invalid = "invalid_attribute"
+    recipe_output.RecipeOutput._add_to_filters(filters, {invalid: "value"})
+    assert (invalid not in recipe_output.RecipeOutput.FILTER_ATTRS
+            and len(filters) == 0)
+
+
+def test_recipe_output_sort_filters():
+    """Coverage test for `RecipeOutput._sort_filters`."""
+
+    filters = {}
+    valid_attr = recipe_output.RecipeOutput.FILTER_ATTRS[0]
+    unsorted_attributes = ["1", "2", "4", "value", "3"]
+    recipe_output.RecipeOutput._add_to_filters(
+        filters, {valid_attr: unsorted_attributes})
+    filters = recipe_output.RecipeOutput._sort_filters(filters)
+    assert filters[valid_attr] == sorted(unsorted_attributes)
diff --git a/tests/unit/local/test_facets.py b/tests/unit/local/test_facets.py
index 1f7f3c35af..a2d1044072 100644
--- a/tests/unit/local/test_facets.py
+++ b/tests/unit/local/test_facets.py
@@ -1,18 +1,42 @@
 from pathlib import Path
 
-from esmvalcore.local import LocalFile, _path2facets
-
+import pytest
 
-def test_path2facets():
-    """Test `_path2facets1."""
-    filepath = Path("/climate_data/value1/value2/filename.nc")
-    drs = "{facet1}/{facet2.lower}"
+from esmvalcore.local import LocalFile, _path2facets
 
-    expected = {
-        'facet1': 'value1',
-        'facet2': 'value2',
-    }
 
+@pytest.mark.parametrize(
+    'path,drs,expected',
+    [
+        (
+            '/climate_data/value1/value2/filename.nc',
+            '{facet1}/{facet2.lower}',
+            {
+                'facet1': 'value1',
+                'facet2': 'value2',
+            },
+        ),
+        (
+            '/climate_data/value1/value1-value2/filename.nc',
+            '{facet1}/{facet1}-{facet2}',
+            {
+                'facet1': 'value1',
+                'facet2': 'value2',
+            },
+        ),
+        (
+            '/climate_data/value-1/value-1-value-2/filename.nc',
+            '{facet1}/{facet1}-{facet2}',
+            {
+                'facet1': 'value-1',
+                'facet2': 'value-2',
+            },
+        )
+    ],
+)
+def test_path2facets(path, drs, expected):
+    """Test `_path2facets."""
+    filepath = Path(path)
     result = _path2facets(filepath, drs)
 
     assert result == expected
diff --git a/tests/unit/local/test_get_rootpath.py b/tests/unit/local/test_get_rootpath.py
new file mode 100644
index 0000000000..e300db1999
--- /dev/null
+++ b/tests/unit/local/test_get_rootpath.py
@@ -0,0 +1,28 @@
+"""Tests for ``_get_rootpath`` in ``esmvalcore.local``."""
+from unittest import mock
+
+import pytest
+
+from esmvalcore import local
+
+
+@mock.patch("os.path.exists")
+def test_get_rootpath_exists(mexists):
+    mexists.return_value = True
+    cfg = {"rootpath": {"CMIP5": ["/path1"], "CMIP6": ["/path2"]}}
+    project = "CMIP5"
+    with mock.patch.dict(local.CFG, cfg):
+        output = local._get_rootpath(project)
+    # 'output' is a list containing a PosixPath:
+    assert str(output[0]) == cfg["rootpath"][project][0]
+
+
+@mock.patch("os.path.exists")
+def test_get_rootpath_does_not_exist(mexists):
+    mexists.return_value = False
+    cfg = {"rootpath": {"CMIP5": ["path1"], "CMIP6": ["path2"]}}
+    project = "OBS"
+    with mock.patch.dict(local.CFG, cfg):
+        msg = rf"The \"{project}\" option is missing.*"
+        with pytest.raises(KeyError, match=msg):
+            local._get_rootpath(project)
diff --git a/tests/unit/local/test_time.py b/tests/unit/local/test_time.py
index 57dd8252c7..a01f1b4d05 100644
--- a/tests/unit/local/test_time.py
+++ b/tests/unit/local/test_time.py
@@ -1,7 +1,11 @@
 """Unit tests for time related functions in `esmvalcore.local`."""
+from pathlib import Path
+
 import iris
+import pyesgf
 import pytest
 
+from esmvalcore.esgf import ESGFFile
 from esmvalcore.local import (
     LocalFile,
     _dates_to_timerange,
@@ -11,6 +15,22 @@
     _truncate_dates,
 )
 
+
+def _get_esgf_file(path):
+    """Get ESGFFile object."""
+    result = pyesgf.search.results.FileResult(
+        json={
+            'dataset_id': 'CMIP6.ABC.v1|something.org',
+            'dataset_id_template_': ["%(mip_era)s.%(source_id)s"],
+            'project': ['CMIP6'],
+            'size': 10,
+            'title': path,
+        },
+        context=None,
+    )
+    return ESGFFile([result])
+
+
 FILENAME_CASES = [
     ['var_whatever_1980-1981', 1980, 1981],
     ['var_whatever_1980.nc', 1980, 1980],
@@ -31,7 +51,13 @@
         2015, 2015
     ],
     ['pr_A1.186101-200012.nc', 1861, 2000],
-    ['tas_A1.20C3M_1.CCSM.atmm.1990-01_cat_1999-12.nc', None, None],
+    ['tas_A1.20C3M_1.CCSM.atmm.1990-01_cat_1999-12.nc', 1990, 1999],
+    ['E5sf00_1M_1940_032.grb', 1940, 1940],
+    ['E5sf00_1D_1998-04_167.grb', 1998, 1998],
+    ['E5sf00_1H_1986-04-11_167.grb', 1986, 1986],
+    ['E5sf00_1M_1940-1941_032.grb', 1940, 1941],
+    ['E5sf00_1D_1998-01_1999-12_167.grb', 1998, 1999],
+    ['E5sf00_1H_2000-01-01_2001-12-31_167.grb', 2000, 2001],
 ]
 
 FILENAME_DATE_CASES = [
@@ -57,7 +83,13 @@
         '20150101T000000Z', '20150101T000000Z'
     ],
     ['pr_A1.186101-200012.nc', '186101', '200012'],
-    ['tas_A1.20C3M_1.CCSM.atmm.1990-01_cat_1999-12.nc', None, None],
+    ['tas_A1.20C3M_1.CCSM.atmm.1990-01_cat_1999-12.nc', '199001', '199912'],
+    ['E5sf00_1M_1940_032.grb', '1940', '1940'],
+    ['E5sf00_1D_1998-04_167.grb', '199804', '199804'],
+    ['E5sf00_1H_1986-04-11_167.grb', '19860411', '19860411'],
+    ['E5sf00_1M_1940-1941_032.grb', '1940', '1941'],
+    ['E5sf00_1D_1998-01_1999-12_167.grb', '199801', '199912'],
+    ['E5sf00_1H_2000-01-01_2001-12-31_167.grb', '20000101', '20011231'],
 ]
 
 
@@ -65,38 +97,68 @@
 def test_get_start_end_year(case):
     """Tests for _get_start_end_year function."""
     filename, case_start, case_end = case
-    filename = LocalFile(filename)
+
+    # If the filename is inconclusive or too difficult we resort to reading the
+    # file, which fails here because the file is not there.
     if case_start is None and case_end is None:
-        # If the filename is inconclusive or too difficult
-        # we resort to reading the file, which fails here
-        # because the file is not there.
         with pytest.raises(ValueError):
             _get_start_end_year(filename)
+        with pytest.raises(ValueError):
+            _get_start_end_year(Path(filename))
+        with pytest.raises(ValueError):
+            _get_start_end_year(LocalFile(filename))
+        with pytest.raises(ValueError):
+            _get_start_end_year(_get_esgf_file(filename))
+
     else:
         start, end = _get_start_end_year(filename)
         assert case_start == start
         assert case_end == end
+        start, end = _get_start_end_year(Path(filename))
+        assert case_start == start
+        assert case_end == end
+        start, end = _get_start_end_year(LocalFile(filename))
+        assert case_start == start
+        assert case_end == end
+        start, end = _get_start_end_year(_get_esgf_file(filename))
+        assert case_start == start
+        assert case_end == end
 
 
 @pytest.mark.parametrize('case', FILENAME_DATE_CASES)
 def test_get_start_end_date(case):
     """Tests for _get_start_end_date function."""
     filename, case_start, case_end = case
-    filename = LocalFile(filename)
+
+    # If the filename is inconclusive or too difficult we resort to reading the
+    # file, which fails here because the file is not there.
     if case_start is None and case_end is None:
-        # If the filename is inconclusive or too difficult
-        # we resort to reading the file, which fails here
-        # because the file is not there.
         with pytest.raises(ValueError):
             _get_start_end_date(filename)
+        with pytest.raises(ValueError):
+            _get_start_end_date(Path(filename))
+        with pytest.raises(ValueError):
+            _get_start_end_date(LocalFile(filename))
+        with pytest.raises(ValueError):
+            _get_start_end_date(_get_esgf_file(filename))
+
     else:
         start, end = _get_start_end_date(filename)
         assert case_start == start
         assert case_end == end
+        start, end = _get_start_end_date(Path(filename))
+        assert case_start == start
+        assert case_end == end
+        start, end = _get_start_end_date(LocalFile(filename))
+        assert case_start == start
+        assert case_end == end
+        start, end = _get_start_end_date(_get_esgf_file(filename))
+        assert case_start == start
+        assert case_end == end
 
 
-def test_read_time_from_cube(monkeypatch, tmp_path):
-    """Try to get time from cube if no date in filename."""
+def test_read_years_from_cube(monkeypatch, tmp_path):
+    """Try to get years from cube if no date in filename."""
     monkeypatch.chdir(tmp_path)
     temp_file = LocalFile('test.nc')
     cube = iris.cube.Cube([0, 0], var_name='var')
@@ -111,7 +173,7 @@ def test_read_time_from_cube(monkeypatch, tmp_path):
 
 
 def test_read_datetime_from_cube(monkeypatch, tmp_path):
-    """Try to get time from cube if no date in filename."""
+    """Try to get datetime from cube if no date in filename."""
     monkeypatch.chdir(tmp_path)
     temp_file = 'test.nc'
     cube = iris.cube.Cube([0, 0], var_name='var')
@@ -133,12 +195,15 @@ def test_raises_if_unable_to_deduce(monkeypatch, tmp_path):
     iris.save(cube, temp_file)
     with pytest.raises(ValueError):
         _get_start_end_date(temp_file)
+    with pytest.raises(ValueError):
+        _get_start_end_year(temp_file)
 
 
 def test_fails_if_no_date_present():
     """Test raises if no date is present."""
-    with pytest.raises((ValueError, OSError)):
+    with pytest.raises((ValueError)):
         _get_start_end_date('var_whatever')
+    with pytest.raises((ValueError)):
         _get_start_end_year('var_whatever')
 
 
diff --git a/tests/unit/preprocessor/_area/test_area.py b/tests/unit/preprocessor/_area/test_area.py
index cabaadf396..a74ac8ba06 100644
--- a/tests/unit/preprocessor/_area/test_area.py
+++ b/tests/unit/preprocessor/_area/test_area.py
@@ -8,6 +8,7 @@
 import pytest
 from cf_units import Unit
 from iris.cube import Cube
+from iris.exceptions import CoordinateMultiDimError
 from iris.fileformats.pp import EARTH_RADIUS
 from numpy.testing._private.utils import assert_raises
 from shapely.geometry import Polygon, mapping
@@ -22,16 +23,23 @@
     extract_named_regions,
     extract_region,
     extract_shape,
+    meridional_statistics,
+    zonal_statistics,
 )
 from esmvalcore.preprocessor._shared import guess_bounds
 
 
 class Test(tests.Test):
-    """Test class for the :func:`esmvalcore.preprocessor._area_pp` module."""
+    """Test class for the :func:`esmvalcore.preprocessor._area` module."""
     def setUp(self):
         """Prepare tests."""
         self.coord_sys = iris.coord_systems.GeogCS(EARTH_RADIUS)
-        data = np.ones((5, 5), dtype=np.float32)
+        data = np.ones((2, 5, 5), dtype=np.float32)
+        times = iris.coords.DimCoord(
+            [0, 1],
+            standard_name='time',
+            units='days since 2000-01-01',
+        )
         lons = iris.coords.DimCoord(
             [i + .5 for i in range(5)],
             standard_name='longitude',
@@ -45,8 +53,12 @@ def setUp(self):
             units='degrees_north',
             coord_system=self.coord_sys,
         )
-        coords_spec = [(lats, 0), (lons, 1)]
-        self.grid = iris.cube.Cube(data, dim_coords_and_dims=coords_spec)
+        coords_spec = [(times, 0), (lats, 1), (lons, 2)]
+        self.grid = iris.cube.Cube(
+            data,
+            dim_coords_and_dims=coords_spec,
+            units='kg m-2 s-1',
+        )
 
         ndata = np.ones((6, 6))
         nlons = iris.coords.DimCoord(
@@ -63,86 +75,124 @@ def setUp(self):
             coord_system=self.coord_sys,
         )
         coords_spec = [(nlats, 0), (nlons, 1)]
-        self.negative_grid = iris.cube.Cube(ndata,
-                                            dim_coords_and_dims=coords_spec)
+        self.negative_grid = iris.cube.Cube(
+            ndata,
+            dim_coords_and_dims=coords_spec,
+            units='kg m-2 s-1',
+        )
+
+    def _add_cell_measure_to_grid(self):
+        """Add cell_area to self.grid."""
+        cube = guess_bounds(self.grid, ['longitude', 'latitude'])
+        grid_areas = iris.analysis.cartography.area_weights(cube)[0]
+        measure = iris.coords.CellMeasure(
+            grid_areas,
+            standard_name='cell_area',
+            units='m2',
+            measure='area')
+        self.grid.add_cell_measure(measure, (1, 2))
 
     def test_area_statistics_mean(self):
         """Test for area average of a 2D field."""
+        self.assertFalse(self.grid.cell_measures('cell_area'))
+
         result = area_statistics(self.grid, 'mean')
-        expected = np.array([1.], dtype=np.float32)
+
+        expected = np.ma.array([1., 1.], dtype=np.float32)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
+        self.assertFalse(self.grid.cell_measures('cell_area'))
+        self.assertFalse(result.cell_measures('cell_area'))
 
     def test_area_statistics_cell_measure_mean(self):
         """Test for area average of a 2D field.
 
-        The area measure is pre-loaded in the cube
+        The area measure is pre-loaded in the cube.
         """
-        cube = guess_bounds(self.grid, ['longitude', 'latitude'])
-        grid_areas = iris.analysis.cartography.area_weights(cube)
-        measure = iris.coords.CellMeasure(
-            grid_areas,
-            standard_name='cell_area',
-            units='m2',
-            measure='area')
-        self.grid.add_cell_measure(measure, range(0, measure.ndim))
+        self._add_cell_measure_to_grid()
         result = area_statistics(self.grid, 'mean')
-        expected = np.array([1.], dtype=np.float32)
+        expected = np.ma.array([1., 1.], dtype=np.float32)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
+        self.assertTrue(self.grid.cell_measures('cell_area'))
+        self.assertFalse(result.cell_measures('cell_area'))
 
     def test_area_statistics_min(self):
         """Test for area average of a 2D field."""
         result = area_statistics(self.grid, 'min')
-        expected = np.array([1.], dtype=np.float32)
+        expected = np.ma.array([1., 1.], dtype=np.float32)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_area_statistics_max(self):
         """Test for area average of a 2D field."""
         result = area_statistics(self.grid, 'max')
-        expected = np.array([1.], dtype=np.float32)
+        expected = np.ma.array([1., 1.], dtype=np.float32)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_area_statistics_median(self):
         """Test for area average of a 2D field."""
         result = area_statistics(self.grid, 'median')
-        expected = np.array([1.], dtype=np.float32)
+        expected = np.ma.array([1., 1.], dtype=np.float32)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_area_statistics_std_dev(self):
         """Test for area average of a 2D field."""
         result = area_statistics(self.grid, 'std_dev')
-        expected = np.array([0.], dtype=np.float32)
+        expected = np.ma.array([0., 0.], dtype=np.float32)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_area_statistics_sum(self):
         """Test for sum of a 2D field."""
         result = area_statistics(self.grid, 'sum')
         grid_areas = iris.analysis.cartography.area_weights(self.grid)
-        expected = np.sum(grid_areas).astype(np.float32)
+        grid_sum = np.sum(grid_areas[0])
+        expected = np.array([grid_sum, grid_sum]).astype(np.float32)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg s-1')
+
+    def test_area_statistics_cell_measure_sum(self):
+        """Test for area sum of a 2D field.
+
+        The area measure is pre-loaded in the cube.
+        """
+        self._add_cell_measure_to_grid()
+        grid_areas = iris.analysis.cartography.area_weights(self.grid)
+        result = area_statistics(self.grid, 'sum')
+        grid_sum = np.sum(grid_areas[0])
+        expected = np.array([grid_sum, grid_sum]).astype(np.float32)
+        self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg s-1')
 
     def test_area_statistics_variance(self):
         """Test for area average of a 2D field."""
         result = area_statistics(self.grid, 'variance')
-        expected = np.array([0.], dtype=np.float32)
+        expected = np.ma.array([0., 0.], dtype=np.float32)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg2 m-4 s-2')
 
     def test_area_statistics_neg_lon(self):
         """Test for area average of a 2D field."""
         result = area_statistics(self.negative_grid, 'mean')
         expected = np.array([1.], dtype=np.float32)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_area_statistics_rms(self):
         """Test for area rms of a 2D field."""
         result = area_statistics(self.grid, 'rms')
-        expected = np.array([1.], dtype=np.float32)
+        expected = np.ma.array([1., 1.], dtype=np.float32)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_extract_region(self):
         """Test for extracting a region from a 2D field."""
         result = extract_region(self.grid, 1.5, 2.5, 1.5, 2.5)
         # expected outcome
-        expected = np.ones((2, 2))
+        expected = np.ones((2, 2, 2))
         self.assert_array_equal(result.data, expected)
 
     def test_extract_region_mean(self):
@@ -158,10 +208,10 @@ def test_extract_region_mean(self):
         self.grid.add_cell_measure(measure, range(0, measure.ndim))
         region = extract_region(self.grid, 1.5, 2.5, 1.5, 2.5)
         # expected outcome
-        expected = np.ones((2, 2))
+        expected = np.ones((2, 2, 2))
         self.assert_array_equal(region.data, expected)
         result = area_statistics(region, 'mean')
-        expected_mean = np.array([1.])
+        expected_mean = np.ma.array([1., 1.])
         self.assert_array_equal(result.data, expected_mean)
 
     def test_extract_region_neg_lon(self):
@@ -501,6 +551,55 @@ def test_area_statistics_rotated(case):
         np.testing.assert_array_equal(cube.data, expected)
 
 
+def create_unstructured_grid_cube():
+    """Create test cube with unstructured grid."""
+    lat = iris.coords.AuxCoord(
+        [0, 1, 2], var_name='lat', standard_name='latitude', units='degrees',
+    )
+    lon = iris.coords.AuxCoord(
+        [0, 1, 2], var_name='lon', standard_name='longitude', units='degrees',
+    )
+    cube = iris.cube.Cube(
+        [0, 10, 20],
+        var_name='tas',
+        units='K',
+        aux_coords_and_dims=[(lat, 0), (lon, 0)],
+    )
+    return cube
+
+
+def test_area_statistics_max_irregular_grid():
+    """Test ``area_statistics``."""
+    values = np.arange(12).reshape(2, 2, 3)
+    cube = create_irregular_grid_cube(values, values[0, ...], values[0, ...])
+    result = area_statistics(cube, 'max')
+    assert isinstance(result, Cube)
+    np.testing.assert_array_equal(result.data, [5, 11])
+
+
+def test_area_statistics_max_unstructured_grid():
+    """Test ``area_statistics``."""
+    cube = create_unstructured_grid_cube()
+    result = area_statistics(cube, 'max')
+    assert isinstance(result, Cube)
+    np.testing.assert_array_equal(result.data, 20)
+
+
+def test_area_statistics_sum_irregular_grid_fail():
+    """Test ``area_statistics``."""
+    values = np.arange(12).reshape(2, 2, 3)
+    cube = create_irregular_grid_cube(values, values[0, ...], values[0, ...])
+    with pytest.raises(CoordinateMultiDimError):
+        area_statistics(cube, 'sum')
+
+
+def test_area_statistics_sum_unstructured_grid_fail():
+    """Test ``area_statistics``."""
+    cube = create_unstructured_grid_cube()
+    with pytest.raises(CoordinateMultiDimError):
+        area_statistics(cube, 'sum')
+
+
 @pytest.fixture
 def make_testcube():
     """Create a test cube on a Cartesian grid."""
@@ -1161,5 +1260,37 @@ def test_update_shapefile_path_rel(
             assert shapefile_out == ar6_shapefile
 
 
+def test_zonal_statistics(make_testcube):
+    """Test ``zonal_statistics``."""
+    res = zonal_statistics(make_testcube, 'sum')
+    assert res.coord('latitude') == make_testcube.coord('latitude')
+    np.testing.assert_allclose(res.coord('longitude').points, [2.5])
+    np.testing.assert_allclose(res.coord('longitude').bounds, [[0.0, 5.0]])
+    np.testing.assert_allclose(res.data, [5.0, 5.0, 5.0, 5.0, 5.0])
+    assert res.dtype == np.float32
+
+
+def test_zonal_statistics_2d_lon_fail(irreg_extract_shape_cube):
+    """Test ``zonal_statistics``."""
+    with pytest.raises(ValueError):
+        zonal_statistics(irreg_extract_shape_cube, 'sum')
+
+
+def test_meridional_statistics(make_testcube):
+    """Test ``zonal_statistics``."""
+    res = meridional_statistics(make_testcube, 'sum')
+    assert res.coord('longitude') == make_testcube.coord('longitude')
+    np.testing.assert_allclose(res.coord('latitude').points, [2.5])
+    np.testing.assert_allclose(res.coord('latitude').bounds, [[0.0, 5.0]])
+    np.testing.assert_allclose(res.data, [5.0, 5.0, 5.0, 5.0, 5.0])
+    assert res.dtype == np.float32
+
+
+def test_meridional_statistics_2d_lon_fail(irreg_extract_shape_cube):
+    """Test ``meridional_statistics``."""
+    with pytest.raises(ValueError):
+        meridional_statistics(irreg_extract_shape_cube, 'sum')
+
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/unit/preprocessor/_multimodel/test_multimodel.py b/tests/unit/preprocessor/_multimodel/test_multimodel.py
index 4a0e353e1a..656af00ac9 100644
--- a/tests/unit/preprocessor/_multimodel/test_multimodel.py
+++ b/tests/unit/preprocessor/_multimodel/test_multimodel.py
@@ -216,11 +216,13 @@ def get_cube_for_equal_coords_test(num_cubes):
 
 VALIDATION_DATA_SUCCESS = (
     ('full', 'mean', (5, 5, 3)),
+    ('full', {'operator': 'mean'}, (5, 5, 3)),
     ('full', 'std_dev', (5.656854249492381, 4, 2.8284271247461903)),
     ('full', 'std', (5.656854249492381, 4, 2.8284271247461903)),
     ('full', 'min', (1, 1, 1)),
     ('full', 'max', (9, 9, 5)),
     ('full', 'median', (5, 5, 3)),
+    ('full', {'operator': 'percentile', 'percent': 50.0}, (5, 5, 3)),
     ('full', 'p50', (5, 5, 3)),
     ('full', 'p99.5', (8.96, 8.96, 4.98)),
     ('full', 'peak', (9, 9, 5)),
@@ -230,12 +232,18 @@ def get_cube_for_equal_coords_test(num_cubes):
     ('overlap', 'min', (1, 1)),
     ('overlap', 'max', (9, 9)),
     ('overlap', 'median', (5, 5)),
+    ('overlap', {'operator': 'percentile', 'percent': 50.0}, (5, 5)),
     ('overlap', 'p50', (5, 5)),
     ('overlap', 'p99.5', (8.96, 8.96)),
     ('overlap', 'peak', (9, 9)),
     # test multiple statistics
     ('overlap', ('min', 'max'), ((1, 1), (9, 9))),
+    ('overlap', ('min', {'operator': 'max'}), ((1, 1), (9, 9))),
     ('full', ('min', 'max'), ((1, 1, 1), (9, 9, 5))),
+    ('full', (
+        {'operator': 'percentile', 'percent': 50.0},
+        {'operator': 'percentile', 'percent': 99.5}
+    ), ((5, 5, 3), (8.96, 8.96, 4.98))),
 )
 
 
@@ -320,17 +328,18 @@ def test_multimodel_statistics(frequency, span, statistics, expected):
     """High level test for multicube statistics function."""
     cubes = get_cubes_for_validation_test(frequency)
 
-    if isinstance(statistics, str):
+    if isinstance(statistics, (str, dict)):
         statistics = (statistics, )
         expected = (expected, )
 
     result = multi_model_statistics(cubes, span, statistics)
 
     assert isinstance(result, dict)
-    assert set(result.keys()) == set(statistics)
+    stat_ids = [mm._get_stat_identifier(s) for s in statistics]
+    assert set(result.keys()) == set(stat_ids)
 
-    for i, statistic in enumerate(statistics):
-        result_cube = result[statistic]
+    for i, stat_id in enumerate(stat_ids):
+        result_cube = result[stat_id]
         # make sure that temporary coord has been removed
         with pytest.raises(iris.exceptions.CoordinateNotFoundError):
             result_cube.coord('multi-model')
@@ -389,11 +398,36 @@ def test_lazy_data_inconsistent_times(span):
     assert result_cube.has_lazy_data()
 
 
+@pytest.mark.parametrize('span', SPAN_OPTIONS)
+def test_multicube_stats_dict_keys(span):
+    """Test output dict keys of ``_multicube_statistics``."""
+    cubes = (
+        generate_cube_from_dates('monthly', fill_val=1),
+        generate_cube_from_dates('monthly', fill_val=3),
+        generate_cube_from_dates('monthly', fill_val=6),
+    )
+    statistics = [
+        'mean',
+        {'operator': 'sum'},
+        {'operator': 'percentile', 'percent': 50},
+        {'operator': 'percentile', 'percent': 95.0},
+    ]
+
+    result = mm._multicube_statistics(cubes, span=span, statistics=statistics)
+
+    assert isinstance(result, dict)
+    assert len(result) == 4
+    assert 'mean' in result
+    assert 'sum' in result
+    assert 'percentile50' in result
+    assert 'percentile95.0' in result
+
+
 VALIDATION_DATA_FAIL = (
     ('percentile', ValueError),
     ('wpercentile', ValueError),
-    ('count', TypeError),
-    ('proportion', TypeError),
+    ('count', ValueError),
+    ('proportion', ValueError),
 )
 
 
@@ -1374,7 +1408,15 @@ def test_empty_input_ensemble_statistics():
         )
 
 
-STATS = ['mean', 'median', 'min', 'max', 'p42.314', 'std_dev']
+STATS = [
+    'mean',
+    {'operator': 'median'},
+    'min',
+    'max',
+    'p42.314',
+    {'operator': 'percentile', 'percent': 42.314},
+    'std_dev',
+]
 
 
 @pytest.mark.parametrize('stat', STATS)
@@ -1388,7 +1430,7 @@ def test_empty_input_ensemble_statistics():
 def test_single_input_multi_model_statistics(products, stat):
     """Check that ``multi_model_statistics`` works with a single cube."""
     output = PreprocessorFile()
-    output_products = {'': {stat: output}}
+    output_products = {'': {mm._get_stat_identifier(stat): output}}
     kwargs = {
         'statistics': [stat],
         'span': 'full',
@@ -1401,7 +1443,8 @@ def test_single_input_multi_model_statistics(products, stat):
     assert len(results) == 1
 
     if isinstance(results, dict):  # for cube as input
-        cube = results[stat]
+        stat_id = mm._get_stat_identifier(stat)
+        cube = results[stat_id]
     else:  # for PreprocessorFile as input
         result = next(iter(results))
         assert len(result.cubes) == 1
@@ -1425,6 +1468,8 @@ def test_single_input_multi_model_statistics(products, stat):
 )
 def test_single_input_ensemble_statistics(products, stat):
     """Check that ``ensemble_statistics`` works with a single cube."""
+    stat_id = mm._get_stat_identifier(stat)
+
     cube = generate_cube_from_dates('monthly')
     attributes = {
         'project': 'project',
@@ -1434,7 +1479,7 @@ def test_single_input_ensemble_statistics(products, stat):
     }
     products = {PreprocessorFile(cube, attributes=attributes)}
     output = PreprocessorFile()
-    output_products = {'project_dataset_exp': {stat: output}}
+    output_products = {'project_dataset_exp': {stat_id: output}}
     kwargs = {
         'statistics': [stat],
         'output_products': output_products,
@@ -1453,3 +1498,62 @@ def test_single_input_ensemble_statistics(products, stat):
         )
     else:
         assert_array_allclose(cube.data, np.ma.array([1.0, 1.0, 1.0]))
+
+
+def test_operator_missing_in_stat():
+    """Test no operator in stat dict."""
+    cubes = CubeList([generate_cube_from_dates('monthly')])
+    msg = (
+        "`statistic` given as dictionary, but missing required key `operator`"
+    )
+    with pytest.raises(ValueError) as exc:
+        mm.multi_model_statistics(cubes, 'overlap', [{'no': 'operator'}])
+    assert msg in str(exc)
+
+
+@pytest.mark.parametrize(
+    'statistic,output',
+    [
+        ('mean', ('mean', {})),
+        ({'operator': 'mean'}, ('mean', {})),
+        ({'operator': 'mean', 'weights': False}, ('mean', {'weights': False})),
+        ('percentile', ('percentile', {})),
+        ({'operator': 'percentile', 'percent': 50},
+         ('percentile', {'percent': 50})),
+        ({'operator': 'wpercentile', 'weights': False},
+         ('wpercentile', {'weights': False})),
+        ({'operator': 'wpercentile', 'weights': False, 'percent': 5.0},
+         ('wpercentile', {'weights': False, 'percent': 5.0})),
+    ]
+)
+def test_get_operator_and_kwargs(statistic, output):
+    """Test ``_get_operator_and_kwargs``."""
+    assert mm._get_operator_and_kwargs(statistic) == output
+
+
+@pytest.mark.parametrize('statistic', [{}, {'no': 'op'}])
+def test_get_operator_and_kwargs_operator_missing(statistic):
+    """Test ``_get_operator_and_kwargs``."""
+    msg = (
+        "`statistic` given as dictionary, but missing required key `operator`"
+    )
+    with pytest.raises(ValueError, match=msg):
+        mm._get_operator_and_kwargs(statistic)
+
+
+@pytest.mark.parametrize(
+    'statistic,output',
+    [
+        ('mean', 'mean'),
+        ({'operator': 'mean'}, 'mean'),
+        ({'operator': 'mean', 'weights': False}, 'mean'),
+        ('percentile', 'percentile'),
+        ({'operator': 'percentile', 'percent': 50}, 'percentile50'),
+        ({'operator': 'wpercentile', 'weights': False}, 'wpercentile'),
+        ({'operator': 'wpercentile', 'weights': False, 'percent': 5.0},
+         'wpercentile5.0'),
+    ]
+)
+def test_get_stat_identifier(statistic, output):
+    """Test ``_get_stat_identifier``."""
+    assert mm._get_stat_identifier(statistic) == output
diff --git a/tests/unit/preprocessor/_time/test_time.py b/tests/unit/preprocessor/_time/test_time.py
index ab9e086532..f9d207ed49 100644
--- a/tests/unit/preprocessor/_time/test_time.py
+++ b/tests/unit/preprocessor/_time/test_time.py
@@ -6,6 +6,7 @@
 from datetime import datetime
 from typing import List, Tuple
 
+import dask.array as da
 import iris
 import iris.coord_categorisation
 import iris.coords
@@ -532,7 +533,11 @@ def _create_cube(data, times, bounds):
                                     standard_name='time',
                                     units=Unit('days since 1950-01-01',
                                                calendar='gregorian'))
-        cube = iris.cube.Cube(data, dim_coords_and_dims=[(time, 0)])
+        cube = iris.cube.Cube(
+            data,
+            dim_coords_and_dims=[(time, 0)],
+            units='kg m-2 s-1'
+        )
         return cube
 
     def test_time_mean(self):
@@ -545,6 +550,9 @@ def test_time_mean(self):
         result = climate_statistics(cube, operator='mean')
         expected = np.array([1.], dtype=np.float32)
         assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
+        self.assertFalse(cube.coords('_time_weights_'))
+        self.assertFalse(result.coords('_time_weights_'))
 
     def test_time_mean_uneven(self):
         """Test for time average of a 1D field with uneven time boundaries."""
@@ -556,6 +564,7 @@ def test_time_mean_uneven(self):
         result = climate_statistics(cube, operator='mean')
         expected = np.array([4.], dtype=np.float32)
         assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_time_mean_365_day(self):
         """Test for time avg of a realistic time axis and 365 day calendar."""
@@ -568,6 +577,7 @@ def test_time_mean_365_day(self):
         result = climate_statistics(cube, operator='mean')
         expected = np.array([1.], dtype=np.float32)
         assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_time_sum(self):
         """Test for time sum of a 1D field."""
@@ -577,8 +587,9 @@ def test_time_sum(self):
         cube = self._create_cube(data, times, bounds)
 
         result = climate_statistics(cube, operator='sum')
-        expected = np.array([4.], dtype=np.float32)
+        expected = np.array([120.], dtype=np.float32)
         assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, '86400 kg m-2')
 
     def test_time_sum_weighted(self):
         """Test for time sum of a 1D field."""
@@ -590,6 +601,7 @@ def test_time_sum_weighted(self):
         result = climate_statistics(cube, operator='sum')
         expected = np.array([74.], dtype=np.float32)
         assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, '86400 kg m-2')
 
     def test_time_sum_uneven(self):
         """Test for time sum of a 1D field with uneven time boundaries."""
@@ -601,6 +613,7 @@ def test_time_sum_uneven(self):
         result = climate_statistics(cube, operator='sum')
         expected = np.array([16.0], dtype=np.float32)
         assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, '86400 kg m-2')
 
     def test_time_sum_365_day(self):
         """Test for time sum of a realistic time axis and 365 day calendar."""
@@ -614,6 +627,7 @@ def test_time_sum_365_day(self):
         result = climate_statistics(cube, operator='sum')
         expected = np.array([211.], dtype=np.float32)
         assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, '86400 kg m-2')
 
     def test_season_climatology(self):
         """Test for time avg of a realistic time axis and 365 day calendar."""
@@ -627,6 +641,7 @@ def test_season_climatology(self):
             result = climate_statistics(cube, operator='mean', period=period)
             expected = np.array([1., 1., 1.], dtype=np.float32)
             assert_array_equal(result.data, expected)
+            self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_custom_season_climatology(self):
         """Test for time avg of a realisitc time axis and 365 day calendar."""
@@ -643,6 +658,7 @@ def test_custom_season_climatology(self):
                                         seasons=('jfmamj', 'jasond'))
             expected = np.array([1., 1.], dtype=np.float32)
             assert_array_equal(result.data, expected)
+            self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_monthly(self):
         """Test for time avg of a realistic time axis and 365 day calendar."""
@@ -656,6 +672,7 @@ def test_monthly(self):
             result = climate_statistics(cube, operator='mean', period=period)
             expected = np.ones((6, ), dtype=np.float32)
             assert_array_equal(result.data, expected)
+            self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_day(self):
         """Test for time avg of a realistic time axis and 365 day calendar."""
@@ -669,6 +686,7 @@ def test_day(self):
             result = climate_statistics(cube, operator='mean', period=period)
             expected = np.array([1, 1, 1], dtype=np.float32)
             assert_array_equal(result.data, expected)
+            self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_hour(self):
         """Test for time avg of a realistic time axis and 365 day calendar."""
@@ -684,6 +702,7 @@ def test_hour(self):
             assert_array_equal(result.data, expected)
             expected_hours = [0, 1, 2]
             assert_array_equal(result.coord('hour').points, expected_hours)
+            self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_period_not_supported(self):
         """Test for time avg of a realistic time axis and 365 day calendar."""
@@ -706,6 +725,7 @@ def test_time_max(self):
         result = climate_statistics(cube, operator='max')
         expected = np.array([2.], dtype=np.float32)
         assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_time_min(self):
         """Test for time min of a 1D field."""
@@ -717,6 +737,7 @@ def test_time_min(self):
         result = climate_statistics(cube, operator='min')
         expected = np.array([0.], dtype=np.float32)
         assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_time_median(self):
         """Test for time meadian of a 1D field."""
@@ -728,6 +749,7 @@ def test_time_median(self):
         result = climate_statistics(cube, operator='median')
         expected = np.array([1.], dtype=np.float32)
         assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_time_rms(self):
         """Test for time rms of a 1D field."""
@@ -739,6 +761,7 @@ def test_time_rms(self):
         result = climate_statistics(cube, operator='rms')
         expected = np.array([(5 / 3)**0.5], dtype=np.float32)
         assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
     def test_time_dependent_fx(self):
         """Test average time dimension in time-dependent fx vars."""
@@ -768,6 +791,7 @@ def test_time_dependent_fx(self):
         self.assertEqual(result.cell_measure('ocean_volume').ndim, 2)
         self.assertEqual(
             result.ancillary_variable('land_ice_area_fraction').ndim, 2)
+        self.assertEqual(result.units, 'kg m-2 s-1')
 
 
 class TestSeasonalStatistics(tests.Test):
@@ -1637,8 +1661,9 @@ def make_map_data(number_years=2):
         standard_name='longitude',
     )
     data = np.array([[0, 1], [1, 0]]) * times[:, None, None]
+    chunks = (int(data.shape[0] / 2), 1, 2)
     cube = iris.cube.Cube(
-        data,
+        da.asarray(data, chunks=chunks),
         dim_coords_and_dims=[(time, 0), (lat, 1), (lon, 2)],
     )
     return cube
@@ -1844,7 +1869,11 @@ def _make_cube():
                                 coord_system=coord_sys)
     lons = get_lon_coord()
     coords_spec4 = [(time, 0), (zcoord, 1), (lats, 2), (lons, 3)]
-    cube1 = iris.cube.Cube(data2, dim_coords_and_dims=coords_spec4)
+    cube1 = iris.cube.Cube(
+        data2,
+        dim_coords_and_dims=coords_spec4,
+        units='kg m-2 s-1',
+    )
     return cube1
 
 
@@ -1928,12 +1957,13 @@ def test_climate_statistics_0d_time_1d_lon():
     lons = get_lon_coord()
     cube = iris.cube.Cube([[1.0, -1.0, 42.0]],
                           var_name='x',
-                          units='K',
+                          units='K day-1',
                           dim_coords_and_dims=[(time, 0), (lons, 1)])
     new_cube = climate_statistics(cube, operator='sum', period='full')
     assert cube.shape == (1, 3)
     assert new_cube.shape == (3, )
-    np.testing.assert_allclose(new_cube.data, [1.0, -1.0, 42.0])
+    np.testing.assert_allclose(new_cube.data, [2.0, -2.0, 84.0])
+    assert new_cube.units == 'K'
 
 
 def test_climate_statistics_complex_cube_sum():
@@ -1943,6 +1973,7 @@ def test_climate_statistics_complex_cube_sum():
     assert cube.shape == (2, 1, 1, 3)
     assert new_cube.shape == (1, 1, 3)
     np.testing.assert_allclose(new_cube.data, [[[45.0, 45.0, 45.0]]])
+    assert new_cube.units == '86400 kg m-2'
 
 
 def test_climate_statistics_complex_cube_mean():
@@ -1952,6 +1983,7 @@ def test_climate_statistics_complex_cube_mean():
     assert cube.shape == (2, 1, 1, 3)
     assert new_cube.shape == (1, 1, 3)
     np.testing.assert_allclose(new_cube.data, [[[1.0, 1.0, 1.0]]])
+    assert new_cube.units == 'kg m-2 s-1'
 
 
 class TestResampleHours(tests.Test):
@@ -2128,5 +2160,65 @@ def test_resample_fails_scalar(self):
             resample_time(cube, day=16)
 
 
+@pytest.fixture
+def easy_2d_cube():
+    """Create easy 2D cube to test statistical operators."""
+    time = iris.coords.DimCoord(
+        [2.0, 3.0],
+        bounds=[[-0.5, 2.5], [2.5, 3.5]],
+        standard_name='time',
+        units='days since 2000-01-01',
+    )
+    lat = iris.coords.DimCoord(
+        [0.0, 1.0], standard_name='latitude', units='degrees'
+    )
+    cube = Cube(
+        np.arange(4, dtype=np.float32).reshape(2, 2),
+        standard_name='air_temperature',
+        units='K',
+        dim_coords_and_dims=[(time, 0), (lat, 1)],
+    )
+    return cube
+
+
+@pytest.mark.parametrize(
+    'operator,kwargs,expected_data,expected_units',
+    [
+        ('gmean', {}, [0.0, 1.7320509], 'K'),
+        ('hmean', {}, [0.0, 1.5], 'K'),
+        ('max', {}, [2.0, 3.0], 'K'),
+        ('mean', {}, [0.5, 1.5], 'K'),
+        ('mean', {'weights': False}, [1.0, 2.0], 'K'),
+        ('median', {}, [1.0, 2.0], 'K'),
+        ('min', {}, [0.0, 1.0], 'K'),
+        ('peak', {}, [2.0, 3.0], 'K'),
+        ('percentile', {'percent': 0.0}, [0.0, 1.0], 'K'),
+        ('rms', {}, [1.0, 1.7320509], 'K'),
+        ('rms', {'weights': False}, [1.414214, 2.236068], 'K'),
+        ('std_dev', {}, [1.414214, 1.414214], 'K'),
+        ('std_dev', {'ddof': 0}, [1.0, 1.0], 'K'),
+        ('sum', {}, [2.0, 6.0], 'K day'),
+        ('sum', {'weights': False}, [2.0, 4.0], 'K'),
+        ('variance', {}, [2.0, 2.0], 'K2'),
+        ('variance', {'ddof': 0}, [1.0, 1.0], 'K2'),
+        ('wpercentile', {'percent': 50.0}, [0.5, 1.5], 'K'),
+    ]
+)
+def test_statistical_operators(
+    operator, kwargs, expected_data, expected_units, easy_2d_cube
+):
+    """Test ``climate_statistics`` with different operators."""
+    res = climate_statistics(easy_2d_cube, operator, **kwargs)
+
+    assert res.var_name == easy_2d_cube.var_name
+    assert res.long_name == easy_2d_cube.long_name
+    assert res.standard_name == easy_2d_cube.standard_name
+    assert res.attributes == easy_2d_cube.attributes
+    assert res.units == expected_units
+    assert res.coord('latitude') == easy_2d_cube.coord('latitude')
+    assert res.coord('time').shape == (1, )
+    np.testing.assert_allclose(res.data, expected_data, atol=1e-6, rtol=1e-6)
+
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/unit/preprocessor/_volume/test_volume.py b/tests/unit/preprocessor/_volume/test_volume.py
index 45f4b286fd..2e35f98d3b 100644
--- a/tests/unit/preprocessor/_volume/test_volume.py
+++ b/tests/unit/preprocessor/_volume/test_volume.py
@@ -3,8 +3,10 @@
 import unittest
 
 import iris
+import iris.fileformats
 import numpy as np
 from cf_units import Unit
+from iris.exceptions import CoordinateMultiDimError
 
 import tests
 from esmvalcore.preprocessor._volume import (
@@ -53,6 +55,16 @@ def setUp(self):
                                               [25., 250.]],
                                       units='m',
                                       attributes={'positive': 'down'})
+        zcoord_4d = iris.coords.AuxCoord(
+            np.broadcast_to([[[[0.5]], [[5.]], [[50.]]]], (2, 3, 2, 2)),
+            long_name='zcoord',
+            bounds=np.broadcast_to(
+                [[[[[0., 2.5]]], [[[2.5, 25.]]], [[[25., 250.]]]]],
+                (2, 3, 2, 2, 2),
+            ),
+            units='m',
+            attributes={'positive': 'down'},
+        )
         lons2 = iris.coords.DimCoord([1.5, 2.5],
                                      standard_name='longitude',
                                      bounds=[[1., 2.], [2., 3.]],
@@ -68,16 +80,31 @@ def setUp(self):
         self.grid_3d = iris.cube.Cube(data1, dim_coords_and_dims=coords_spec3)
 
         coords_spec4 = [(time, 0), (zcoord, 1), (lats2, 2), (lons2, 3)]
-        self.grid_4d = iris.cube.Cube(data2, dim_coords_and_dims=coords_spec4)
+        self.grid_4d = iris.cube.Cube(
+            data2,
+            dim_coords_and_dims=coords_spec4,
+            units='kg m-3',
+        )
 
         coords_spec5 = [(time2, 0), (zcoord, 1), (lats2, 2), (lons2, 3)]
-        self.grid_4d_2 = iris.cube.Cube(data3,
-                                        dim_coords_and_dims=coords_spec5)
+        self.grid_4d_2 = iris.cube.Cube(
+            data3,
+            dim_coords_and_dims=coords_spec5,
+            units='kg m-3',
+        )
+
+        self.grid_4d_z = iris.cube.Cube(
+            data2,
+            dim_coords_and_dims=[(time, 0), (lats2, 2), (lons2, 3)],
+            aux_coords_and_dims=[(zcoord_4d, (0, 1, 2, 3))],
+            units='kg m-3',
+        )
 
         # allow iris to figure out the axis='z' coordinate
         iris.util.guess_coord_axis(self.grid_3d.coord('zcoord'))
         iris.util.guess_coord_axis(self.grid_4d.coord('zcoord'))
         iris.util.guess_coord_axis(self.grid_4d_2.coord('zcoord'))
+        iris.util.guess_coord_axis(self.grid_4d_z.coord('zcoord'))
 
     def test_axis_statistics_mean(self):
         """Test axis statistics with operator mean."""
@@ -88,6 +115,9 @@ def test_axis_statistics_mean(self):
         weights = (bounds[:, 1] - bounds[:, 0])
         expected = np.average(data, axis=1, weights=weights)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-3')
+        self.assertFalse(self.grid_4d.coords('_axis_statistics_weights_'))
+        self.assertFalse(result.coords('_axis_statistics_weights_'))
 
     def test_axis_statistics_median(self):
         """Test axis statistics in with operator median."""
@@ -96,6 +126,7 @@ def test_axis_statistics_median(self):
         result = axis_statistics(self.grid_4d, 'z', 'median')
         expected = np.median(data, axis=1)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-3')
 
     def test_axis_statistics_min(self):
         """Test axis statistics with operator min."""
@@ -104,6 +135,7 @@ def test_axis_statistics_min(self):
         result = axis_statistics(self.grid_4d, 'z', 'min')
         expected = np.min(data, axis=1)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-3')
 
     def test_axis_statistics_max(self):
         """Test axis statistics with operator max."""
@@ -112,6 +144,7 @@ def test_axis_statistics_max(self):
         result = axis_statistics(self.grid_4d, 'z', 'max')
         expected = np.max(data, axis=1)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-3')
 
     def test_axis_statistics_rms(self):
         """Test axis statistics with operator rms."""
@@ -124,20 +157,23 @@ def test_axis_statistics_std(self):
         result = axis_statistics(self.grid_4d, 'z', 'std_dev')
         expected = np.ma.zeros((2, 2, 2))
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-3')
 
     def test_axis_statistics_variance(self):
         """Test axis statistics with operator variance."""
         result = axis_statistics(self.grid_4d, 'z', 'variance')
         expected = np.ma.zeros((2, 2, 2))
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg2 m-6')
 
     def test_axis_statistics_sum(self):
         """Test axis statistics in multiple operators."""
         result = axis_statistics(self.grid_4d, 'z', 'sum')
         expected = np.ma.ones((2, 2, 2)) * 250
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-2')
 
-    def test_wrong_axis_statistics(self):
+    def test_wrong_axis_statistics_fail(self):
         """Test raises error when axis is not found in cube."""
         with self.assertRaises(ValueError) as err:
             axis_statistics(self.grid_3d, 't', 'mean')
@@ -145,7 +181,7 @@ def test_wrong_axis_statistics(self):
             f'Axis t not found in cube {self.grid_3d.summary(shorten=True)}',
             str(err.exception))
 
-    def test_multidimensional_axis_statistics(self):
+    def test_multidimensional_axis_statistics_fail(self):
         i_coord = iris.coords.DimCoord(
             [0, 1],
             long_name='cell index along first dimension',
@@ -254,18 +290,31 @@ def test_extract_volume_mean(self):
                                           units='m3',
                                           measure='volume')
         self.grid_4d.add_cell_measure(measure, range(0, measure.ndim))
+
         result = extract_volume(self.grid_4d, 0., 10.)
+
         expected = np.ma.ones((2, 2, 2, 2))
         self.assert_array_equal(result.data, expected)
+
         result_mean = volume_statistics(result, 'mean')
+
         expected_mean = np.ma.array([1., 1.], mask=False)
         self.assert_array_equal(result_mean.data, expected_mean)
+        self.assertEqual(result_mean.units, 'kg m-3')
+        self.assertTrue(self.grid_4d.cell_measures('ocean_volume'))
+        self.assertFalse(result_mean.cell_measures('ocean_volume'))
 
     def test_volume_statistics(self):
         """Test to take the volume weighted average of a (2,3,2,2) cube."""
+        self.assertFalse(self.grid_4d.cell_measures('ocean_volume'))
+
         result = volume_statistics(self.grid_4d, 'mean')
+
         expected = np.ma.array([1., 1.], mask=False)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-3')
+        self.assertFalse(self.grid_4d.cell_measures('ocean_volume'))
+        self.assertFalse(result.cell_measures('ocean_volume'))
 
     def test_volume_statistics_cell_measure(self):
         """Test to take the volume weighted average of a (2,3,2,2) cube.
@@ -281,6 +330,7 @@ def test_volume_statistics_cell_measure(self):
         result = volume_statistics(self.grid_4d, 'mean')
         expected = np.ma.array([1., 1.], mask=False)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-3')
 
     def test_volume_statistics_long(self):
         """Test to take the volume weighted average of a (4,3,2,2) cube.
@@ -291,6 +341,7 @@ def test_volume_statistics_long(self):
         result = volume_statistics(self.grid_4d_2, 'mean')
         expected = np.ma.array([1., 1., 1., 1.], mask=False)
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-3')
 
     def test_volume_statistics_masked_level(self):
         """Test to take the volume weighted average of a (2,3,2,2) cube where
@@ -307,6 +358,7 @@ def test_volume_statistics_masked_timestep(self):
         result = volume_statistics(self.grid_4d, 'mean')
         expected = np.ma.array([1., 1], mask=[True, False])
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-3')
 
     def test_volume_statistics_weights(self):
         """Test to take the volume weighted average of a (2,3,2,2) cube.
@@ -324,13 +376,46 @@ def test_volume_statistics_weights(self):
         expected = np.ma.array([8.333333333333334, 19.144144144144143],
                                mask=[False, False])
         self.assert_array_equal(result.data, expected)
+        self.assertEqual(result.units, 'kg m-3')
 
-    def test_volume_statistics_wrong_operator(self):
+    def test_volume_statistics_wrong_operator_fail(self):
         with self.assertRaises(ValueError) as err:
             volume_statistics(self.grid_4d, 'wrong')
         self.assertEqual('Volume operator wrong not recognised.',
                          str(err.exception))
 
+    def test_volume_statistics_2d_lat_fail(self):
+        # Create dummy 2D latitude from depth
+        new_lat_coord = self.grid_4d_z.coord('zcoord')[0, 0, :, :]
+        new_lat_coord.rename('latitude')
+        self.grid_4d_z.remove_coord('latitude')
+        self.grid_4d_z.add_aux_coord(new_lat_coord, (2, 3))
+        with self.assertRaises(CoordinateMultiDimError):
+            volume_statistics(self.grid_4d_z, 'mean')
+
+    def test_volume_statistics_4d_depth_fail(self):
+        # Fails because depth coord dims are (0, ...), but must be (1, ...)
+        with self.assertRaises(ValueError) as err:
+            volume_statistics(self.grid_4d_z, 'mean')
+        self.assertIn(
+            "Supplementary variables are needed to calculate grid cell "
+            "volumes for cubes with 4D depth coordinate, got cube ",
+            str(err.exception),
+        )
+
+    def test_volume_statistics_2d_depth_fail(self):
+        # Create new 2D depth coord
+        new_z_coord = self.grid_4d_z.coord('zcoord')[0, :, :, 0]
+        self.grid_4d_z.remove_coord('zcoord')
+        self.grid_4d_z.add_aux_coord(new_z_coord, (1, 2))
+        with self.assertRaises(ValueError) as err:
+            volume_statistics(self.grid_4d_z, 'mean')
+        self.assertIn(
+            "Supplementary variables are needed to calculate grid cell "
+            "volumes for cubes with 2D depth coordinate, got cube ",
+            str(err.exception),
+        )
+
     def test_depth_integration_1d(self):
         """Test to take the depth integration of a 3 layer cube."""
         result = depth_integration(self.grid_3d[:, 0, 0])
diff --git a/tests/unit/preprocessor/test_preprocessor_file.py b/tests/unit/preprocessor/test_preprocessor_file.py
index 3ebb3385d6..30e4c943cd 100644
--- a/tests/unit/preprocessor/test_preprocessor_file.py
+++ b/tests/unit/preprocessor/test_preprocessor_file.py
@@ -148,7 +148,7 @@ def test_close():
 
 
 @mock.patch('esmvalcore.preprocessor.preprocess', autospec=True)
-def test_save_no_cleanup(mock_preprocess):
+def test_save(mock_preprocess):
     """Test ``save``."""
     product = mock.create_autospec(PreprocessorFile, instance=True)
     product.settings = {'save': {}}
@@ -162,21 +162,3 @@ def test_save_no_cleanup(mock_preprocess):
             mock.sentinel.cubes, 'save', input_files=mock.sentinel.input_files
         ),
     ]
-
-
-@mock.patch('esmvalcore.preprocessor.preprocess', autospec=True)
-def test_save_cleanup(mock_preprocess):
-    """Test ``save``."""
-    product = mock.create_autospec(PreprocessorFile, instance=True)
-    product.settings = {'save': {}, 'cleanup': {}}
-    product._cubes = mock.sentinel.cubes
-    product._input_files = mock.sentinel.input_files
-
-    PreprocessorFile.save(product)
-
-    assert mock_preprocess.mock_calls == [
-        mock.call(
-            mock.sentinel.cubes, 'save', input_files=mock.sentinel.input_files
-        ),
-        mock.call([], 'cleanup', input_files=mock.sentinel.input_files),
-    ]
diff --git a/tests/unit/preprocessor/test_shared.py b/tests/unit/preprocessor/test_shared.py
new file mode 100644
index 0000000000..4d9bdb6a07
--- /dev/null
+++ b/tests/unit/preprocessor/test_shared.py
@@ -0,0 +1,184 @@
+"""Unit tests for `esmvalcore.preprocessor._shared`."""
+import warnings
+
+import iris.analysis
+import pytest
+
+from esmvalcore.exceptions import ESMValCoreDeprecationWarning
+from esmvalcore.preprocessor._shared import (
+    aggregator_accept_weights,
+    get_iris_aggregator,
+)
+
+
+@pytest.mark.parametrize('operator', ['gmean', 'GmEaN', 'GMEAN'])
+def test_get_iris_aggregator_gmean(operator):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator)
+    assert agg == iris.analysis.GMEAN
+    assert agg_kwargs == {}
+
+
+@pytest.mark.parametrize('operator', ['hmean', 'hMeAn', 'HMEAN'])
+def test_get_iris_aggregator_hmean(operator):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator)
+    assert agg == iris.analysis.HMEAN
+    assert agg_kwargs == {}
+
+
+@pytest.mark.parametrize('operator', ['max', 'mAx', 'MAX'])
+def test_get_iris_aggregator_max(operator):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator)
+    assert agg == iris.analysis.MAX
+    assert agg_kwargs == {}
+
+
+@pytest.mark.parametrize('kwargs', [{}, {'weights': True}, {'weights': False}])
+@pytest.mark.parametrize('operator', ['mean', 'mEaN', 'MEAN'])
+def test_get_iris_aggregator_mean(operator, kwargs):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **kwargs)
+    assert agg == iris.analysis.MEAN
+    assert agg_kwargs == kwargs
+
+
+@pytest.mark.parametrize('kwargs', [{}, {'weights': True}])
+@pytest.mark.parametrize('operator', ['median', 'mEdIaN', 'MEDIAN'])
+def test_get_iris_aggregator_median(operator, kwargs):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **kwargs)
+    assert agg == iris.analysis.MEDIAN
+    assert agg_kwargs == kwargs
+
+
+@pytest.mark.parametrize('operator', ['min', 'MiN', 'MIN'])
+def test_get_iris_aggregator_min(operator):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator)
+    assert agg == iris.analysis.MIN
+    assert agg_kwargs == {}
+
+
+@pytest.mark.parametrize('operator', ['peak', 'pEaK', 'PEAK'])
+def test_get_iris_aggregator_peak(operator):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator)
+    assert agg == iris.analysis.PEAK
+    assert agg_kwargs == {}
+
+
+@pytest.mark.parametrize('kwargs', [{'percent': 80.0, 'alphap': 0.5}])
+@pytest.mark.parametrize('operator', ['percentile', 'PERCENTILE'])
+def test_get_iris_aggregator_percentile(operator, kwargs):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **kwargs)
+    assert agg == iris.analysis.PERCENTILE
+    assert agg_kwargs == kwargs
+
+
+@pytest.mark.parametrize('kwargs', [{}, {'alphap': 0.5}])
+@pytest.mark.parametrize('operator', ['p10', 'P10.5'])
+def test_get_iris_aggregator_pxxyy(operator, kwargs):
+    """Test ``get_iris_aggregator``."""
+    with pytest.warns(ESMValCoreDeprecationWarning):
+        (agg, agg_kwargs) = get_iris_aggregator(operator, **kwargs)
+    assert agg == iris.analysis.PERCENTILE
+    assert agg_kwargs == {'percent': float(operator[1:]), **kwargs}
+
+
+@pytest.mark.parametrize('kwargs', [{}, {'weights': True}])
+@pytest.mark.parametrize('operator', ['rms', 'rMs', 'RMS'])
+def test_get_iris_aggregator_rms(operator, kwargs):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **kwargs)
+    assert agg == iris.analysis.RMS
+    assert agg_kwargs == kwargs
+
+
+@pytest.mark.parametrize('kwargs', [{}, {'ddof': 1}])
+@pytest.mark.parametrize('operator', ['std', 'STD', 'std_dev', 'STD_DEV'])
+def test_get_iris_aggregator_std(operator, kwargs):
+    """Test ``get_iris_aggregator``."""
+    if operator.lower() == 'std':
+        with pytest.warns(ESMValCoreDeprecationWarning):
+            (agg, agg_kwargs) = get_iris_aggregator(operator, **kwargs)
+    else:
+        with warnings.catch_warnings():
+            warnings.simplefilter(
+                'error', category=ESMValCoreDeprecationWarning
+            )
+            (agg, agg_kwargs) = get_iris_aggregator(operator, **kwargs)
+    assert agg == iris.analysis.STD_DEV
+    assert agg_kwargs == kwargs
+
+
+@pytest.mark.parametrize('kwargs', [{}, {'weights': True}])
+@pytest.mark.parametrize('operator', ['sum', 'SuM', 'SUM'])
+def test_get_iris_aggregator_sum(operator, kwargs):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **kwargs)
+    assert agg == iris.analysis.SUM
+    assert agg_kwargs == kwargs
+
+
+@pytest.mark.parametrize('operator', ['variance', 'vArIaNcE', 'VARIANCE'])
+def test_get_iris_aggregator_variance(operator):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator)
+    assert agg == iris.analysis.VARIANCE
+    assert agg_kwargs == {}
+
+
+@pytest.mark.parametrize('kwargs', [{'percent': 10, 'weights': True}])
+@pytest.mark.parametrize('operator', ['wpercentile', 'WPERCENTILE'])
+def test_get_iris_aggregator_wpercentile(operator, kwargs):
+    """Test ``get_iris_aggregator``."""
+    (agg, agg_kwargs) = get_iris_aggregator(operator, **kwargs)
+    assert agg == iris.analysis.WPERCENTILE
+    assert agg_kwargs == kwargs
+
+
+@pytest.mark.parametrize('operator', ['invalid', 'iNvAliD', 'INVALID'])
+def test_get_iris_aggregator_invalid_operator_fail(operator):
+    """Test ``get_iris_aggregator``."""
+    with pytest.raises(ValueError):
+        get_iris_aggregator(operator)
+
+
+@pytest.mark.parametrize('operator', ['mean', 'mEaN', 'MEAN'])
+def test_get_iris_aggregator_no_aggregator_fail(operator, monkeypatch):
+    """Test ``get_iris_aggregator``."""
+    monkeypatch.setattr(iris.analysis, 'MEAN', 1)
+    with pytest.raises(ValueError):
+        get_iris_aggregator(operator)
+
+
+def test_get_iris_aggregator_invalid_kwarg():
+    """Test ``get_iris_aggregator``."""
+    with pytest.raises(ValueError):
+        get_iris_aggregator('max', invalid_kwarg=1)
+
+
+def test_get_iris_aggregator_missing_kwarg():
+    """Test ``get_iris_aggregator``."""
+    with pytest.raises(ValueError):
+        get_iris_aggregator('percentile')
+
+
+@pytest.mark.parametrize(
+    'aggregator,result',
+    [
+        (iris.analysis.MEAN, True),
+        (iris.analysis.SUM, True),
+        (iris.analysis.RMS, True),
+        (iris.analysis.WPERCENTILE, True),
+        (iris.analysis.MAX, False),
+        (iris.analysis.MIN, False),
+        (iris.analysis.PERCENTILE, False),
+    ],
+)
+def test_aggregator_accept_weights(aggregator, result):
+    """Test ``aggregator_accept_weights``."""
+    assert aggregator_accept_weights(aggregator) == result
diff --git a/tests/unit/recipe/test_from_datasets.py b/tests/unit/recipe/test_from_datasets.py
index 62f83eae34..aacca5117d 100644
--- a/tests/unit/recipe/test_from_datasets.py
+++ b/tests/unit/recipe/test_from_datasets.py
@@ -4,6 +4,7 @@
 import yaml
 
 from esmvalcore._recipe.from_datasets import (
+    _group_ensemble_members,
     _group_ensemble_names,
     _group_identical_facets,
     _move_one_level_up,
@@ -211,6 +212,79 @@ def test_group_identical_facets():
     assert result == expected
 
 
+def test_group_ensemble_members():
+    datasets = [
+        Dataset(
+            dataset='dataset1',
+            ensemble='r1i1p1f1',
+            grid='gn',
+        ),
+        Dataset(
+            dataset='dataset1',
+            ensemble='r1i1p1f1',
+            grid='gr1',
+        ),
+        Dataset(
+            dataset='dataset1',
+            ensemble='r2i1p1f1',
+            grid='gn',
+        ),
+    ]
+    result = _group_ensemble_members(ds.facets for ds in datasets)
+    print(result)
+    assert result == [
+        {
+            'dataset': 'dataset1',
+            'ensemble': 'r(1:2)i1p1f1',
+            'grid': 'gn',
+        },
+        {
+            'dataset': 'dataset1',
+            'ensemble': 'r1i1p1f1',
+            'grid': 'gr1',
+        },
+    ]
+
+
+def test_group_ensemble_members_mix_of_versions():
+    datasets = [
+        Dataset(
+            dataset='dataset1',
+            ensemble='r1i1p1f1',
+            exp=['historical', 'ssp585'],
+            version='v1',
+        ),
+        Dataset(
+            dataset='dataset1',
+            ensemble='r2i1p1f1',
+            exp=['historical', 'ssp585'],
+            version='v1',
+        ),
+        Dataset(
+            dataset='dataset1',
+            ensemble='r3i1p1f1',
+            exp=['historical', 'ssp585'],
+            version=['v1', 'v2'],
+        ),
+    ]
+    result = _group_ensemble_members(ds.facets for ds in datasets)
+    print(result)
+    assert result == [
+        {
+            'dataset': 'dataset1',
+            'ensemble': 'r3i1p1f1',
+            'exp': ['historical', 'ssp585'],
+            'version': ['v1', 'v2'],
+        },
+        {
+            'dataset': 'dataset1',
+            'ensemble': 'r(1:2)i1p1f1',
+            'exp': ['historical', 'ssp585'],
+            'version': 'v1',
+        },
+    ]
+
+
 def test_group_ensembles_cmip5():
     ensembles = [
         "r1i1p1",
diff --git a/tests/unit/recipe/test_recipe.py b/tests/unit/recipe/test_recipe.py
index a437221a0e..5e73b2fb92 100644
--- a/tests/unit/recipe/test_recipe.py
+++ b/tests/unit/recipe/test_recipe.py
@@ -332,6 +332,97 @@ def test_update_multiproduct_multi_model_statistics():
     assert 'MultiModelStd_Dev' in str(stats['std_dev'].filename)
 
 
+def test_update_multiproduct_multi_model_statistics_percentile():
+    """Test ``_update_multiproduct``."""
+    settings = {
+        'multi_model_statistics': {
+            'statistics': [
+                {'operator': 'percentile', 'percent': 5.0},
+                {'operator': 'percentile', 'percent': 95.0},
+            ]
+        },
+    }
+    common_attributes = {
+        'project': 'CMIP6',
+        'diagnostic': 'd',
+        'variable_group': 'var',
+    }
+    cube = iris.cube.Cube(np.array([1]))
+    products = [
+        PreprocessorFile(cube, 'A',
+                         attributes={'dataset': 'a',
+                                     'timerange': '2000/2005',
+                                     **common_attributes},
+                         settings=settings),
+        PreprocessorFile(cube, 'B',
+                         attributes={'dataset': 'b',
+                                     'timerange': '2001/2004',
+                                     **common_attributes},
+                         settings=settings),
+        PreprocessorFile(cube, 'C',
+                         attributes={'dataset': 'c',
+                                     'timerange': '1999/2004',
+                                     **common_attributes},
+                         settings=settings),
+        PreprocessorFile(cube, 'D',
+                         attributes={'dataset': 'd',
+                                     'timerange': '2002/2010',
+                                     **common_attributes},
+                         settings=settings),
+    ]
+    order = ('load', 'multi_model_statistics', 'save')
+    preproc_dir = '/preproc'
+    step = 'multi_model_statistics'
+    output, settings = _recipe._update_multiproduct(
+        products, order, preproc_dir, step)
+
+    assert len(output) == 2
+
+    filenames = [p.filename for p in output]
+    assert (
+        Path('/preproc/d/var/CMIP6_MultiModelPercentile5-0_2002-2004.nc') in
+        filenames
+    )
+    assert (
+        Path('/preproc/d/var/CMIP6_MultiModelPercentile95-0_2002-2004.nc') in
+        filenames
+    )
+
+    for product in output:
+        for attr in common_attributes:
+            assert attr in product.attributes
+            assert product.attributes[attr] == common_attributes[attr]
+            assert 'alias' in product.attributes
+            assert 'dataset' in product.attributes
+            assert 'multi_model_statistics' in product.attributes
+            assert 'timerange' in product.attributes
+            assert product.attributes['timerange'] == '2002/2004'
+            assert 'start_year' in product.attributes
+            assert product.attributes['start_year'] == 2002
+            assert 'end_year' in product.attributes
+            assert product.attributes['end_year'] == 2004
+        if 'MultiModelPercentile5-0' in str(product.filename):
+            assert product.attributes['alias'] == 'MultiModelPercentile5-0'
+            assert product.attributes['dataset'] == 'MultiModelPercentile5-0'
+            assert (product.attributes['multi_model_statistics'] ==
+                    'MultiModelPercentile5-0')
+        elif 'MultiModelPercentile95-0' in str(product.filename):
+            assert product.attributes['alias'] == 'MultiModelPercentile95-0'
+            assert product.attributes['dataset'] == 'MultiModelPercentile95-0'
+            assert (product.attributes['multi_model_statistics'] ==
+                    'MultiModelPercentile95-0')
+
+    assert len(settings) == 1
+    output_products = settings['output_products']
+    assert len(output_products) == 1
+    stats = output_products['']
+    assert len(stats) == 2
+    assert 'percentile5.0' in stats
+    assert 'percentile95.0' in stats
+    assert 'MultiModelPercentile5-0' in str(stats['percentile5.0'].filename)
+    assert 'MultiModelPercentile95-0' in str(stats['percentile95.0'].filename)
+
+
 def test_update_multiproduct_ensemble_statistics():
     """Test ``_update_multiproduct``."""
     settings = {'ensemble_statistics': {'statistics': ['median'],
@@ -393,6 +484,76 @@ def test_update_multiproduct_ensemble_statistics():
         '/preproc/d/var/CMIP6_CanESM2_EnsembleMedian_2000-2000.nc')
 
 
+def test_update_multiproduct_ensemble_statistics_percentile():
+    """Test ``_update_multiproduct``."""
+    settings = {
+        'ensemble_statistics': {
+            'statistics': [
+                {'operator': 'percentile', 'percent': 5},
+            ],
+            'span': 'full',
+        },
+    }
+
+    common_attributes = {
+        'dataset': 'CanESM2',
+        'project': 'CMIP6',
+        'timerange': '2000/2000',
+        'diagnostic': 'd',
+        'variable_group': 'var',
+    }
+    cube = iris.cube.Cube(np.array([1]))
+    products = [
+        PreprocessorFile(cube, 'A',
+                         attributes=common_attributes,
+                         settings=settings),
+        PreprocessorFile(cube, 'B',
+                         attributes=common_attributes,
+                         settings=settings),
+        PreprocessorFile(cube, 'C',
+                         attributes=common_attributes,
+                         settings=settings),
+        PreprocessorFile(cube, 'D',
+                         attributes=common_attributes,
+                         settings=settings),
+    ]
+    order = ('load', 'ensemble_statistics', 'save')
+    preproc_dir = '/preproc'
+    step = 'ensemble_statistics'
+    output, settings = _recipe._update_multiproduct(
+        products, order, preproc_dir, step)
+
+    assert len(output) == 1
+    product = list(output)[0]
+    assert product.filename == Path(
+        '/preproc/d/var/CMIP6_CanESM2_EnsemblePercentile5_2000-2000.nc')
+
+    for attr in common_attributes:
+        assert attr in product.attributes
+        assert product.attributes[attr] == common_attributes[attr]
+        assert 'alias' in product.attributes
+        assert product.attributes['alias'] == 'EnsemblePercentile5'
+        assert 'dataset' in product.attributes
+        assert product.attributes['dataset'] == 'CanESM2'
+        assert 'ensemble_statistics' in product.attributes
+        assert product.attributes['ensemble_statistics'] == (
+            'EnsemblePercentile5'
+        )
+        assert 'start_year' in product.attributes
+        assert product.attributes['start_year'] == 2000
+        assert 'end_year' in product.attributes
+        assert product.attributes['end_year'] == 2000
+
+    assert len(settings) == 1
+    output_products = settings['output_products']
+    assert len(output_products) == 1
+    stats = output_products['CMIP6_CanESM2']
+    assert len(stats) == 1
+    assert 'percentile5' in stats
+    assert stats['percentile5'].filename == Path(
+        '/preproc/d/var/CMIP6_CanESM2_EnsemblePercentile5_2000-2000.nc')
+
+
 def test_update_multiproduct_no_product():
     cube = iris.cube.Cube(np.array([1]))
     products = [
@@ -541,62 +702,11 @@ def test_get_default_settings(mocker):
 
     settings = _recipe._get_default_settings(dataset)
     assert settings == {
-        'load': {'callback': 'default'},
         'remove_supplementary_variables': {},
         'save': {'compress': False, 'alias': 'sic'},
     }
 
 
-def test_add_legacy_supplementaries_disabled():
-    """Test that `_add_legacy_supplementaries` does nothing when disabled."""
-    dataset = Dataset()
-    dataset.session = {'use_legacy_supplementaries': False}
-    _recipe._add_legacy_supplementary_datasets(dataset, settings={})
-
-
-def test_enable_legacy_supplementaries_when_used(mocker, session):
-    """Test that legacy supplementaries are enabled when used in the recipe."""
-    recipe = mocker.create_autospec(_recipe.Recipe, instance=True)
-    recipe.session = session
-    recipe._preprocessors = {
-        'preproc1': {
-            'area_statistics': {
-                'operator': 'mean',
-                'fx_variables': 'areacella',
-            }
-        }
-    }
-    session['use_legacy_supplementaries'] = None
-    _recipe.Recipe._set_use_legacy_supplementaries(recipe)
-
-    assert session['use_legacy_supplementaries'] is True
-
-
-def test_strip_legacy_supplementaries_when_disabled(mocker, session):
-    """Test that legacy supplementaries are removed when disabled."""
-    recipe = mocker.create_autospec(_recipe.Recipe, instance=True)
-    recipe.session = session
-    recipe._preprocessors = {
-        'preproc1': {
-            'area_statistics': {
-                'operator': 'mean',
-                'fx_variables': 'areacella',
-            }
-        }
-    }
-    session['use_legacy_supplementaries'] = False
-    _recipe.Recipe._set_use_legacy_supplementaries(recipe)
-
-    assert session['use_legacy_supplementaries'] is False
-    assert recipe._preprocessors == {
-        'preproc1': {
-            'area_statistics': {
-                'operator': 'mean',
-            }
-        }
-    }
-
-
 def test_set_version(mocker):
 
     dataset = Dataset(short_name='tas')
diff --git a/tests/unit/task/test_diagnostic_task.py b/tests/unit/task/test_diagnostic_task.py
index 85db69f534..7e6867dd74 100644
--- a/tests/unit/task/test_diagnostic_task.py
+++ b/tests/unit/task/test_diagnostic_task.py
@@ -20,7 +20,7 @@ def test_write_ncl_settings(tmp_path):
     }
     file_name = tmp_path / "settings"
     write_ncl_settings(settings, file_name)
-    with open(file_name, 'r') as file:
+    with open(file_name, 'r', encoding='utf-8') as file:
         lines = file.readlines()
         assert 'var_name = "tas"\n' in lines
         assert 'if (isvar("profile_diagnostic")) then\n' not in lines
@@ -32,7 +32,7 @@ def test_write_ncl_settings(tmp_path):
     }
     file_name = tmp_path / "settings"
     write_ncl_settings(settings, file_name)
-    with open(file_name, 'r') as file:
+    with open(file_name, 'r', encoding='utf-8') as file:
         lines = file.readlines()
         assert 'var_name = "tas"\n' in lines
         assert 'profile_diagnostic' not in lines
diff --git a/tests/unit/task/test_resume_task.py b/tests/unit/task/test_resume_task.py
index 8185cd69c2..c5f2693970 100644
--- a/tests/unit/task/test_resume_task.py
+++ b/tests/unit/task/test_resume_task.py
@@ -16,7 +16,7 @@ def test_run(tmp_path):
         }
     }
     prev_metadata_file = prev_preproc_dir / 'metadata.yml'
-    with prev_metadata_file.open('w') as file:
+    with prev_metadata_file.open('w', encoding='utf-8') as file:
         yaml.safe_dump(prev_metadata, file)
 
     output_dir = tmp_path / 'recipe_test_20211001_092100'
diff --git a/tests/unit/test_cmor_api.py b/tests/unit/test_cmor_api.py
index 781ce30150..ac61c5006f 100644
--- a/tests/unit/test_cmor_api.py
+++ b/tests/unit/test_cmor_api.py
@@ -1,4 +1,6 @@
 # flake8: noqa
+from unittest.mock import sentinel
+
 import esmvalcore.cmor.check
 import esmvalcore.cmor.fix
 import esmvalcore.cmor.fixes
@@ -11,3 +13,114 @@
     cmor_check_data,
     cmor_check_metadata,
 )
+
+
+def test_cmor_check_metadata(mocker):
+    """Test ``cmor_check_metadata``"""
+    mock_get_cmor_checker = mocker.patch.object(
+        esmvalcore.cmor.check, '_get_cmor_checker', autospec=True
+    )
+    (
+        mock_get_cmor_checker.return_value.return_value.check_metadata.
+        return_value
+    ) = sentinel.checked_cube
+
+    cube = cmor_check_metadata(
+        sentinel.cube,
+        sentinel.cmor_table,
+        sentinel.mip,
+        sentinel.short_name,
+        sentinel.frequency,
+        check_level=sentinel.check_level,
+    )
+
+    mock_get_cmor_checker.assert_called_once_with(
+        sentinel.cmor_table,
+        sentinel.mip,
+        sentinel.short_name,
+        sentinel.frequency,
+        check_level=sentinel.check_level,
+    )
+    mock_get_cmor_checker.return_value.assert_called_once_with(sentinel.cube)
+    (
+        mock_get_cmor_checker.return_value.return_value.check_metadata.
+        assert_called_once_with()
+    )
+    assert cube == sentinel.checked_cube
+
+
+def test_cmor_check_data(mocker):
+    """Test ``cmor_check_data``"""
+    mock_get_cmor_checker = mocker.patch.object(
+        esmvalcore.cmor.check, '_get_cmor_checker', autospec=True
+    )
+    (
+        mock_get_cmor_checker.return_value.return_value.check_data.
+        return_value
+    ) = sentinel.checked_cube
+
+    cube = cmor_check_data(
+        sentinel.cube,
+        sentinel.cmor_table,
+        sentinel.mip,
+        sentinel.short_name,
+        sentinel.frequency,
+        check_level=sentinel.check_level,
+    )
+
+    mock_get_cmor_checker.assert_called_once_with(
+        sentinel.cmor_table,
+        sentinel.mip,
+        sentinel.short_name,
+        sentinel.frequency,
+        check_level=sentinel.check_level,
+    )
+    mock_get_cmor_checker.return_value.assert_called_once_with(sentinel.cube)
+    (
+        mock_get_cmor_checker.return_value.return_value.check_data.
+        assert_called_once_with()
+    )
+    assert cube == sentinel.checked_cube
+
+
+def test_cmor_check(mocker):
+    """Test ``cmor_check``"""
+    mock_cmor_check_metadata = mocker.patch.object(
+        esmvalcore.cmor.check,
+        'cmor_check_metadata',
+        autospec=True,
+        return_value=sentinel.cube_after_check_metadata,
+    )
+    mock_cmor_check_data = mocker.patch.object(
+        esmvalcore.cmor.check,
+        'cmor_check_data',
+        autospec=True,
+        return_value=sentinel.cube_after_check_data,
+    )
+
+    cube = cmor_check(
+        sentinel.cube,
+        sentinel.cmor_table,
+        sentinel.mip,
+        sentinel.short_name,
+        sentinel.frequency,
+        sentinel.check_level,
+    )
+
+    mock_cmor_check_metadata.assert_called_once_with(
+        sentinel.cube,
+        sentinel.cmor_table,
+        sentinel.mip,
+        sentinel.short_name,
+        sentinel.frequency,
+        check_level=sentinel.check_level,
+    )
+    mock_cmor_check_data.assert_called_once_with(
+        sentinel.cube_after_check_metadata,
+        sentinel.cmor_table,
+        sentinel.mip,
+        sentinel.short_name,
+        sentinel.frequency,
+        check_level=sentinel.check_level,
+    )
+    assert cube == sentinel.cube_after_check_data
diff --git a/tests/unit/test_dataset.py b/tests/unit/test_dataset.py
index 56baaa60d8..951f3f17f8 100644
--- a/tests/unit/test_dataset.py
+++ b/tests/unit/test_dataset.py
@@ -452,8 +452,6 @@ def test_from_recipe_with_supplementary(session, tmp_path):
 
 
 def test_from_recipe_with_skip_supplementary(session, tmp_path):
-    session['use_legacy_supplementaries'] = False
-
     recipe_txt = textwrap.dedent("""
 
     datasets:
@@ -501,7 +499,6 @@ def test_from_recipe_with_skip_supplementary(session, tmp_path):
 
 def test_from_recipe_with_automatic_supplementary(session, tmp_path,
                                                   monkeypatch):
-    session['use_legacy_supplementaries'] = False
 
     def _find_files(self):
         if self.facets['short_name'] == 'areacello':
@@ -1165,6 +1162,24 @@ def test_remove_not_found_supplementaries():
     assert len(dataset.supplementaries) == 0
 
 
+def test_concatenating_historical_and_future_exps(mocker):
+    mocker.patch.object(Dataset, 'files', True)
+    dataset = Dataset(
+        dataset='dataset1',
+        short_name='tas',
+        mip='Amon',
+        frequency='mon',
+        project='CMIP6',
+        exp=['historical', 'ssp585'],
+    )
+    dataset.add_supplementary(short_name='areacella', mip='fx', frequency='fx')
+    dataset._fix_fx_exp()
+
+    assert len(dataset.supplementaries) == 1
+    assert dataset.facets['exp'] == ['historical', 'ssp585']
+    assert dataset.supplementaries[0].facets['exp'] == 'historical'
+
+
 def test_from_recipe_with_glob(tmp_path, session, mocker):
     recipe_txt = textwrap.dedent("""
 
@@ -1684,7 +1699,6 @@ def mock_preprocess(items, step, input_files, output_file, debug,
 
     load_args = {
         'load': {
-            'callback': 'default',
             'ignore_warnings': None,
         },
         'fix_file': {
@@ -1741,7 +1755,9 @@ def mock_preprocess(items, step, input_files, output_file, debug,
             'short_name': 'chl',
             'frequency': 'yr',
         },
-        'concatenate': {},
+        'concatenate': {
+            'check_level': CheckLevels.DEFAULT,
+        },
         'add_supplementary_variables': {
             'supplementary_cubes': [],
         },