diff --git a/modules/ataqv/ataqv/main.nf b/modules/ataqv/ataqv/main.nf
index 20525e85..fbd623f4 100644
--- a/modules/ataqv/ataqv/main.nf
+++ b/modules/ataqv/ataqv/main.nf
@@ -5,7 +5,7 @@ process ATAQV_ATAQV {
     conda (params.enable_conda ? "bioconda::ataqv=1.2.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/ataqv:1.2.1--py39ha23c084_2' :
-        'quay.io/biocontainers/ataqv:1.2.1--py36hfdecbe1_2' }"
+        'quay.io/biocontainers/ataqv:1.2.1--py39ha23c084_2' }"
 
     input:
     tuple val(meta), path(bam), path(bai), path(peak_file)
diff --git a/modules/bcftools/index/main.nf b/modules/bcftools/index/main.nf
index 0cdebf31..ba6b9639 100644
--- a/modules/bcftools/index/main.nf
+++ b/modules/bcftools/index/main.nf
@@ -13,7 +13,7 @@ process BCFTOOLS_INDEX {
     output:
     tuple val(meta), path("*.csi"), optional:true, emit: csi
     tuple val(meta), path("*.tbi"), optional:true, emit: tbi
-    path "versions.yml"          , emit: version
+    path "versions.yml"           , emit: versions
 
     script:
     def args = task.ext.args ?: ''
diff --git a/modules/bowtie2/build/main.nf b/modules/bowtie2/build/main.nf
index c0cbcd79..da2e9ed5 100644
--- a/modules/bowtie2/build/main.nf
+++ b/modules/bowtie2/build/main.nf
@@ -5,7 +5,7 @@ process BOWTIE2_BUILD {
     conda (params.enable_conda ? 'bioconda::bowtie2=2.4.4' : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/bowtie2:2.4.4--py39hbb4e92a_0' :
-        'quay.io/biocontainers/bowtie2:2.4.4--py36hd4290be_0' }"
+        'quay.io/biocontainers/bowtie2:2.4.4--py39hbb4e92a_0' }"
 
     input:
     path fasta
diff --git a/modules/cutadapt/main.nf b/modules/cutadapt/main.nf
index 89105715..74c42768 100644
--- a/modules/cutadapt/main.nf
+++ b/modules/cutadapt/main.nf
@@ -5,7 +5,7 @@ process CUTADAPT {
     conda (params.enable_conda ? 'bioconda::cutadapt=3.4' : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/cutadapt:3.4--py39h38f01e4_1' :
-        'quay.io/biocontainers/cutadapt:3.4--py37h73a75cf_1' }"
+        'quay.io/biocontainers/cutadapt:3.4--py39h38f01e4_1' }"
 
     input:
     tuple val(meta), path(reads)
diff --git a/modules/fgbio/fastqtobam/main.nf b/modules/fgbio/fastqtobam/main.nf
index 126c3dd8..3060d715 100644
--- a/modules/fgbio/fastqtobam/main.nf
+++ b/modules/fgbio/fastqtobam/main.nf
@@ -13,7 +13,7 @@ process FGBIO_FASTQTOBAM {
 
     output:
     tuple val(meta), path("*_umi_converted.bam"), emit: umibam
-    path "versions.yml"                         , emit: version
+    path "versions.yml"                         , emit: versions
 
     script:
     def args = task.ext.args ?: ''
diff --git a/modules/gtdbtk/classifywf/main.nf b/modules/gtdbtk/classifywf/main.nf
index 4a4b3a01..009efa8d 100644
--- a/modules/gtdbtk/classifywf/main.nf
+++ b/modules/gtdbtk/classifywf/main.nf
@@ -2,6 +2,7 @@ def VERSION = '1.5.0' // Version information not provided by tool on CLI
 
 process GTDBTK_CLASSIFYWF {
     tag "${meta.assembler}-${meta.id}"
+    label 'process_medium'
 
     conda (params.enable_conda ? "bioconda::gtdbtk=1.5.0" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
diff --git a/modules/idr/main.nf b/modules/idr/main.nf
index 44b07be4..7e377878 100644
--- a/modules/idr/main.nf
+++ b/modules/idr/main.nf
@@ -5,7 +5,7 @@ process IDR {
     conda (params.enable_conda ? "bioconda::idr=2.0.4.2" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/idr:2.0.4.2--py39hcbe4a3b_5' :
-        'quay.io/biocontainers/idr:2.0.4.2--py38h9af456f_5' }"
+        'quay.io/biocontainers/idr:2.0.4.2--py39hcbe4a3b_5' }"
 
     input:
     path peaks
diff --git a/modules/jupyternotebook/main.nf b/modules/jupyternotebook/main.nf
index e4bdf98b..871d6ccd 100644
--- a/modules/jupyternotebook/main.nf
+++ b/modules/jupyternotebook/main.nf
@@ -9,7 +9,7 @@ process JUPYTERNOTEBOOK {
     //ipykernel, jupytext, papermill and nbconvert Python packages.
     conda (params.enable_conda ? "ipykernel=6.0.3 jupytext=1.11.4 nbconvert=6.1.0 papermill=2.3.3 matplotlib=3.4.2" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/mulled-v2-514b1a5d280c7043110b2a8d0a87b57ba392a963%3A879972fc8bdc81ee92f2bce3b4805d89a772bf84-0' :
+        'https://depot.galaxyproject.org/singularity/mulled-v2-514b1a5d280c7043110b2a8d0a87b57ba392a963:879972fc8bdc81ee92f2bce3b4805d89a772bf84-0' :
         'quay.io/biocontainers/mulled-v2-514b1a5d280c7043110b2a8d0a87b57ba392a963:879972fc8bdc81ee92f2bce3b4805d89a772bf84-0' }"
 
     input:
diff --git a/modules/krona/kronadb/main.nf b/modules/krona/kronadb/main.nf
index ca7fc3d3..d8156035 100644
--- a/modules/krona/kronadb/main.nf
+++ b/modules/krona/kronadb/main.nf
@@ -8,8 +8,6 @@ process KRONA_KRONADB {
         'https://depot.galaxyproject.org/singularity/krona:2.7.1--pl526_5' :
         'quay.io/biocontainers/krona:2.7.1--pl526_5' }"
 
-    input:
-
     output:
     path 'taxonomy/taxonomy.tab', emit: db
     path "versions.yml"         , emit: versions
diff --git a/modules/malt/run/main.nf b/modules/malt/run/main.nf
index 8b8f05cc..5e81667e 100644
--- a/modules/malt/run/main.nf
+++ b/modules/malt/run/main.nf
@@ -1,6 +1,5 @@
 process MALT_RUN {
-
-    label 'process_high_memory'
+    label 'process_high'
 
     conda (params.enable_conda ? "bioconda::malt=0.53" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
diff --git a/modules/paraclu/main.nf b/modules/paraclu/main.nf
index 1623ea89..cc16674e 100644
--- a/modules/paraclu/main.nf
+++ b/modules/paraclu/main.nf
@@ -6,7 +6,7 @@ process PARACLU {
 
     conda (params.enable_conda ? "bioconda::paraclu=10" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/paraclu%3A10--h9a82719_1' :
+        'https://depot.galaxyproject.org/singularity/paraclu:10--h9a82719_1' :
         'quay.io/biocontainers/paraclu:10--h9a82719_1' }"
 
     input:
diff --git a/modules/pirate/main.nf b/modules/pirate/main.nf
index 70de52e6..c7d7476c 100644
--- a/modules/pirate/main.nf
+++ b/modules/pirate/main.nf
@@ -4,7 +4,7 @@ process PIRATE {
 
     conda (params.enable_conda ? "bioconda::pirate=1.0.4" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/pirate%3A1.0.4--hdfd78af_1' :
+        'https://depot.galaxyproject.org/singularity/pirate:1.0.4--hdfd78af_1' :
         'quay.io/biocontainers/pirate:1.0.4--hdfd78af_1' }"
 
     input:
diff --git a/modules/porechop/main.nf b/modules/porechop/main.nf
index 249efad9..f5ad93f8 100644
--- a/modules/porechop/main.nf
+++ b/modules/porechop/main.nf
@@ -5,7 +5,7 @@ process PORECHOP {
     conda (params.enable_conda ? "bioconda::porechop=0.2.4" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
         'https://depot.galaxyproject.org/singularity/porechop:0.2.4--py39h7cff6ad_2' :
-        'quay.io/biocontainers/porechop:0.2.4--py38h8c62d01_2' }"
+        'quay.io/biocontainers/porechop:0.2.4--py39h7cff6ad_2' }"
 
     input:
     tuple val(meta), path(reads)
diff --git a/modules/rmarkdownnotebook/main.nf b/modules/rmarkdownnotebook/main.nf
index f8183216..18d8e150 100644
--- a/modules/rmarkdownnotebook/main.nf
+++ b/modules/rmarkdownnotebook/main.nf
@@ -9,7 +9,7 @@ process RMARKDOWNNOTEBOOK {
     //yaml and rmarkdown R packages.
     conda (params.enable_conda ? "r-base=4.1.0 r-rmarkdown=2.9 r-yaml=2.2.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/mulled-v2-31ad840d814d356e5f98030a4ee308a16db64ec5%3A0e852a1e4063fdcbe3f254ac2c7469747a60e361-0' :
+        'https://depot.galaxyproject.org/singularity/mulled-v2-31ad840d814d356e5f98030a4ee308a16db64ec5:0e852a1e4063fdcbe3f254ac2c7469747a60e361-0' :
         'quay.io/biocontainers/mulled-v2-31ad840d814d356e5f98030a4ee308a16db64ec5:0e852a1e4063fdcbe3f254ac2c7469747a60e361-0' }"
 
     input:
diff --git a/modules/spatyper/main.nf b/modules/spatyper/main.nf
index e0ba8d13..d04fd265 100644
--- a/modules/spatyper/main.nf
+++ b/modules/spatyper/main.nf
@@ -4,7 +4,7 @@ process SPATYPER {
 
     conda (params.enable_conda ? "bioconda::spatyper=0.3.3" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/spatyper%3A0.3.3--pyhdfd78af_3' :
+        'https://depot.galaxyproject.org/singularity/spatyper:0.3.3--pyhdfd78af_3' :
         'quay.io/biocontainers/spatyper:0.3.3--pyhdfd78af_3' }"
 
     input:
diff --git a/tests/config/pytest_modules.yml b/tests/config/pytest_modules.yml
index 9ebaa99a..5088d85a 100644
--- a/tests/config/pytest_modules.yml
+++ b/tests/config/pytest_modules.yml
@@ -282,6 +282,14 @@ cellranger/gtf:
   - modules/cellranger/gtf/**
   - tests/modules/cellranger/gtf/**
 
+cellranger/mkfastq:
+  - modules/cellranger/mkfastq/**
+  - tests/modules/cellranger/mkfastq/**
+
+cellranger/mkgtf:
+  - modules/cellranger/mkgtf/**
+  - tests/modules/cellranger/mkgtf/**
+
 cellranger/mkref:
   - modules/cellranger/mkref/**
   - tests/modules/cellranger/mkref/**