diff --git a/.github/python/find_changed_files.py b/.github/python/find_changed_files.py
new file mode 100644
index 0000000..a96fc7c
--- /dev/null
+++ b/.github/python/find_changed_files.py
@@ -0,0 +1,233 @@
+#!/usr/bin/env python
+
+# This script is used to identify *.nf.test files for changed functions/processs/workflows/pipelines and *.nf-test files
+# with changed dependencies, then return as a JSON list
+
+import argparse
+import json
+import logging
+import re
+
+from itertools import chain
+from pathlib import Path
+from git import Repo
+
+
+def parse_args() -> argparse.Namespace:
+    """
+    Parse command line arguments and return an ArgumentParser object.
+
+    Returns:
+        argparse.ArgumentParser: The ArgumentParser object with the parsed arguments.
+    """
+    parser = argparse.ArgumentParser(
+        description="Scan *.nf.test files for function/process/workflow name and return as a JSON list"
+    )
+    parser.add_argument(
+        "-r",
+        "--head_ref",
+        required=True,
+        help="Head reference branch (Source branch for a PR).",
+    )
+    parser.add_argument(
+        "-b",
+        "--base_ref",
+        required=True,
+        help="Base reference branch (Target branch for a PR).",
+    )
+    parser.add_argument(
+        "-i",
+        "--ignored_files",
+        nargs="+",
+        default=[".git",
+        ".gitpod.yml",
+        ".prettierignore",
+        ".prettierrc.yml",
+        ".md",
+        ".png",
+        "modules.json",
+        "pyproject.toml",
+        "tower.yml"],
+        help="List of files or file substrings to ignore.",
+    )
+    parser.add_argument(
+        "-l",
+        "--log-level",
+        choices=["DEBUG", "INFO", "WARNING", "ERROR"],
+        default="INFO",
+        help="Logging level",
+    )
+    parser.add_argument(
+        "-t",
+        "--types",
+        nargs="+",
+        choices=["function", "process", "workflow", "pipeline"],
+        default=["function", "process", "workflow", "pipeline"],
+        help="Types of tests to include.",
+    )
+    return parser.parse_args()
+
+
+def find_files(branch1: str, branch2: str, ignore: list[str]) -> list[Path]:
+    """
+    Find all *.nf.tests that are associated with files that have been changed between two specified branches.
+
+    Args:
+        branch1 (str)   : The first branch being compared
+        branch2 (str)   : The second branch being compared
+        ignore  (list)  : List of files or file substrings to ignore.
+
+    Returns:
+        list: List of files matching the pattern *.nf.test.
+    """
+    # create repo
+    repo = Repo(".")
+    # identify commit on branch1
+    branch1_commit = repo.commit(branch1)
+    # identify commit on branch2
+    branch2_commit = repo.commit(branch2)
+    # compare two branches
+    diff_index = branch1_commit.diff(branch2_commit)
+    # collect changed files
+    changed_files = []
+    for file in diff_index:
+        changed_files.append(file.a_path)
+    # remove ignored files
+    for file in changed_files:
+        for ignored_substring in ignore:
+            if ignored_substring in file:
+                changed_files.remove(file)
+
+    # this is a bit clunky
+    result = []
+    for path in changed_files:
+        path_obj = Path(path)
+        # If Path is the exact nf-test file add to list:
+        if path_obj.match("*.nf.test"):
+            result.append(str(path_obj))
+        # Else recursively search for nf-test files:
+        else:
+            for file in path_obj.rglob("*.nf.test"):
+                result.append(str(file))
+    return result
+
+
+def process_files(files: list[Path]) -> list[str]:
+    """
+    Process the files and return lines that begin with 'workflow', 'process', or 'function' and have a single string afterwards.
+
+    Args:
+        files (list): List of files to process.
+
+    Returns:
+        list: List of lines that match the criteria.
+    """
+    result = []
+    for file in files:
+        with open(file, "r") as f:
+            is_pipeline_test = True
+            lines = f.readlines()
+            for line in lines:
+                line = line.strip()
+                if line.startswith(("workflow", "process", "function")):
+                    words = line.split()
+                    if len(words) == 2 and re.match(r'^".*"$', words[1]):
+                        result.append(line)
+                        is_pipeline_test = False
+
+            # If no results included workflow, process or function
+            # Add a dummy result to fill the 'pipeline' category
+            if is_pipeline_test:
+                result.append("pipeline 'PIPELINE'")
+
+    return result
+
+
+def generate(
+    lines: list[str], types: list[str] = ["function", "process", "workflow", "pipeline"]
+) -> dict[str, list[str]]:
+    """
+    Generate a dictionary of function, process and workflow lists from the lines.
+
+    Args:
+        lines (list): List of lines to process.
+        types (list): List of types to include.
+
+    Returns:
+        dict: Dictionary with function, process and workflow lists.
+    """
+    result: dict[str, list[str]] = {
+        "function": [],
+        "process": [],
+        "workflow": [],
+        "pipeline": [],
+    }
+    for line in lines:
+        words = line.split()
+        if len(words) == 2:
+            keyword = words[0]
+            name = words[1].strip("'\"")  # Strip both single and double quotes
+            if keyword in types:
+                result[keyword].append(name)
+    return result
+
+
+def find_changed_dependencies(paths: list[str], tags: list[str]) -> list[Path]:
+    """
+    Find all *.nf.test files with changed dependencies from a list of paths.
+
+    Args:
+        paths (list): List of directories or files to scan.
+        tags: List of tags identified as having changes.
+
+    Returns:
+        list: List of *.nf.test files with changed dependencies.
+    """
+    # this is a bit clunky
+    result = []
+    for path in paths:
+        path_obj = Path(path)
+        # find all *.nf-test files
+        nf_test_files = []
+        for file in path_obj.rglob("*.nf.test"):
+            nf_test_files.append(file)
+        # find nf-test files with changed dependencies
+        for nf_test_file in nf_test_files:
+            with open(nf_test_file, "r") as f:
+                lines = f.readlines()
+                for line in lines:
+                    line = line.strip()
+                    if line.startswith("tag"):
+                        words = line.split()
+                        if len(words) == 2 and re.match(r'^".*"$', words[1]):
+                            name = words[1].strip("'\"")  # Strip both single and double quotes
+                            if name in tags:
+                                result.append(str(nf_test_file))
+
+    return list(set(result))
+
+if __name__ == "__main__":
+
+    # Utility stuff
+    args = parse_args()
+    logging.basicConfig(level=args.log_level)
+
+    # Parse nf-test files for target test tags
+    files = find_files(args.head_ref, args.base_ref, args.ignored_files)
+    lines = process_files(files)
+    result = generate(lines)
+
+    # Get only relevant results (specified by -t)
+    # Unique using a set
+    target_results = list(
+        {item for sublist in map(result.get, args.types) for item in sublist}
+    )
+
+    # Parse files to identify nf-tests with changed dependencies
+    changed_dep_files = find_changed_dependencies(".", target_results)
+
+    # Combine target nf-test files and nf-test files with changed dependencies
+    all_nf_tests = list(set(changed_dep_files + files))
+
+    # Print to stdout
+    print(json.dumps(all_nf_tests))
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14ad077..663b87f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ on:
 
 env:
   NXF_ANSI_LOG: false
