diff --git a/modules/antismash/antismashlite/main.nf b/modules/antismash/antismashlite/main.nf
new file mode 100644
index 00000000..fb003a30
--- /dev/null
+++ b/modules/antismash/antismashlite/main.nf
@@ -0,0 +1,68 @@
+process ANTISMASH_ANTISMASHLITE {
+    tag "$meta.id"
+    label 'process_medium'
+
+    conda (params.enable_conda ? "bioconda::antismash-lite=6.0.1" : null)
+    container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
+        'https://depot.galaxyproject.org/singularity/antismash-lite:6.0.1--pyhdfd78af_1' :
+        'quay.io/biocontainers/antismash-lite:6.0.1--pyhdfd78af_1' }"
+
+    containerOptions {
+        workflow.containerEngine == 'singularity' ?
+        "-B $antismash_dir:/usr/local/lib/python3.8/site-packages/antismash" :
+        workflow.containerEngine == 'docker' ?
+        "-v \$PWD/$antismash_dir:/usr/local/lib/python3.8/site-packages/antismash" :
+        ''
+        }
+
+    input:
+    tuple val(meta), path(sequence_input)
+    path(databases)
+    path(antismash_dir) // Optional input: AntiSMASH installation folder. It is not needed for using this module with conda, but required for docker/singularity (see meta.yml).
+    path(gff)
+
+    output:
+    tuple val(meta), path("${prefix}/clusterblast/*_c*.txt")                 , optional: true, emit: clusterblast_file
+    tuple val(meta), path("${prefix}/{css,images,js}")                       , emit: html_accessory_files
+    tuple val(meta), path("${prefix}/knownclusterblast/region*/ctg*.html")   , optional: true, emit: knownclusterblast_html
+    tuple val(meta), path("${prefix}/knownclusterblast/*_c*.txt")            , optional: true, emit: knownclusterblast_txt
+    tuple val(meta), path("${prefix}/svg/clusterblast*.svg")                 , optional: true, emit: svg_files_clusterblast
+    tuple val(meta), path("${prefix}/svg/knownclusterblast*.svg")            , optional: true, emit: svg_files_knownclusterblast
+    tuple val(meta), path("${prefix}/*.gbk")                                 , emit: gbk_input
+    tuple val(meta), path("${prefix}/*.json")                                , emit: json_results
+    tuple val(meta), path("${prefix}/*.log")                                 , emit: log
+    tuple val(meta), path("${prefix}/*.zip")                                 , emit: zip
+    tuple val(meta), path("${prefix}/*region*.gbk")                          , emit: gbk_results
+    tuple val(meta), path("${prefix}/clusterblastoutput.txt")                , optional: true, emit: clusterblastoutput
+    tuple val(meta), path("${prefix}/index.html")                            , emit: html
+    tuple val(meta), path("${prefix}/knownclusterblastoutput.txt")           , optional: true, emit: knownclusterblastoutput
+    tuple val(meta), path("${prefix}/regions.js")                            , emit: json_sideloading
+    path "versions.yml"                                                      , emit: versions
+
+    when:
+    task.ext.when == null || task.ext.when
+
+    script:
+    def args = task.ext.args ?: ''
+    prefix = task.ext.suffix ? "${meta.id}${task.ext.suffix}" : "${meta.id}"
+    gff_flag = "--genefinding-gff3 ${gff}"
+
+    """
+    ## We specifically do not include annotations (--genefinding-tool none) as
+    ## this should be run as a separate module for versioning purposes
+    antismash \\
+        $args \\
+        $gff_flag \\
+        -c $task.cpus \\
+        --output-dir $prefix \\
+        --genefinding-tool none \\
+        --logfile $prefix/${prefix}.log \\
+        --databases $databases \\
+        $sequence_input
+
+    cat <<-END_VERSIONS > versions.yml
+    "${task.process}":
+        antismash-lite: \$(antismash --version | sed 's/antiSMASH //')
+    END_VERSIONS
+    """
+}
diff --git a/modules/antismash/antismashlite/meta.yml b/modules/antismash/antismashlite/meta.yml
new file mode 100644
index 00000000..b3e8564e
--- /dev/null
+++ b/modules/antismash/antismashlite/meta.yml
@@ -0,0 +1,128 @@
+name: antismash_antismashlite
+description: |
+  antiSMASH allows the rapid genome-wide identification, annotation
+  and analysis of secondary metabolite biosynthesis gene clusters.
+keywords:
+  - secondary metabolites
+  - BGC
+  - biosynthetic gene cluster
+  - genome mining
+  - NRPS
+  - RiPP
+  - antibiotics
+  - prokaryotes
+  - bacteria
+  - eukaryotes
+  - fungi
+  - antismash
+
+tools:
+  - antismashlite:
+      description: "antiSMASH - the antibiotics and Secondary Metabolite Analysis SHell"
+      homepage: "https://docs.antismash.secondarymetabolites.org"
+      documentation: "https://docs.antismash.secondarymetabolites.org"
+      tool_dev_url: "https://github.com/antismash/antismash"
+      doi: "10.1093/nar/gkab335"
+      licence: "['AGPL v3']"
+
+input:
+  - meta:
+      type: map
+      description: |
+        Groovy Map containing sample information
+        e.g. [ id:'test', single_end:false ]
+  - sequence_input:
+      type: file
+      description: nucleotide sequence file (annotated)
+      pattern: "*.{gbk, gb, gbff, genbank, embl, fasta, fna}"
+  - databases:
+      type: directory
+      description: downloaded AntiSMASH databases e.g. data/databases
+      pattern: "*/"
+  - antismash_dir:
+      type: directory
+      description: |
+        A local copy of an AntiSMASH installation folder. This is required when running with
+        docker and singularity (not required for conda), due to attempted 'modifications' of
+        files during database checks in the installation directory, something that cannot
+        be done in immutable docker/singularity containers. Therefore, a local installation
+        directory needs to be mounted (including all modified files from the downloading step)
+        to the container as a workaround.
+      pattern: "*/"
+  - gff:
+      type: file
+      pattern: "*.gff"
+
+output:
+  - meta:
+      type: map
+      description: |
+        Groovy Map containing sample information
+        e.g. [ id:'test', single_end:false ]
+  - versions:
+      type: file
+      description: File containing software versions
+      pattern: "versions.yml"
+  - clusterblast_file:
+      type: file
+      description: Output of ClusterBlast algorithm
+      pattern: "clusterblast/*_c*.txt"
+  - html_accessory_files:
+      type: directory
+      description: Accessory files for the HTML output
+      pattern: "{css/,images/,js/}"
+  - knownclusterblast_html:
+      type: file
+      description: Tables with MIBiG hits in HTML format
+      pattern: "knownclusterblast/region*/ctg*.html"
+  - knownclusterblast_txt:
+      type: file
+      description: Tables with MIBiG hits
+      pattern: "knownclusterblast/*_c*.txt"
+  - svg_files_clusterblast:
+      type: file
+      description: SVG images showing the % identity of the aligned hits against their queries
+      pattern: "svg/clusterblast*.svg"
+  - svg_files_knownclusterblast:
+      type: file
+      description: SVG images showing the % identity of the aligned hits against their queries
+      pattern: "svg/knownclusterblast*.svg"
+  - gbk_input:
+      type: file
+      description: Nucleotide sequence and annotations in GenBank format; converted from input file
+      pattern: "*.gbk"
+  - json_results:
+      type: file
+      description: Nucleotide sequence and annotations in JSON format; converted from GenBank file (gbk_input)
+      pattern: "*.json"
+  - log:
+      type: file
+      description: Contains all the logging output that antiSMASH produced during its run
+      pattern: "*.log"
+  - zip:
+      type: file
+      description: Contains a compressed version of the output folder in zip format
+      pattern: "*.zip"
+  - gbk_results:
+      type: file
+      description: Nucleotide sequence and annotations in GenBank format; one file per antiSMASH hit
+      pattern: "*region*.gbk"
+  - clusterblastoutput:
+      type: file
+      description: Raw BLAST output of known clusters previously predicted by antiSMASH using the built-in ClusterBlast algorithm
+      pattern: "clusterblastoutput.txt"
+  - html:
+      type: file
+      description: Graphical web view of results in HTML format
+      patterN: "index.html"
+  - knownclusterblastoutput:
+      type: file
+      description: Raw BLAST output of known clusters of the MIBiG database
+      pattern: "knownclusterblastoutput.txt"
+  - json_sideloading:
+      type: file
+      description: Sideloaded annotations of protoclusters and/or subregions (see antiSMASH documentation "Annotation sideloading")
+      pattern: "regions.js"
+
+authors:
+  - "@jasmezz"
diff --git a/modules/bowtie2/align/main.nf b/modules/bowtie2/align/main.nf
index e4bb4327..c74e376f 100644
--- a/modules/bowtie2/align/main.nf
+++ b/modules/bowtie2/align/main.nf
@@ -11,6 +11,7 @@ process BOWTIE2_ALIGN {
     tuple val(meta), path(reads)
     path  index
     val   save_unaligned
+    val   sort_bam
 
     output:
     tuple val(meta), path("*.bam")    , emit: bam
@@ -36,8 +37,7 @@ process BOWTIE2_ALIGN {
         reads_args = "-1 ${reads[0]} -2 ${reads[1]}"
     }
 
-    def samtools_command = "samtools view -@ $task.cpus --bam --with-header ${args2} > ${prefix}.bam"
-
+    def samtools_command = sort_bam ? 'sort' : 'view'
 
     """
     INDEX=`find -L ./ -name "*.rev.1.bt2" | sed "s/.rev.1.bt2//"`
@@ -51,7 +51,7 @@ process BOWTIE2_ALIGN {
         $unaligned \\
         $args \\
         2> ${prefix}.bowtie2.log \\
-        | $samtools_command
+        | samtools $samtools_command $args2 --threads $task.cpus -o ${prefix}.bam -
 
     if [ -f ${prefix}.unmapped.fastq.1.gz ]; then
         mv ${prefix}.unmapped.fastq.1.gz ${prefix}.unmapped_1.fastq.gz
diff --git a/modules/bowtie2/align/meta.yml b/modules/bowtie2/align/meta.yml
index f80421ec..c99fa4e3 100644
--- a/modules/bowtie2/align/meta.yml
+++ b/modules/bowtie2/align/meta.yml
@@ -29,6 +29,15 @@ input:
       type: file
       description: Bowtie2 genome index files
       pattern: "*.ebwt"
+  - save_unaligned:
+      type: boolean
+      description: |
+        Save reads that do not map to the reference (true) or discard them (false)
+        (default: false)
+  - sort_bam:
+      type: boolean
+      description: use samtools sort (true) or samtools view (false)
+      pattern: "true or false"
 output:
   - bam:
       type: file
diff --git a/modules/gatk4/applybqsr/main.nf b/modules/gatk4/applybqsr/main.nf
index 7a64dab2..a0e2c45c 100644
--- a/modules/gatk4/applybqsr/main.nf
+++ b/modules/gatk4/applybqsr/main.nf
@@ -2,10 +2,10 @@ process GATK4_APPLYBQSR {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(input), path(input_index), path(bqsr_table), path(intervals)
diff --git a/modules/gatk4/applybqsrspark/main.nf b/modules/gatk4/applybqsrspark/main.nf
index 04303c09..9d7891ba 100644
--- a/modules/gatk4/applybqsrspark/main.nf
+++ b/modules/gatk4/applybqsrspark/main.nf
@@ -2,10 +2,10 @@ process GATK4_APPLYBQSR_SPARK {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.3.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.3.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.3.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(input), path(input_index), path(bqsr_table), path(intervals)
diff --git a/modules/gatk4/applyvqsr/main.nf b/modules/gatk4/applyvqsr/main.nf
index 8b235809..d3da8332 100644
--- a/modules/gatk4/applyvqsr/main.nf
+++ b/modules/gatk4/applyvqsr/main.nf
@@ -2,10 +2,10 @@ process GATK4_APPLYVQSR {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(vcf), path(vcf_tbi), path(recal), path(recal_index), path(tranches)
diff --git a/modules/gatk4/baserecalibrator/main.nf b/modules/gatk4/baserecalibrator/main.nf
index 766a8338..fb26d3da 100644
--- a/modules/gatk4/baserecalibrator/main.nf
+++ b/modules/gatk4/baserecalibrator/main.nf
@@ -2,10 +2,10 @@ process GATK4_BASERECALIBRATOR {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(input), path(input_index), path(intervals)
diff --git a/modules/gatk4/baserecalibratorspark/main.nf b/modules/gatk4/baserecalibratorspark/main.nf
index 70c70181..79988b72 100644
--- a/modules/gatk4/baserecalibratorspark/main.nf
+++ b/modules/gatk4/baserecalibratorspark/main.nf
@@ -2,10 +2,10 @@ process GATK4_BASERECALIBRATOR_SPARK {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.3.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.3.0--hdfd78af_0' :
-        'broadinstitute/gatk:4.2.3.0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(input), path(input_index), path(intervals)
diff --git a/modules/gatk4/bedtointervallist/main.nf b/modules/gatk4/bedtointervallist/main.nf
index 118f535b..6224d9b3 100644
--- a/modules/gatk4/bedtointervallist/main.nf
+++ b/modules/gatk4/bedtointervallist/main.nf
@@ -2,10 +2,10 @@ process GATK4_BEDTOINTERVALLIST {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(bed)
diff --git a/modules/gatk4/calculatecontamination/main.nf b/modules/gatk4/calculatecontamination/main.nf
index 197fe6c2..c289684e 100644
--- a/modules/gatk4/calculatecontamination/main.nf
+++ b/modules/gatk4/calculatecontamination/main.nf
@@ -2,10 +2,10 @@ process GATK4_CALCULATECONTAMINATION {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(pileup), path(matched)
diff --git a/modules/gatk4/combinegvcfs/main.nf b/modules/gatk4/combinegvcfs/main.nf
index 45bf4372..db4d9cdb 100644
--- a/modules/gatk4/combinegvcfs/main.nf
+++ b/modules/gatk4/combinegvcfs/main.nf
@@ -2,10 +2,10 @@ process GATK4_COMBINEGVCFS {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(vcf), path(vcf_idx)
diff --git a/modules/gatk4/createsequencedictionary/main.nf b/modules/gatk4/createsequencedictionary/main.nf
index dbf37048..13fa9e81 100644
--- a/modules/gatk4/createsequencedictionary/main.nf
+++ b/modules/gatk4/createsequencedictionary/main.nf
@@ -2,10 +2,10 @@ process GATK4_CREATESEQUENCEDICTIONARY {
     tag "$fasta"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     path fasta
diff --git a/modules/gatk4/createsomaticpanelofnormals/main.nf b/modules/gatk4/createsomaticpanelofnormals/main.nf
index 3df29947..653a9497 100644
--- a/modules/gatk4/createsomaticpanelofnormals/main.nf
+++ b/modules/gatk4/createsomaticpanelofnormals/main.nf
@@ -2,10 +2,10 @@ process GATK4_CREATESOMATICPANELOFNORMALS {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(genomicsdb)
diff --git a/modules/gatk4/estimatelibrarycomplexity/main.nf b/modules/gatk4/estimatelibrarycomplexity/main.nf
index caa34630..46e09a95 100644
--- a/modules/gatk4/estimatelibrarycomplexity/main.nf
+++ b/modules/gatk4/estimatelibrarycomplexity/main.nf
@@ -2,10 +2,10 @@ process GATK4_ESTIMATELIBRARYCOMPLEXITY {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(input)
diff --git a/modules/gatk4/fastqtosam/main.nf b/modules/gatk4/fastqtosam/main.nf
index 199058d0..326d4d58 100644
--- a/modules/gatk4/fastqtosam/main.nf
+++ b/modules/gatk4/fastqtosam/main.nf
@@ -2,10 +2,10 @@ process GATK4_FASTQTOSAM {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(reads)
diff --git a/modules/gatk4/filtermutectcalls/main.nf b/modules/gatk4/filtermutectcalls/main.nf
index c1c82e0b..91f6defa 100644
--- a/modules/gatk4/filtermutectcalls/main.nf
+++ b/modules/gatk4/filtermutectcalls/main.nf
@@ -2,10 +2,10 @@ process GATK4_FILTERMUTECTCALLS {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(vcf), path(vcf_tbi), path(stats), path(orientationbias), path(segmentation), path(table), val(estimate)
diff --git a/modules/gatk4/gatherbqsrreports/main.nf b/modules/gatk4/gatherbqsrreports/main.nf
index 1f5f2e1b..231bd39e 100644
--- a/modules/gatk4/gatherbqsrreports/main.nf
+++ b/modules/gatk4/gatherbqsrreports/main.nf
@@ -2,10 +2,10 @@ process GATK4_GATHERBQSRREPORTS {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(table)
diff --git a/modules/gatk4/gatherpileupsummaries/main.nf b/modules/gatk4/gatherpileupsummaries/main.nf
index f5e9cf22..0b763f41 100644
--- a/modules/gatk4/gatherpileupsummaries/main.nf
+++ b/modules/gatk4/gatherpileupsummaries/main.nf
@@ -2,10 +2,10 @@ process GATK4_GATHERPILEUPSUMMARIES {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
 
     input:
diff --git a/modules/gatk4/genomicsdbimport/main.nf b/modules/gatk4/genomicsdbimport/main.nf
index d2b78899..810f2b63 100644
--- a/modules/gatk4/genomicsdbimport/main.nf
+++ b/modules/gatk4/genomicsdbimport/main.nf
@@ -2,10 +2,10 @@ process GATK4_GENOMICSDBIMPORT {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(vcf), path(tbi), path(interval_file), val(interval_value), path(wspace)
diff --git a/modules/gatk4/genotypegvcfs/main.nf b/modules/gatk4/genotypegvcfs/main.nf
index 0df88d66..11024b1b 100644
--- a/modules/gatk4/genotypegvcfs/main.nf
+++ b/modules/gatk4/genotypegvcfs/main.nf
@@ -2,10 +2,10 @@ process GATK4_GENOTYPEGVCFS {
     tag "$meta.id"
     label 'process_high'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(gvcf), path(gvcf_index), path(intervals), path(intervals_index)
diff --git a/modules/gatk4/getpileupsummaries/main.nf b/modules/gatk4/getpileupsummaries/main.nf
index c0946f71..1c056170 100644
--- a/modules/gatk4/getpileupsummaries/main.nf
+++ b/modules/gatk4/getpileupsummaries/main.nf
@@ -2,10 +2,10 @@ process GATK4_GETPILEUPSUMMARIES {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(input), path(index), path(intervals)
@@ -40,7 +40,7 @@ process GATK4_GETPILEUPSUMMARIES {
         --variant $variants \\
         --output ${prefix}.pileups.table \\
         $reference_command \\
-        $sites_command \\
+        $interval_command \\
         --tmp-dir . \\
         $args
 
diff --git a/modules/gatk4/haplotypecaller/main.nf b/modules/gatk4/haplotypecaller/main.nf
index 2cd9e7d4..6dd3f69e 100644
--- a/modules/gatk4/haplotypecaller/main.nf
+++ b/modules/gatk4/haplotypecaller/main.nf
@@ -2,10 +2,10 @@ process GATK4_HAPLOTYPECALLER {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(input), path(input_index), path(intervals)
diff --git a/modules/gatk4/indexfeaturefile/main.nf b/modules/gatk4/indexfeaturefile/main.nf
index 90ff94e6..264f71ef 100644
--- a/modules/gatk4/indexfeaturefile/main.nf
+++ b/modules/gatk4/indexfeaturefile/main.nf
@@ -2,10 +2,10 @@ process GATK4_INDEXFEATUREFILE {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(feature_file)
diff --git a/modules/gatk4/intervallisttobed/main.nf b/modules/gatk4/intervallisttobed/main.nf
index c0f9df63..84f3c472 100644
--- a/modules/gatk4/intervallisttobed/main.nf
+++ b/modules/gatk4/intervallisttobed/main.nf
@@ -2,10 +2,10 @@ process GATK4_INTERVALLISTTOBED {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(intervals)
diff --git a/modules/gatk4/intervallisttools/main.nf b/modules/gatk4/intervallisttools/main.nf
index 1b9b37f4..7ab26c15 100644
--- a/modules/gatk4/intervallisttools/main.nf
+++ b/modules/gatk4/intervallisttools/main.nf
@@ -2,10 +2,10 @@ process GATK4_INTERVALLISTTOOLS {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(intervals)
diff --git a/modules/gatk4/learnreadorientationmodel/main.nf b/modules/gatk4/learnreadorientationmodel/main.nf
index 717cf211..8c4ac94e 100644
--- a/modules/gatk4/learnreadorientationmodel/main.nf
+++ b/modules/gatk4/learnreadorientationmodel/main.nf
@@ -2,10 +2,10 @@ process GATK4_LEARNREADORIENTATIONMODEL {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(f1r2)
diff --git a/modules/gatk4/markduplicates/main.nf b/modules/gatk4/markduplicates/main.nf
index 058f5755..68e4a21a 100644
--- a/modules/gatk4/markduplicates/main.nf
+++ b/modules/gatk4/markduplicates/main.nf
@@ -2,10 +2,10 @@ process GATK4_MARKDUPLICATES {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(bam)
diff --git a/modules/gatk4/mergebamalignment/main.nf b/modules/gatk4/mergebamalignment/main.nf
index 5c36b4ba..ff51de06 100644
--- a/modules/gatk4/mergebamalignment/main.nf
+++ b/modules/gatk4/mergebamalignment/main.nf
@@ -2,10 +2,10 @@ process GATK4_MERGEBAMALIGNMENT {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(aligned), path(unmapped)
diff --git a/modules/gatk4/mergemutectstats/main.nf b/modules/gatk4/mergemutectstats/main.nf
index 409e06f6..54311df7 100644
--- a/modules/gatk4/mergemutectstats/main.nf
+++ b/modules/gatk4/mergemutectstats/main.nf
@@ -2,10 +2,10 @@ process GATK4_MERGEMUTECTSTATS {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(stats)
diff --git a/modules/gatk4/mergevcfs/main.nf b/modules/gatk4/mergevcfs/main.nf
index 06ff3acb..964c1a3b 100644
--- a/modules/gatk4/mergevcfs/main.nf
+++ b/modules/gatk4/mergevcfs/main.nf
@@ -2,10 +2,10 @@ process GATK4_MERGEVCFS {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(vcf)
diff --git a/modules/gatk4/mutect2/main.nf b/modules/gatk4/mutect2/main.nf
index 9969ad70..abec0d73 100644
--- a/modules/gatk4/mutect2/main.nf
+++ b/modules/gatk4/mutect2/main.nf
@@ -2,10 +2,10 @@ process GATK4_MUTECT2 {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(input), path(input_index), path(intervals)
diff --git a/modules/gatk4/revertsam/main.nf b/modules/gatk4/revertsam/main.nf
index 3084658d..959c3e79 100644
--- a/modules/gatk4/revertsam/main.nf
+++ b/modules/gatk4/revertsam/main.nf
@@ -2,10 +2,10 @@ process GATK4_REVERTSAM {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(bam)
diff --git a/modules/gatk4/samtofastq/main.nf b/modules/gatk4/samtofastq/main.nf
index d8d94d69..de83293a 100644
--- a/modules/gatk4/samtofastq/main.nf
+++ b/modules/gatk4/samtofastq/main.nf
@@ -2,10 +2,10 @@ process GATK4_SAMTOFASTQ {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(bam)
diff --git a/modules/gatk4/selectvariants/main.nf b/modules/gatk4/selectvariants/main.nf
index 22779211..633c21f2 100644
--- a/modules/gatk4/selectvariants/main.nf
+++ b/modules/gatk4/selectvariants/main.nf
@@ -2,10 +2,10 @@ process GATK4_SELECTVARIANTS {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0':
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(vcf), path(vcf_idx)
diff --git a/modules/gatk4/splitintervals/main.nf b/modules/gatk4/splitintervals/main.nf
new file mode 100644
index 00000000..9df66c21
--- /dev/null
+++ b/modules/gatk4/splitintervals/main.nf
@@ -0,0 +1,48 @@
+process GATK4_SPLITINTERVALS {
+    tag "$meta.id"
+    label 'process_low'
+
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
+    container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
+
+    input:
+    tuple val(meta), path(intervals)
+    path(fasta)
+    path(fasta_fai)
+    path(dict)
+
+    output:
+    tuple val(meta), path("**.interval_list"), emit: split_intervals
+    path "versions.yml"                      , emit: versions
+
+    when:
+    task.ext.when == null || task.ext.when
+
+    script:
+    def args = task.ext.args ?: ''
+    def prefix = task.ext.prefix ?: "${meta.id}"
+    def reference = fasta ? "--reference $fasta" : ""
+
+    def avail_mem = 3
+    if (!task.memory) {
+        log.info '[GATK SplitIntervals] Available memory not known - defaulting to 3GB. Specify process memory requirements to change this.'
+    } else {
+        avail_mem = task.memory.giga
+    }
+
+    """
+    gatk --java-options "-Xmx${avail_mem}g" SplitIntervals \\
+        --output ${prefix} \\
+        --intervals $intervals \\
+        $reference \\
+        --tmp-dir . \\
+        $args
+
+    cat <<-END_VERSIONS > versions.yml
+    "${task.process}":
+        gatk4: \$(echo \$(gatk --version 2>&1) | sed 's/^.*(GATK) v//; s/ .*\$//')
+    END_VERSIONS
+    """
+}
diff --git a/modules/gatk4/splitintervals/meta.yml b/modules/gatk4/splitintervals/meta.yml
new file mode 100644
index 00000000..ba557544
--- /dev/null
+++ b/modules/gatk4/splitintervals/meta.yml
@@ -0,0 +1,53 @@
+name: gatk4_splitintervals
+keywords:
+  - interval
+  - bed
+tools:
+  - gatk4:
+      description: Genome Analysis Toolkit (GATK4)
+      homepage: https://gatk.broadinstitute.org/hc/en-us
+      documentation: https://gatk.broadinstitute.org/hc/en-us/categories/360002369672s
+      tool_dev_url: https://github.com/broadinstitute/gatk
+      doi: "10.1158/1538-7445.AM2017-3590"
+      licence: ["BSD-3-clause"]
+
+input:
+  - meta:
+      type: map
+      description: |
+        Groovy Map containing sample information
+        e.g. [ id:'test' ]
+  - interval:
+      type: file
+      description: Interval list or BED
+      pattern: "*.{interval,interval_list,bed}"
+  - fasta:
+      type: file
+      description: Reference FASTA
+      pattern: "*.{fa,fasta}"
+  - fasta_fai:
+      type: file
+      description: Reference FASTA index
+      pattern: "*.fai"
+  - dict:
+      type: file
+      description: Reference sequence dictionary
+      pattern: "*.dict"
+
+output:
+  - meta:
+      type: map
+      description: |
+        Groovy Map containing sample information
+        e.g. [ id:'test' ]
+  - bed:
+      type: file
+      description: A list of scattered interval lists
+      pattern: "*.interval_list"
+  - versions:
+      type: file
+      description: File containing software versions
+      pattern: "versions.yml"
+
+authors:
+  - "@nvnieuwk"
diff --git a/modules/gatk4/splitncigarreads/main.nf b/modules/gatk4/splitncigarreads/main.nf
index 85e5daa8..456ec055 100644
--- a/modules/gatk4/splitncigarreads/main.nf
+++ b/modules/gatk4/splitncigarreads/main.nf
@@ -2,10 +2,10 @@ process GATK4_SPLITNCIGARREADS {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(bam), path(bai), path(intervals)
diff --git a/modules/gatk4/variantfiltration/main.nf b/modules/gatk4/variantfiltration/main.nf
index 6beb87ef..cda06e11 100644
--- a/modules/gatk4/variantfiltration/main.nf
+++ b/modules/gatk4/variantfiltration/main.nf
@@ -2,10 +2,10 @@ process GATK4_VARIANTFILTRATION {
     tag "$meta.id"
     label 'process_medium'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(vcf), path(tbi)
diff --git a/modules/gatk4/variantrecalibrator/main.nf b/modules/gatk4/variantrecalibrator/main.nf
index cdcc1221..120aeade 100644
--- a/modules/gatk4/variantrecalibrator/main.nf
+++ b/modules/gatk4/variantrecalibrator/main.nf
@@ -2,10 +2,10 @@ process GATK4_VARIANTRECALIBRATOR {
     tag "$meta.id"
     label 'process_low'
 
-    conda (params.enable_conda ? "bioconda::gatk4=4.2.5.0" : null)
+    conda (params.enable_conda ? "bioconda::gatk4=4.2.6.1" : null)
     container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
-        'https://depot.galaxyproject.org/singularity/gatk4:4.2.5.0--hdfd78af_0' :
-        'quay.io/biocontainers/gatk4:4.2.5.0--hdfd78af_0' }"
+        'https://depot.galaxyproject.org/singularity/gatk4:4.2.6.1--hdfd78af_0':
+        'quay.io/biocontainers/gatk4:4.2.6.1--hdfd78af_0' }"
 
     input:
     tuple val(meta), path(vcf), path(tbi)
diff --git a/tests/config/pytest_modules.yml b/tests/config/pytest_modules.yml
index 74cc4e1c..68c9efef 100644
--- a/tests/config/pytest_modules.yml
+++ b/tests/config/pytest_modules.yml
@@ -42,6 +42,10 @@ amrfinderplus/update:
   - modules/amrfinderplus/update/**
   - tests/modules/amrfinderplus/update/**
 
+antismash/antismashlite:
+  - modules/antismash/antismashlite/**
+  - tests/modules/antismash/antismashlite/**
+
 antismash/antismashlitedownloaddatabases:
   - modules/antismash/antismashlitedownloaddatabases/**
   - tests/modules/antismash/antismashlitedownloaddatabases/**
@@ -819,6 +823,10 @@ gatk4/selectvariants:
   - modules/gatk4/selectvariants/**
   - tests/modules/gatk4/selectvariants/**
 
+gatk4/splitintervals:
+  - modules/gatk4/splitintervals/**
+  - tests/modules/gatk4/splitintervals/**
+
 gatk4/splitncigarreads:
   - modules/gatk4/splitncigarreads/**
   - tests/modules/gatk4/splitncigarreads/**
diff --git a/tests/modules/antismash/antismashlite/main.nf b/tests/modules/antismash/antismashlite/main.nf
new file mode 100644
index 00000000..2b23c400
--- /dev/null
+++ b/tests/modules/antismash/antismashlite/main.nf
@@ -0,0 +1,46 @@
+#!/usr/bin/env nextflow
+
+nextflow.enable.dsl = 2
+
+include { ANTISMASH_ANTISMASHLITE                  } from '../../../../modules/antismash/antismashlite/main.nf'
+include { ANTISMASH_ANTISMASHLITEDOWNLOADDATABASES } from '../../../modules/antismash/antismashlitedownloaddatabases/main.nf'
+include { GUNZIP as GUNZIP1 } from '../../../../modules/gunzip/main.nf'
+include { GUNZIP as GUNZIP2 } from '../../../../modules/gunzip/main.nf'
+include { UNTAR as UNTAR1 } from '../../../../modules/untar/main.nf'
+include { UNTAR as UNTAR2 } from '../../../../modules/untar/main.nf'
+include { UNTAR as UNTAR3 } from '../../../../modules/untar/main.nf'
+
+workflow test_antismashlite {
+    genome_fna = [
+        [ id:'test' ],
+        file(params.test_data['bacteroides_fragilis']['genome']['genome_fna_gz'], checkIfExists: true)
+    ]
+
+    genome_gff = [
+        [],
+        file(params.test_data['bacteroides_fragilis']['genome']['genome_gff_gz'], checkIfExists: true)
+    ]
+
+    antismash_css = [
+        [],
+        file('https://github.com/nf-core/test-datasets/raw/modules/data/delete_me/antismash/css.tar.gz', checkIfExists: true)
+    ]
+
+    antismash_detection = [
+        [],
+        file('https://github.com/nf-core/test-datasets/raw/modules/data/delete_me/antismash/detection.tar.gz', checkIfExists: true)
+    ]
+
+    antismash_modules = [
+        [],
+        file('https://github.com/nf-core/test-datasets/raw/modules/data/delete_me/antismash/modules.tar.gz', checkIfExists: true)
+    ]
+
+    GUNZIP1 ( genome_fna )
+    GUNZIP2 ( genome_gff )
+    UNTAR1 ( antismash_css )
+    UNTAR2 ( antismash_detection )
+    UNTAR3 ( antismash_modules )
+    ANTISMASH_ANTISMASHLITEDOWNLOADDATABASES ( UNTAR1.out.untar.map{ it[1] },  UNTAR2.out.untar.map{ it[1] }, UNTAR3.out.untar.map{ it[1] } )
+    ANTISMASH_ANTISMASHLITE ( GUNZIP1.out.gunzip, ANTISMASH_ANTISMASHLITEDOWNLOADDATABASES.out.database, ANTISMASH_ANTISMASHLITEDOWNLOADDATABASES.out.antismash_dir, GUNZIP2.out.gunzip.map{ it[1] } )
+}
diff --git a/tests/modules/antismash/antismashlite/nextflow.config b/tests/modules/antismash/antismashlite/nextflow.config
new file mode 100644
index 00000000..50f50a7a
--- /dev/null
+++ b/tests/modules/antismash/antismashlite/nextflow.config
@@ -0,0 +1,5 @@
+process {
+
+    publishDir = { "${params.outdir}/${task.process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()}" }
+    
+}
\ No newline at end of file
diff --git a/tests/modules/antismash/antismashlite/test.yml b/tests/modules/antismash/antismashlite/test.yml
new file mode 100644
index 00000000..4642319c
--- /dev/null
+++ b/tests/modules/antismash/antismashlite/test.yml
@@ -0,0 +1,35 @@
+- name: antismash antismashlite test_antismashlite
+  command: nextflow run tests/modules/antismash/antismashlite -entry test_antismashlite -c tests/config/nextflow.config
+  tags:
+    - antismash/antismashlite
+    - antismash
+  files:
+    - path: output/antismash/test/NZ_CP069563.1.region001.gbk
+      contains: ['/tool="antismash"']
+    - path: output/antismash/test/NZ_CP069563.1.region002.gbk
+      contains: ['/tool="antismash"']
+    - path: output/antismash/test/css/bacteria.css
+      md5sum: 8b3c2f8b143d5245a5f42f55803c532c
+    - path: output/antismash/test/genome.gbk
+      contains: ['/tool="antismash"']
+    - path: output/antismash/test/genome.json
+      contains: ['{"version": "6.0.1", "input_file": "genome.fna", "records": [{"id": "NZ_CP069563.1", "seq": {"data":']
+    - path: output/antismash/test/genome.zip
+    - path: output/antismash/test/index.html
+      md5sum: de787e865c3a1eec143a19d2facb4de4
+    - path: output/antismash/test/js/antismash.js
+      md5sum: 58e90c3d783ae014cc3d51849bcb50a2
+    - path: output/antismash/test/js/jquery.js
+      md5sum: 397754ba49e9e0cf4e7c190da78dda05
+    - path: output/antismash/test/js/jquery.tablesorter.min.js
+      md5sum: 5e9e08cef4d1be0eaa538e6eb28809a7
+    - path: output/antismash/test/regions.js
+      contains: ['"seq_id": "NZ_CP069563.1"']
+    - path: output/antismash/test/test.log
+      contains: ["antiSMASH version: 6.0.1"]
+    - path: output/antismash/versions.yml
+      md5sum: 759431a43da33e2ef8e2d0ebd79a439b
+    - path: output/gunzip1/genome.fna
+      md5sum: dafd38f5454b54fbea38245d773062a5
+    - path: output/gunzip2/genome.gff
+      md5sum: 9b9c848b1946d43fa68128f4d6316052
diff --git a/tests/modules/bowtie2/align/main.nf b/tests/modules/bowtie2/align/main.nf
index 42e2306a..4f08b533 100644
--- a/tests/modules/bowtie2/align/main.nf
+++ b/tests/modules/bowtie2/align/main.nf
@@ -14,9 +14,25 @@ workflow test_bowtie2_align_single_end {
     ]
     fasta = file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)
     save_unaligned = false
+    sort = false
 
     BOWTIE2_BUILD ( fasta )
-    BOWTIE2_ALIGN ( input, BOWTIE2_BUILD.out.index, save_unaligned )
+    BOWTIE2_ALIGN ( input, BOWTIE2_BUILD.out.index, save_unaligned, sort )
+}
+
+workflow test_bowtie2_align_single_end_sorted {
+    input = [
+        [ id:'test', single_end:true ], // meta map
+        [
+            file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true)
+        ]
+    ]
+    fasta = file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)
+    save_unaligned = false
+    sort = true
+
+    BOWTIE2_BUILD ( fasta )
+    BOWTIE2_ALIGN ( input, BOWTIE2_BUILD.out.index, save_unaligned, sort )
 }
 
 workflow test_bowtie2_align_paired_end {
@@ -29,9 +45,26 @@ workflow test_bowtie2_align_paired_end {
     ]
     fasta = file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)
     save_unaligned = false
+    sort = false
 
     BOWTIE2_BUILD ( fasta )
-    BOWTIE2_ALIGN ( input, BOWTIE2_BUILD.out.index, save_unaligned )
+    BOWTIE2_ALIGN ( input, BOWTIE2_BUILD.out.index, save_unaligned, sort )
+}
+
+workflow test_bowtie2_align_paired_end_sorted {
+    input = [
+        [ id:'test', single_end:false ], // meta map
+        [
+            file(params.test_data['sarscov2']['illumina']['test_1_fastq_gz'], checkIfExists: true),
+            file(params.test_data['sarscov2']['illumina']['test_2_fastq_gz'], checkIfExists: true)
+        ]
+    ]
+    fasta = file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)
+    save_unaligned = false
+    sort = true
+
+    BOWTIE2_BUILD ( fasta )
+    BOWTIE2_ALIGN ( input, BOWTIE2_BUILD.out.index, save_unaligned, sort )
 }
 
 workflow test_bowtie2_align_single_end_large_index {
@@ -43,9 +76,10 @@ workflow test_bowtie2_align_single_end_large_index {
     ]
     fasta = file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)
     save_unaligned = false
+    sort = false
 
     BOWTIE2_BUILD ( fasta )
-    BOWTIE2_ALIGN ( input, BOWTIE2_BUILD.out.index, save_unaligned )
+    BOWTIE2_ALIGN ( input, BOWTIE2_BUILD.out.index, save_unaligned, sort )
 }
 
 workflow test_bowtie2_align_paired_end_large_index {
@@ -58,7 +92,8 @@ workflow test_bowtie2_align_paired_end_large_index {
     ]
     fasta = file(params.test_data['sarscov2']['genome']['genome_fasta'], checkIfExists: true)
     save_unaligned = false
+    sort = false
 
     BOWTIE2_BUILD ( fasta )
-    BOWTIE2_ALIGN ( input, BOWTIE2_BUILD.out.index, save_unaligned )
-}
\ No newline at end of file
+    BOWTIE2_ALIGN ( input, BOWTIE2_BUILD.out.index, save_unaligned, sort )
+}
diff --git a/tests/modules/bowtie2/align/test.yml b/tests/modules/bowtie2/align/test.yml
index 103d65e9..9c9ff7a1 100644
--- a/tests/modules/bowtie2/align/test.yml
+++ b/tests/modules/bowtie2/align/test.yml
@@ -8,6 +8,16 @@
     - path: ./output/bowtie2/test.bowtie2.log
     - path: ./output/bowtie2/versions.yml
 
+- name: bowtie2 align test_bowtie2_align_single_end_sorted
+  command: nextflow run ./tests/modules/bowtie2/align -entry test_bowtie2_align_single_end_sorted -c ./tests/config/nextflow.config -c ./tests/modules/bowtie2/align/nextflow.config
+  tags:
+    - bowtie2
+    - bowtie2/align
+  files:
+    - path: ./output/bowtie2/test.bam
+    - path: ./output/bowtie2/test.bowtie2.log
+    - path: ./output/bowtie2/versions.yml
+
 - name: bowtie2 align test_bowtie2_align_paired_end
   command: nextflow run tests/modules/bowtie2/align -entry test_bowtie2_align_paired_end -c tests/config/nextflow.config -c tests/modules/bowtie2/align/nextflow.config
   tags:
diff --git a/tests/modules/gatk4/applybqsr/test.yml b/tests/modules/gatk4/applybqsr/test.yml
index eaf1a08e..c3dd4eef 100644
--- a/tests/modules/gatk4/applybqsr/test.yml
+++ b/tests/modules/gatk4/applybqsr/test.yml
@@ -5,7 +5,7 @@
     - gatk4/applybqsr
   files:
     - path: output/gatk4/test.bam
-      md5sum: d088422be886dc8507ff97fcc7dd968a
+      md5sum: e11b7eaf2034740a953626518e3c3d6e
     - path: output/gatk4/versions.yml
 
 - name: gatk4 applybqsr test_gatk4_applybqsr_intervals
@@ -15,7 +15,7 @@
     - gatk4/applybqsr
   files:
     - path: output/gatk4/test.bam
-      md5sum: 4bfa18d651abd945e240b05e70107716
+      md5sum: e9e9aa753c106e43f936ad573e23d2e6
     - path: output/gatk4/versions.yml
 
 - name: gatk4 applybqsr test_gatk4_applybqsr_cram
@@ -25,5 +25,5 @@
     - gatk4/applybqsr
   files:
     - path: output/gatk4/test.cram
-      md5sum: 2e0bca197af4f043a4a85152e6edbe04
+      md5sum: bca9d234a5d484ce2a6f4826ca2ea308
     - path: output/gatk4/versions.yml
diff --git a/tests/modules/gatk4/applybqsrspark/test.yml b/tests/modules/gatk4/applybqsrspark/test.yml
index d230c000..1e4f8b47 100644
--- a/tests/modules/gatk4/applybqsrspark/test.yml
+++ b/tests/modules/gatk4/applybqsrspark/test.yml
@@ -5,7 +5,7 @@
     - gatk4/applybqsrspark
   files:
     - path: output/gatk4/test.bam
-      md5sum: d088422be886dc8507ff97fcc7dd968a
+      md5sum: 1901c819fcba0fdd5e2482e6dc8285ef
     - path: output/gatk4/versions.yml
 
 - name: gatk4 applybqsr test_gatk4_applybqsr_spark_intervals
@@ -15,7 +15,7 @@
     - gatk4/applybqsrspark
   files:
     - path: output/gatk4/test.bam
-      md5sum: 4bfa18d651abd945e240b05e70107716
+      md5sum: 2ca2446f0125890280056fd7da822732
     - path: output/gatk4/versions.yml
 
 - name: gatk4 applybqsr test_gatk4_applybqsr_spark_cram
@@ -25,5 +25,5 @@
     - gatk4/applybqsrspark
   files:
     - path: output/gatk4/test.cram
-      md5sum: 2e0bca197af4f043a4a85152e6edbe04
+      md5sum: 60f7c822a9f2833e11eb7bfd16e4421f
     - path: output/gatk4/versions.yml
diff --git a/tests/modules/gatk4/combinegvcfs/nextflow.config b/tests/modules/gatk4/combinegvcfs/nextflow.config
index 573cc13e..8730f1c4 100644
--- a/tests/modules/gatk4/combinegvcfs/nextflow.config
+++ b/tests/modules/gatk4/combinegvcfs/nextflow.config
@@ -1,6 +1,5 @@
 process {
 
-    ext.args = "--tmp-dir ."
     publishDir = { "${params.outdir}/${task.process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()}" }
-    
-}
\ No newline at end of file
+
+}
diff --git a/tests/modules/gatk4/genotypegvcfs/main.nf b/tests/modules/gatk4/genotypegvcfs/main.nf
index 75990958..cd7d3a03 100644
--- a/tests/modules/gatk4/genotypegvcfs/main.nf
+++ b/tests/modules/gatk4/genotypegvcfs/main.nf
@@ -65,7 +65,9 @@ workflow test_gatk4_genotypegvcfs_gz_input_intervals {
     input = [ [ id:'test' ], // meta map
             file(params.test_data['homo_sapiens']['illumina']['test_genome_vcf_gz'], checkIfExists: true),
             file(params.test_data['homo_sapiens']['illumina']['test_genome_vcf_gz_tbi'], checkIfExists: true),
-            file(params.test_data['homo_sapiens']['genome']['genome_bed'], checkIfExists: true) ]
+            file(params.test_data['homo_sapiens']['genome']['genome_bed'], checkIfExists: true) ,
+            []
+            ]
 
     fasta = file(params.test_data['homo_sapiens']['genome']['genome_fasta'], checkIfExists: true)
     fai   = file(params.test_data['homo_sapiens']['genome']['genome_fasta_fai'], checkIfExists: true)
@@ -80,7 +82,8 @@ workflow test_gatk4_genotypegvcfs_gz_input_dbsnp_intervals {
     input = [ [ id:'test' ], // meta map
             file(params.test_data['homo_sapiens']['illumina']['test_genome_vcf_gz'], checkIfExists: true),
             file(params.test_data['homo_sapiens']['illumina']['test_genome_vcf_gz_tbi'], checkIfExists: true),
-            file(params.test_data['homo_sapiens']['genome']['genome_bed'], checkIfExists: true)
+            file(params.test_data['homo_sapiens']['genome']['genome_bed'], checkIfExists: true),
+            []
         ]
 
     fasta = file(params.test_data['homo_sapiens']['genome']['genome_fasta'], checkIfExists: true)
@@ -106,6 +109,7 @@ workflow test_gatk4_genotypegvcfs_gendb_input {
     gendb = UNTAR.out.untar.map{ it[1] }.collect()
     gendb.add([])
     gendb.add([])
+    gendb.add([])
 
     input = Channel.of([ id:'test' ]).combine(gendb)
 
@@ -128,6 +132,7 @@ workflow test_gatk4_genotypegvcfs_gendb_input_dbsnp {
     gendb = UNTAR.out.untar.map{ it[1] }.collect()
     gendb.add([])
     gendb.add([])
+    gendb.add([])
     input = Channel.of([ id:'test' ]).combine(gendb)
 
     GATK4_GENOTYPEGVCFS ( input, fasta, fai, dict, dbsnp, dbsnp_tbi)
@@ -146,6 +151,8 @@ workflow test_gatk4_genotypegvcfs_gendb_input_intervals {
     gendb = UNTAR.out.untar.map{ it[1] }.collect()
     gendb.add([])
     gendb.add([file(params.test_data['homo_sapiens']['genome']['genome_bed'], checkIfExists: true)])
+    gendb.add([])
+
     input = Channel.of([ id:'test' ]).combine(gendb)
 
     GATK4_GENOTYPEGVCFS ( input, fasta, fai, dict, [], [] )
@@ -167,6 +174,8 @@ workflow test_gatk4_genotypegvcfs_gendb_input_dbsnp_intervals {
     gendb = UNTAR.out.untar.map{ it[1] }.collect()
     gendb.add([])
     gendb.add([file(params.test_data['homo_sapiens']['genome']['genome_bed'], checkIfExists: true)])
+    gendb.add([])
+
     input = Channel.of([ id:'test' ]).combine(gendb)
 
     GATK4_GENOTYPEGVCFS ( input, fasta, fai, dict, dbsnp, dbsnp_tbi )
diff --git a/tests/modules/gatk4/getpileupsummaries/main.nf b/tests/modules/gatk4/getpileupsummaries/main.nf
index b0de9d6e..2a53e35e 100644
--- a/tests/modules/gatk4/getpileupsummaries/main.nf
+++ b/tests/modules/gatk4/getpileupsummaries/main.nf
@@ -4,21 +4,6 @@ nextflow.enable.dsl = 2
 
 include { GATK4_GETPILEUPSUMMARIES } from '../../../../modules/gatk4/getpileupsummaries/main.nf'
 
-workflow test_gatk4_getpileupsummaries_just_variants {
-
-    input = [ [ id:'test' ], // meta map
-        file(params.test_data['homo_sapiens']['illumina']['test_paired_end_recalibrated_sorted_bam'], checkIfExists: true) ,
-        file(params.test_data['homo_sapiens']['illumina']['test_paired_end_recalibrated_sorted_bam_bai'], checkIfExists: true),
-        []
-        ]
-
-    variants = file(params.test_data['homo_sapiens']['genome']['gnomad_r2_1_1_21_vcf_gz'], checkIfExists: true)
-    variants_tbi = file(params.test_data['homo_sapiens']['genome']['gnomad_r2_1_1_21_vcf_gz_tbi'], checkIfExists: true)
-    fasta = []
-    fai = []
-    dict = []
-    GATK4_GETPILEUPSUMMARIES ( input , fasta, fai, dict, variants , variants_tbi )
-}
 
 workflow test_gatk4_getpileupsummaries_separate_sites {
 
diff --git a/tests/modules/gatk4/getpileupsummaries/test.yml b/tests/modules/gatk4/getpileupsummaries/test.yml
index 2e4acce9..2529fbc5 100644
--- a/tests/modules/gatk4/getpileupsummaries/test.yml
+++ b/tests/modules/gatk4/getpileupsummaries/test.yml
@@ -1,13 +1,3 @@
-- name: gatk4 getpileupsummaries test_gatk4_getpileupsummaries_just_variants
-  command: nextflow run tests/modules/gatk4/getpileupsummaries -entry test_gatk4_getpileupsummaries_just_variants -c tests/config/nextflow.config
-  tags:
-    - gatk4/getpileupsummaries
-    - gatk4
-  files:
-    - path: output/gatk4/test.pileups.table
-      md5sum: 8e0ca6f66e112bd2f7ec1d31a2d62469
-    - path: output/gatk4/versions.yml
-
 - name: gatk4 getpileupsummaries test_gatk4_getpileupsummaries_separate_sites
   command: nextflow run tests/modules/gatk4/getpileupsummaries -entry test_gatk4_getpileupsummaries_separate_sites -c tests/config/nextflow.config
   tags:
diff --git a/tests/modules/gatk4/intervallisttools/test.yml b/tests/modules/gatk4/intervallisttools/test.yml
index 5542714b..89367a09 100644
--- a/tests/modules/gatk4/intervallisttools/test.yml
+++ b/tests/modules/gatk4/intervallisttools/test.yml
@@ -7,11 +7,11 @@
     - path: output/gatk4/test.interval_list
       md5sum: e51101c9357fb2d59fd30e370eefa39c
     - path: output/gatk4/test_split/temp_0001_of_6/1scattered.interval_list
-      md5sum: b8ba8a387200df76a0d1c577626dc265
+      md5sum: 39385d38ac6cb7c05190026fc3b81411
     - path: output/gatk4/test_split/temp_0002_of_6/2scattered.interval_list
-      md5sum: 0728d164666d9264ef442a493e008dee
+      md5sum: 59f1978c5f4ef3fce3b110816283d9f5
     - path: output/gatk4/test_split/temp_0003_of_6/3scattered.interval_list
-      md5sum: 55da0f3c69504148f4e7002a0e072cfe
+      md5sum: 709fe81bfcf700bd80d96c62a71629fd
     - path: output/gatk4/test_split/temp_0004_of_6/4scattered.interval_list
-      md5sum: d29ca4447f32547f2936567fa902796a
+      md5sum: c24044490cfedbcba61dbc646d3aa570
     - path: output/gatk4/versions.yml
diff --git a/tests/modules/gatk4/markduplicates/test.yml b/tests/modules/gatk4/markduplicates/test.yml
index 1fbd768e..d3a9f269 100644
--- a/tests/modules/gatk4/markduplicates/test.yml
+++ b/tests/modules/gatk4/markduplicates/test.yml
@@ -5,9 +5,9 @@
     - gatk4/markduplicates
   files:
     - path: output/gatk4/test.bai
-      md5sum: e9c125e82553209933883b4fe2b8d7c2
+      md5sum: c8f7a9e426c768577f88f59cb1336bf3
     - path: output/gatk4/test.bam
-      md5sum: 2efd50b2e6b7fd9bdf242cd9e266cfa9
+      md5sum: 58533ddab47f7ac07f7b10e7f4aac234
     - path: output/gatk4/test.metrics
     - path: output/gatk4/versions.yml
 
@@ -20,6 +20,6 @@
     - path: output/gatk4/test.bai
       md5sum: bad71df9c876e72a5bc0a3e0fd755f92
     - path: output/gatk4/test.bam
-      md5sum: 8187febc6108ffef7f907e89b9c091a4
+      md5sum: 112580c24b43331950f24f9adea30788
     - path: output/gatk4/test.metrics
     - path: output/gatk4/versions.yml
diff --git a/tests/modules/gatk4/splitintervals/main.nf b/tests/modules/gatk4/splitintervals/main.nf
new file mode 100644
index 00000000..f507ece5
--- /dev/null
+++ b/tests/modules/gatk4/splitintervals/main.nf
@@ -0,0 +1,33 @@
+#!/usr/bin/env nextflow
+
+nextflow.enable.dsl = 2
+
+include { GATK4_SPLITINTERVALS } from '../../../../modules/gatk4/splitintervals/main.nf'
+
+workflow test_gatk4_splitintervals_bed {
+    
+    input = [
+        [ id:'test' ], // meta map
+        file(params.test_data['homo_sapiens']['genome']['genome_multi_interval_bed'], checkIfExists: true)
+    ]
+
+    fasta = file(params.test_data['homo_sapiens']['genome']['genome_fasta'], checkIfExists: true)
+    fasta_fai = file(params.test_data['homo_sapiens']['genome']['genome_fasta_fai'], checkIfExists: true)
+    fasta_dict = file(params.test_data['homo_sapiens']['genome']['genome_dict'], checkIfExists: true)
+
+    GATK4_SPLITINTERVALS ( input, fasta, fasta_fai, fasta_dict)
+}
+
+workflow test_gatk4_splitintervals_intervals {
+    
+    input = [
+        [ id:'test' ], // meta map
+        file(params.test_data['homo_sapiens']['genome']['genome_interval_list'], checkIfExists: true)
+    ]
+
+    fasta = file(params.test_data['homo_sapiens']['genome']['genome_fasta'], checkIfExists: true)
+    fasta_fai = file(params.test_data['homo_sapiens']['genome']['genome_fasta_fai'], checkIfExists: true)
+    fasta_dict = file(params.test_data['homo_sapiens']['genome']['genome_dict'], checkIfExists: true)
+
+    GATK4_SPLITINTERVALS ( input, fasta, fasta_fai, fasta_dict)
+}
\ No newline at end of file
diff --git a/tests/modules/gatk4/splitintervals/nextflow.config b/tests/modules/gatk4/splitintervals/nextflow.config
new file mode 100644
index 00000000..10fda96c
--- /dev/null
+++ b/tests/modules/gatk4/splitintervals/nextflow.config
@@ -0,0 +1,9 @@
+process {
+
+    publishDir = { "${params.outdir}/${task.process.tokenize(':')[-1].tokenize('_')[0].toLowerCase()}" }
+    
+
+    withName: GATK4_SPLITINTERVALS {
+        ext.args = "--scatter-count 2"
+    }
+}
\ No newline at end of file
diff --git a/tests/modules/gatk4/splitintervals/test.yml b/tests/modules/gatk4/splitintervals/test.yml
new file mode 100644
index 00000000..741c6bec
--- /dev/null
+++ b/tests/modules/gatk4/splitintervals/test.yml
@@ -0,0 +1,23 @@
+- name: gatk4 splitintervals test_gatk4_splitintervals_bed
+  command: nextflow run tests/modules/gatk4/splitintervals -entry test_gatk4_splitintervals_bed -c tests/config/nextflow.config
+  tags:
+    - gatk4/splitintervals
+    - gatk4
+  files:
+    - path: output/gatk4/test/0000-scattered.interval_list
+      md5sum: c8d6b19e7a92535b6ce9608eae558faa
+    - path: output/gatk4/test/0001-scattered.interval_list
+      md5sum: b1877ad96aec308906594c50ebbe3ded
+    - path: output/gatk4/versions.yml
+
+- name: gatk4 splitintervals test_gatk4_splitintervals_intervals
+  command: nextflow run tests/modules/gatk4/splitintervals -entry test_gatk4_splitintervals_intervals -c tests/config/nextflow.config
+  tags:
+    - gatk4/splitintervals
+    - gatk4
+  files:
+    - path: output/gatk4/test/0000-scattered.interval_list
+      md5sum: ebd6b34a335efc6732ff541936c6d2d5
+    - path: output/gatk4/test/0001-scattered.interval_list
+      md5sum: 9459b0e124fa84ec1e64ac4615bc9af7
+    - path: output/gatk4/versions.yml
diff --git a/tests/modules/gatk4/splitncigarreads/test.yml b/tests/modules/gatk4/splitncigarreads/test.yml
index d9a58901..261f7bc3 100644
--- a/tests/modules/gatk4/splitncigarreads/test.yml
+++ b/tests/modules/gatk4/splitncigarreads/test.yml
@@ -5,7 +5,7 @@
     - gatk4/splitncigarreads
   files:
     - path: output/gatk4/test.bam
-      md5sum: 436d8e31285c6b588bdd1c7f1d07f6f2
+      md5sum: 37e5dbce8692b54c3292b539c91dfbd7
     - path: output/gatk4/versions.yml
 - name: gatk4 splitncigarreads test_gatk4_splitncigarreads_intervals
   command: nextflow run tests/modules/gatk4/splitncigarreads -entry test_gatk4_splitncigarreads_intervals -c tests/config/nextflow.config
@@ -14,5 +14,5 @@
     - gatk4/splitncigarreads
   files:
     - path: output/gatk4/test.bam
-      md5sum: cd56e3225950f519fd47164cca60a0bb
+      md5sum: e5cd2fd1822298a9bf7bc8b8d42146af
     - path: output/gatk4/versions.yml
diff --git a/tests/modules/gatk4/variantrecalibrator/test.yml b/tests/modules/gatk4/variantrecalibrator/test.yml
index bc84bfb3..39931137 100644
--- a/tests/modules/gatk4/variantrecalibrator/test.yml
+++ b/tests/modules/gatk4/variantrecalibrator/test.yml
@@ -9,7 +9,7 @@
         - "#CHROM	POS	ID	REF	ALT	QUAL	FILTER	INFO"
     - path: output/gatk4/test.recal.idx
     - path: output/gatk4/test.tranches
-      md5sum: d238e97bf996863969dac7751e345549
+      md5sum: c029e52fd63a893e1154cc9144a19eeb
     - path: output/gatk4/versions.yml
 
 - name: gatk4 variantrecalibrator test_gatk4_variantrecalibrator_allele_specific
@@ -23,5 +23,5 @@
         - "#CHROM	POS	ID	REF	ALT	QUAL	FILTER	INFO"
     - path: output/gatk4/test.recal.idx
     - path: output/gatk4/test.tranches
-      md5sum: 444438d46716593634a6817958099292
+      md5sum: ad52fa69325c758f458a30ee5b43d6b5
     - path: output/gatk4/versions.yml