-  NFT_VER: "0.8.3"
+  NFT_VER: "0.8.4"
   NFT_WORKDIR: "~"
   NFT_DIFF: "pdiff"
   NFT_DIFF_ARGS: "--line-numbers --expand-tabs=2"
@@ -27,44 +27,48 @@ jobs:
     name: Check for changes
     runs-on: ubuntu-latest
     outputs:
-      # Expose matched filters as job 'tags' output variable
-      tags: ${{ steps.filter.outputs.changes }}
+      nf_test_files: ${{ steps.list.outputs.nf_test_files }}
     steps:
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+          architecture: "x64"
+
       - uses: actions/checkout@v3
-      - name: Combine all tags.yml files
-        id: get_username
-        run: find . -name "tags.yml" -not -path "./.github/*" -exec cat {} + > .github/tags.yml
-      - name: debug
-        run: cat .github/tags.yml
-      - uses: dorny/paths-filter@v2
-        id: filter
         with:
-          filters: ".github/tags.yml"
+          fetch-depth: 0
 
-  define_nxf_versions:
-    name: Choose nextflow versions to test against depending on target branch
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.nxf_versions.outputs.matrix }}
-    steps:
-      - id: nxf_versions
+      - name: Install gitpython find changed files
+        run: |
+          python -m pip install --upgrade pip
+          pip install gitpython
+
+      - name: nf-test list nf_test_files
+        id: list
         run: |
-          if [[ "${{ github.event_name }}" == "pull_request" && "${{ github.base_ref }}" == "dev" && "${{ matrix.NXF_VER }}" != "latest-everything" ]]; then
-            echo matrix='["latest-everything"]' | tee -a $GITHUB_OUTPUT
-          else
-            echo matrix='["latest-everything", "23.04.0"]' | tee -a $GITHUB_OUTPUT
-          fi
+          echo nf_test_files=$(python \
+            .github/python/find_changed_files.py \
+            -t pipeline workflow process \
+            --head_ref ${{ github.sha }} \
+            --base_ref origin/${{ github.base_ref }} \
+          ) >> $GITHUB_OUTPUT
+
+      - name: debug
+        run: |
+          echo ${{ steps.list.outputs.nf_test_files }}
 
   test:
-    name: ${{ matrix.tags }} ${{ matrix.profile }} NF ${{ matrix.NXF_VER }}
-    needs: [changes, define_nxf_versions]
-    if: needs.changes.outputs.tags != '[]'
+    name: ${{ matrix.nf_test_files }} ${{ matrix.profile }} NF-${{ matrix.NXF_VER }}
+    needs: [changes]
+    if: needs.changes.outputs.nf_test_files != '[]'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        NXF_VER: ${{ fromJson(needs.define_nxf_versions.outputs.matrix) }}
-        tags: ["${{ fromJson(needs.changes.outputs.tags) }}"]
+        NXF_VER:
+          - "latest-everything"
+          - "23.04"
+        nf_test_files: ["${{ fromJson(needs.changes.outputs.nf_test_files) }}"]
         profile:
           - "docker"
 
@@ -77,9 +81,6 @@ jobs:
         with:
           version: "${{ matrix.NXF_VER }}"
 
-      - name: Disk space cleanup
-        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
-
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"
@@ -105,9 +106,12 @@ jobs:
           wget -qO- https://code.askimed.com/install/nf-test | bash
           sudo mv nf-test /usr/local/bin/
 
+      - name: Disk space cleanup
+        uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
+
       - name: Run nf-test
         run: |
-          nf-test test --verbose --tag ${{ matrix.tags }} --profile "${{ matrix.profile }}" --junitxml=test.xml --tap=test.tap
+          nf-test test ${{ matrix.nf_test_files }} --verbose --profile "+${{ matrix.profile }}" --junitxml=test.xml --tap=test.tap
 
       - uses: pcolby/tap-summary@v1
         with:
@@ -125,3 +129,21 @@ jobs:
         if: always() # always run even if the previous step fails
         with:
           report_paths: test.xml
+
+  confirm-pass:
+    runs-on: ubuntu-latest
+    needs: [test]
+    if: always()
+    steps:
+      - name: All tests ok
+        if: ${{ !contains(needs.*.result, 'failure') }}
+        run: exit 0
+      - name: One or more tests failed
+        if: ${{ contains(needs.*.result, 'failure') }}
+        run: exit 1
+
+      - name: debug-print
+        if: always()
+        run: |
+          echo "toJSON(needs) = ${{ toJSON(needs) }}"
+          echo "toJSON(needs.*.result) = ${{ toJSON(needs.*.result) }}"
diff --git a/modules.json b/modules.json
index f5fa850..5db56ea 100644
--- a/modules.json
+++ b/modules.json
@@ -37,7 +37,7 @@
                     },
                     "checkv/downloaddatabase": {
                         "branch": "master",
-                        "git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
+                        "git_sha": "56cf5a89c2646ad50195635cf18df4028a6928ce",
                         "installed_by": ["modules"]
                     },
                     "checkv/endtoend": {
diff --git a/modules/local/anicluster/anicalc/tests/main.nf.test b/modules/local/anicluster/anicalc/tests/main.nf.test
index 3b967e1..c60ae12 100644
--- a/modules/local/anicluster/anicalc/tests/main.nf.test
+++ b/modules/local/anicluster/anicalc/tests/main.nf.test
@@ -3,13 +3,8 @@ nextflow_process {
     name "Test process: ANICLUSTER_ANICALC"
     script "../main.nf"
     process "ANICLUSTER_ANICALC"
-    tag "modules"
-    tag "modules_local"
-    tag "anicluster"
-    tag "anicluster_anicalc"
 
-
-    test("['modules_local']['blast_txt']") {
+    test("blast.txt") {
 
         when {
             params {
@@ -17,7 +12,10 @@ nextflow_process {
             }
             process {
                 """
-                input[0] = [ [ id: 'test' ], [ file(params.test_data['modules_local']['blast_txt'], checkIfExists: true) ] ]
+                input[0] = [
+                    [ id: 'test' ],
+                    file(params.test_data['modules_local']['blast_txt'], checkIfExists: true)
+                ]
                 """
             }
         }
@@ -30,7 +28,7 @@ nextflow_process {
         }
     }
 
-    test("['modules_local']['blast_txt'] - stub") {
+    test("blast.txt - stub") {
 
         options "-stub"
 
@@ -40,7 +38,10 @@ nextflow_process {
             }
             process {
                 """
-                input[0] = [ [ id: 'test' ], [ file(params.test_data['modules_local']['blast_txt'], checkIfExists: true) ] ]
+                input[0] = [
+                    [ id: 'test' ],
+                    file(params.test_data['modules_local']['blast_txt'], checkIfExists: true)
+                ]
                 """
             }
         }
diff --git a/modules/nf-core/checkv/downloaddatabase/environment.yml b/modules/nf-core/checkv/downloaddatabase/environment.yml
new file mode 100644
index 0000000..9dfdcd1
--- /dev/null
+++ b/modules/nf-core/checkv/downloaddatabase/environment.yml
@@ -0,0 +1,7 @@
+name: checkv_downloaddatabase
+channels:
+  - conda-forge
+  - bioconda
+  - defaults
+dependencies:
+  - bioconda::checkv=1.0.1
diff --git a/modules/nf-core/checkv/downloaddatabase/main.nf b/modules/nf-core/checkv/downloaddatabase/main.nf
index bc5086f..8e0bf86 100644
--- a/modules/nf-core/checkv/downloaddatabase/main.nf
+++ b/modules/nf-core/checkv/downloaddatabase/main.nf
@@ -1,7 +1,7 @@
 process CHECKV_DOWNLOADDATABASE {
     label 'process_low'
 
-    conda "bioconda::checkv=1.0.1"
+    conda "${moduleDir}/environment.yml"
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/checkv:1.0.1--pyhdfd78af_0':
         'biocontainers/checkv:1.0.1--pyhdfd78af_0' }"
@@ -20,7 +20,31 @@ process CHECKV_DOWNLOADDATABASE {
     """
     checkv download_database \\
         $args \\
-        ./$prefix/  \\
+        ./$prefix/
+
+    cat <<-END_VERSIONS > versions.yml
+    "${task.process}":
+        checkv: \$(checkv -h 2>&1  | sed -n 's/^.*CheckV v//; s/: assessing.*//; 1p')
+    END_VERSIONS
+    """
+
+    stub:
+    def args = task.ext.args ?: ''
+    prefix = task.ext.prefix ?: "checkv_db"
+
+    """
+    mkdir ${prefix}
+    touch ${prefix}/README.txt
+    mkdir ${prefix}/genome_db
+    touch ${prefix}/genome_db/changelog.tsv
+    touch ${prefix}/genome_db/checkv_error.tsv
+    touch ${prefix}/genome_db/checkv_info.tsv
+    touch ${prefix}/genome_db/checkv_reps.faa
+    touch ${prefix}/genome_db/checkv_reps.fna
+    touch ${prefix}/genome_db/checkv_reps.tsv
+    mkdir ${prefix}/hmm_db
+    touch ${prefix}/hmm_db/checkv_hmms.tsv
+    touch ${prefix}/hmm_db/genome_lengths.tsv
 
     cat <<-END_VERSIONS > versions.yml
     "${task.process}":
diff --git a/modules/nf-core/checkv/downloaddatabase/meta.yml b/modules/nf-core/checkv/downloaddatabase/meta.yml
index 739a1a9..1ca5415 100644
--- a/modules/nf-core/checkv/downloaddatabase/meta.yml
+++ b/modules/nf-core/checkv/downloaddatabase/meta.yml
@@ -1,5 +1,4 @@
 name: "checkv_downloaddatabase"
-
 description: Construct the database necessary for checkv's quality assessment
 keywords:
   - checkv
@@ -20,18 +19,17 @@ tools:
       documentation: https://bitbucket.org/berkeleylab/checkv/src/master/
       tool_dev_url: https://bitbucket.org/berkeleylab/checkv/src/master/
       doi: "10.1038/s41587-020-00774-7"
-      licence: "['BSD License']"
-
+      licence: ["BSD License"]
 output:
   - versions:
       type: file
       description: File containing software versions
       pattern: "versions.yml"
-
   - checkv_db:
       type: directory
       description: directory pointing to database
       pattern: "${prefix}/"
-
 authors:
   - "@Joon-Klaps"
+maintainers:
+  - "@Joon-Klaps"
diff --git a/modules/nf-core/checkv/downloaddatabase/tests/main.nf.test b/modules/nf-core/checkv/downloaddatabase/tests/main.nf.test
new file mode 100644
index 0000000..95f8923
--- /dev/null
+++ b/modules/nf-core/checkv/downloaddatabase/tests/main.nf.test
@@ -0,0 +1,35 @@
+nextflow_process {
+
+    name "Test Process CHECKV_DOWNLOADDATABASE"
+    script "../main.nf"
+    process "CHECKV_DOWNLOADDATABASE"
+    config "./nextflow.config"
+
+    tag "modules"
+    tag "modules_nfcore"
+    tag "checkv"
+    tag "checkv/downloaddatabase"
+
+    test("No input: download only") {
+
+        then {
+            assertAll(
+                { assert process.success },
+                { assert snapshot(process.out.versions).match() }
+            )
+        }
+    }
+
+    test("No input: download only - stub") {
+
+        options "-stub"
+
+        then {
+            assertAll(
+                { assert process.success },
+                { assert snapshot(process.out.versions).match() }
+            )
+        }
+    }
+
+}
diff --git a/modules/nf-core/checkv/downloaddatabase/tests/main.nf.test.snap b/modules/nf-core/checkv/downloaddatabase/tests/main.nf.test.snap
new file mode 100644
index 0000000..6644657
--- /dev/null
+++ b/modules/nf-core/checkv/downloaddatabase/tests/main.nf.test.snap
@@ -0,0 +1,18 @@
+{
+    "No input: download only - stub": {
+        "content": [
+            [
+                "versions.yml:md5,29c4fbe7a6cb8b6c0913363d718cce9f"
+            ]
+        ],
+        "timestamp": "2024-01-17T16:40:56.505431212"
+    },
+    "No input: download only": {
+        "content": [
+            [
+                "versions.yml:md5,29c4fbe7a6cb8b6c0913363d718cce9f"
+            ]
+        ],
+        "timestamp": "2023-12-11T16:24:08.049483097"
+    }
+}
\ No newline at end of file
diff --git a/modules/nf-core/checkv/downloaddatabase/tests/nextflow.config b/modules/nf-core/checkv/downloaddatabase/tests/nextflow.config
new file mode 100644
index 0000000..3ae5aa1
--- /dev/null
+++ b/modules/nf-core/checkv/downloaddatabase/tests/nextflow.config
@@ -0,0 +1,2 @@
+docker.fixOwnership = false
+docker.runOptions = '-u $(id -u):$(id -g)'
diff --git a/modules/nf-core/checkv/downloaddatabase/tests/tags.yml b/modules/nf-core/checkv/downloaddatabase/tests/tags.yml
new file mode 100644
index 0000000..23d750a
--- /dev/null
+++ b/modules/nf-core/checkv/downloaddatabase/tests/tags.yml
@@ -0,0 +1,2 @@
+checkv/downloaddatabase:
+  - "modules/nf-core/checkv/downloaddatabase/**"