diff --git a/main.nf b/main.nf
index 96b6f6d..a96d951 100755
--- a/main.nf
+++ b/main.nf
@@ -4,7 +4,7 @@ nextflow.enable.dsl = 2
 
 include { PREPARE_BAM; INDEX_BAM } from './modules/01_prepare_bam'
 include { MARK_DUPLICATES } from './modules/02_mark_duplicates'
-include { METRICS; HS_METRICS } from './modules/03_metrics'
+include { METRICS; HS_METRICS; COVERAGE_ANALYSIS } from './modules/03_metrics'
 include { REALIGNMENT_AROUND_INDELS } from './modules/04_realignment_around_indels'
 include { BQSR; CREATE_OUTPUT } from './modules/05_bqsr'
 
@@ -17,6 +17,7 @@ params.dbsnp = false
 params.known_indels1 = false
 params.known_indels2 = false
 params.intervals = false
+params.intervals_bed = false
 params.skip_bqsr = false
 params.skip_realignment = false
 params.skip_deduplication = false
@@ -100,6 +101,7 @@ workflow {
             HS_METRICS(deduplicated_bams)
         }
         METRICS(deduplicated_bams)
+        COVERAGE_ANALYSIS(deduplicated_bams)
     }
 
     if (!params.skip_realignment) {
diff --git a/modules/01_prepare_bam.nf b/modules/01_prepare_bam.nf
index 29dacdf..e0f0c69 100644
--- a/modules/01_prepare_bam.nf
+++ b/modules/01_prepare_bam.nf
@@ -23,7 +23,7 @@ process PREPARE_BAM {
     tuple val(name), val(type), file(bam)
 
     output:
-    tuple val(name), val("${bam.baseName}"), val(type), file("${bam.baseName}.prepared.bam"), emit: prepared_bams
+    tuple val(name), val(type), file("${name}.prepared.bam"), emit: prepared_bams
 
     script:
     order = params.skip_deduplication ? "--SORT_ORDER coordinate": "--SORT_ORDER queryname"
@@ -43,7 +43,7 @@ process PREPARE_BAM {
     --java-options '-Xmx${params.prepare_bam_memory} -Djava.io.tmpdir=tmp' \
     --VALIDATION_STRINGENCY SILENT \
     --INPUT /dev/stdin \
-    --OUTPUT ${bam.baseName}.prepared.bam \
+    --OUTPUT ${name}.prepared.bam \
     --REFERENCE_SEQUENCE ${params.reference} \
     --RGPU 1 \
     --RGID 1 \
@@ -62,11 +62,10 @@ process INDEX_BAM {
     conda (params.enable_conda ? "bioconda::gatk4=4.2.0.0" : null)
 
     input:
-    tuple val(name), val(bam_name), val(type), file(bam)
+    tuple val(name), val(type), file(bam)
 
     output:
-    tuple val(name), val(bam_name), val(type),
-        file("${bam}"), file("${bam.baseName}.bai"), emit: indexed_bams
+    tuple val(name), val(type), file("${bam}"), file("${bam.baseName}.bai"), emit: indexed_bams
 
     script:
     """
diff --git a/modules/02_mark_duplicates.nf b/modules/02_mark_duplicates.nf
index 2be34d5..852f3ab 100644
--- a/modules/02_mark_duplicates.nf
+++ b/modules/02_mark_duplicates.nf
@@ -9,20 +9,19 @@ process MARK_DUPLICATES {
     cpus "${params.mark_duplicates_cpus}"
     memory "${params.mark_duplicates_memory}"
     tag "${name}"
-    publishDir "${params.output}/${name}/metrics", mode: "copy", pattern: "*.dedup_metrics.txt"
+    publishDir "${params.output}/${name}/metrics/mark_duplicates", mode: "copy", pattern: "*.dedup_metrics.txt"
 
     conda (params.enable_conda ? "bioconda::gatk4=4.2.0.0" : null)
 
     input:
-    tuple val(name), val(bam_name), val(type), file(bam)
+    tuple val(name), val(type), file(bam)
 
     output:
-    tuple val(name), val(bam_name), val(type),
-        file("${bam.baseName}.dedup.bam"), file("${bam.baseName}.dedup.bam.bai"), emit: deduplicated_bams
-    file("${bam.baseName}.dedup_metrics.txt") optional true
+    tuple val(name), val(type), file("${name}.dedup.bam"), file("${name}.dedup.bam.bai"), emit: deduplicated_bams
+    file("${name}.dedup_metrics.txt") optional true
 
     script:
-    dedup_metrics = params.skip_metrics ? "": "--metrics-file ${bam.baseName}.dedup_metrics.txt"
+    dedup_metrics = params.skip_metrics ? "": "--metrics-file ${name}.dedup_metrics.txt"
     remove_duplicates = params.remove_duplicates ? "--remove-all-duplicates true" : "--remove-all-duplicates false"
     """
     mkdir tmp
@@ -30,7 +29,7 @@ process MARK_DUPLICATES {
     gatk MarkDuplicatesSpark \
     --java-options '-Xmx${params.mark_duplicates_memory}  -Djava.io.tmpdir=tmp' \
     --input  ${bam} \
-    --output ${bam.baseName}.dedup.bam \
+    --output ${name}.dedup.bam \
     --conf 'spark.executor.cores=${task.cpus}' ${remove_duplicates} ${dedup_metrics}
     """
 }
diff --git a/modules/03_metrics.nf b/modules/03_metrics.nf
index 216af21..a7be35a 100644
--- a/modules/03_metrics.nf
+++ b/modules/03_metrics.nf
@@ -4,23 +4,25 @@ params.collect_hs_metrics_min_base_quality = false
 params.collect_hs_metrics_min_mapping_quality = false
 params.reference = false
 params.output = 'output'
+params.intervals_bed = false
+params.intervals = false
 
 
 process HS_METRICS {
-    cpus "${params.metrics_cpus}"
-    memory "${params.metrics_memory}"
+    cpus params.metrics_cpus
+    memory params.metrics_memory
     tag "${name}"
-    publishDir "${params.output}/${name}/metrics", mode: "copy"
+    publishDir "${params.output}/${name}/metrics/hs_metrics", mode: "copy"
 
     conda (params.enable_conda ? "bioconda::gatk4=4.2.0.0" : null)
 
     input:
-    tuple val(name), val(bam_name), val(type), file(bam), file(bai)
+    tuple val(name), val(type), file(bam), file(bai)
 
     output:
     file("*_metrics") optional true
     file("*.pdf") optional true
-    file("${bam.baseName}.hs_metrics.txt")
+    file("${name}.hs_metrics.txt")
 
     script:
     minimum_base_quality = params.collect_hs_metrics_min_base_quality ?
@@ -33,7 +35,7 @@ process HS_METRICS {
     gatk CollectHsMetrics \
     --java-options '-Xmx${params.metrics_memory}  -Djava.io.tmpdir=tmp' \
     --INPUT  ${bam} \
-    --OUTPUT ${bam.baseName}.hs_metrics.txt \
+    --OUTPUT ${name}.hs_metrics.txt \
     --TARGET_INTERVALS ${params.intervals} \
     --BAIT_INTERVALS ${params.intervals} \
     ${minimum_base_quality} ${minimum_mapping_quality}
@@ -41,15 +43,15 @@ process HS_METRICS {
 }
 
 process METRICS {
-    cpus "${params.metrics_cpus}"
-    memory "${params.metrics_memory}"
+    cpus params.metrics_cpus
+    memory params.metrics_memory
     tag "${name}"
-    publishDir "${params.output}/${name}/metrics", mode: "copy"
+    publishDir "${params.output}/${name}/metrics/gatk_multiple_metrics", mode: "copy"
 
     conda (params.enable_conda ? "bioconda::gatk4=4.2.0.0" : null)
 
     input:
-    tuple val(name), val(bam_name), val(type), file(bam), file(bai)
+    tuple val(name), val(type), file(bam), file(bai)
 
     output:
     file("*_metrics") optional true
@@ -61,7 +63,7 @@ process METRICS {
     gatk CollectMultipleMetrics \
     --java-options '-Xmx${params.metrics_memory}  -Djava.io.tmpdir=tmp' \
     --INPUT  ${bam} \
-    --OUTPUT ${bam.baseName} \
+    --OUTPUT ${name} \
     --REFERENCE_SEQUENCE ${params.reference} \
     --PROGRAM QualityScoreDistribution \
     --PROGRAM MeanQualityByCycle \
@@ -72,4 +74,31 @@ process METRICS {
     --PROGRAM CollectSequencingArtifactMetrics \
     --PROGRAM CollectSequencingArtifactMetrics
     """
-}
\ No newline at end of file
+}
+
+process COVERAGE_ANALYSIS {
+    cpus params.metrics_cpus
+    memory params.metrics_memory
+    tag "${name}"
+    publishDir "${params.output}/${name}/metrics/coverage", mode: "copy"
+
+    conda (params.enable_conda ? "bioconda::samtools=1.12" : null)
+
+    input:
+        tuple val(name), val(type), file(bam), file(bai)
+
+    output:
+        file("${name}.coverage.tsv")
+        file("${name}.depth.tsv")
+
+    script:
+    minimum_base_quality = params.collect_hs_metrics_min_base_quality ?
+        "--min-BQ ${params.collect_hs_metrics_min_base_quality}" : ""
+    minimum_mapping_quality = params.collect_hs_metrics_min_mapping_quality ?
+        "--min-MQ ${params.collect_hs_metrics_min_mapping_quality}" : ""
+    intervals = params.intervals_bed ? "-b ${params.intervals_bed}" : ""
+    """
+    samtools coverage ${minimum_base_quality} ${minimum_mapping_quality} ${bam} > ${name}.coverage.tsv
+    samtools depth -s -d 0 -H ${intervals} ${bam} > ${name}.depth.tsv
+    """
+}
diff --git a/modules/04_realignment_around_indels.nf b/modules/04_realignment_around_indels.nf
index f728f62..712db9a 100644
--- a/modules/04_realignment_around_indels.nf
+++ b/modules/04_realignment_around_indels.nf
@@ -10,18 +10,18 @@ process REALIGNMENT_AROUND_INDELS {
     cpus "${params.realignment_around_indels_cpus}"
     memory "${params.realignment_around_indels_memory}"
     tag "${name}"
-    publishDir "${params.output}/${name}", mode: "copy", pattern: "*.RA.intervals"
+    publishDir "${params.output}/${name}/metrics/realignment", mode: "copy", pattern: "*.RA.intervals"
 
     // NOTE: this dependency is fixed to GATK 3 as the realignment around indels is not anymore maintained in GATK 4
     // but still for some reason for GATK 3 to work the dependency to GATK 4 is needed
     conda (params.enable_conda ? "bioconda::gatk4=4.2.0.0 bioconda::gatk=3.8" : null)
 
     input:
-    tuple val(name), val(bam_name), val(type), file(bam), file(bai)
+    tuple val(name), val(type), file(bam), file(bai)
 
     output:
-    tuple val(name), val(bam_name), val(type), file("${bam.baseName}.realigned.bam"), file("${bam.baseName}.realigned.bai"), emit: realigned_bams
-    file("${bam.baseName}.RA.intervals")
+    tuple val(name), val(type), file("${name}.realigned.bam"), file("${name}.realigned.bai"), emit: realigned_bams
+    file("${name}.RA.intervals")
 
     script:
     known_indels1 = params.known_indels1 ? " --known ${params.known_indels1}" : ""
@@ -33,14 +33,14 @@ process REALIGNMENT_AROUND_INDELS {
 
     gatk3 -Xmx${params.realignment_around_indels_memory} -Djava.io.tmpdir=tmp -T RealignerTargetCreator \
     --input_file ${bam} \
-    --out ${bam.baseName}.RA.intervals \
+    --out ${name}.RA.intervals \
     --reference_sequence ${params.reference} ${known_indels1} ${known_indels2}
 
     gatk3 -Xmx${params.realignment_around_indels_memory} -Djava.io.tmpdir=tmp -T IndelRealigner \
     --input_file ${bam} \
-    --out ${bam.baseName}.realigned.bam \
+    --out ${name}.realigned.bam \
     --reference_sequence ${params.reference} \
-    --targetIntervals ${bam.baseName}.RA.intervals \
+    --targetIntervals ${name}.RA.intervals \
     --consensusDeterminationModel USE_SW \
     --LODThresholdForCleaning 0.4 \
     --maxReadsInMemory 600000 ${known_alleles1} ${known_alleles2}
diff --git a/modules/05_bqsr.nf b/modules/05_bqsr.nf
index e19917e..391277c 100644
--- a/modules/05_bqsr.nf
+++ b/modules/05_bqsr.nf
@@ -14,13 +14,13 @@ process BQSR {
     conda (params.enable_conda ? "bioconda::gatk4=4.2.0.0" : null)
 
     input:
-    tuple val(name), val(bam_name), val(type), file(bam), file(bai)
+    tuple val(name), val(type), file(bam), file(bai)
 
     output:
     tuple val("${name}"), val("${type}"), val("${params.output}/${name}/${bam_name}.preprocessed.bam"), emit: recalibrated_bams
-    file "${bam_name}.recalibration_report.grp"
-    file "${bam_name}.preprocessed.bam"
-    file "${bam_name}.preprocessed.bai"
+    file "${name}.recalibration_report.grp"
+    file "${name}.preprocessed.bam"
+    file "${name}.preprocessed.bai"
 
     """
     mkdir tmp
@@ -28,16 +28,16 @@ process BQSR {
     gatk BaseRecalibrator \
     --java-options '-Xmx${params.bqsr_memory} -Djava.io.tmpdir=tmp' \
     --input ${bam} \
-    --output ${bam_name}.recalibration_report.grp \
+    --output ${name}.recalibration_report.grp \
     --reference ${params.reference} \
     --known-sites ${params.dbsnp}
 
     gatk ApplyBQSR \
     --java-options '-Xmx${params.bqsr_memory} -Djava.io.tmpdir=tmp' \
     --input ${bam} \
-    --output ${bam_name}.preprocessed.bam \
+    --output ${name}.preprocessed.bam \
     --reference ${params.reference} \
-    --bqsr-recal-file ${bam_name}.recalibration_report.grp
+    --bqsr-recal-file ${name}.recalibration_report.grp
     """
 }
 
@@ -49,15 +49,15 @@ process CREATE_OUTPUT {
     tag "${name}"
 
     input:
-    tuple val(name), val(bam_name), val(type), file(bam), file(bai)
+    tuple val(name), val(type), file(bam), file(bai)
 
     output:
-    tuple val("${name}"), val("${type}"), val("${params.output}/${name}/${bam_name}.preprocessed.bam"), emit: recalibrated_bams
-    file "${bam_name}.preprocessed.bam"
-    file "${bam_name}.preprocessed.bai"
+    tuple val("${name}"), val("${type}"), val("${params.output}/${name}/${name}.preprocessed.bam"), emit: recalibrated_bams
+    file "${name}.preprocessed.bam"
+    file "${name}.preprocessed.bai"
 
     """
-    cp ${bam} ${bam_name}.preprocessed.bam
-    cp ${bai} ${bam_name}.preprocessed.bai
+    cp ${bam} ${name}.preprocessed.bam
+    cp ${bai} ${name}.preprocessed.bai
     """
 }
\ No newline at end of file
diff --git a/nextflow.config b/nextflow.config
index c4fde56..a5ed186 100644
--- a/nextflow.config
+++ b/nextflow.config
@@ -28,6 +28,7 @@ profiles {
     params.known_indels1 = "$baseDir/test_data/1000G_phase1.indels.hg19.sites.minimal.vcf"
     params.known_indels2 = "$baseDir/test_data/Mills_and_1000G_gold_standard.indels.hg19.sites.sorted.minimal.vcf"
     params.intervals = "$baseDir/test_data/minimal_intervals.intervals"
+    params.intervals_bed = "$baseDir/test_data/minimal_intervals.bed"
     params.dbsnp = "$baseDir/test_data/dbsnp_138.hg19.minimal.vcf"
     timeline.enabled = false
     report.enabled = false
diff --git a/tests/test_01.sh b/tests/test_01.sh
index 63ba9a5..5f5b4d3 100644
--- a/tests/test_01.sh
+++ b/tests/test_01.sh
@@ -5,7 +5,7 @@ source tests/assert.sh
 output=output/test1
 nextflow main.nf -profile test,conda --output $output
 
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
+test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
diff --git a/tests/test_02.sh b/tests/test_02.sh
index 2d88b4c..a8d14ab 100644
--- a/tests/test_02.sh
+++ b/tests/test_02.sh
@@ -5,7 +5,7 @@ source tests/assert.sh
 output=output/test2
 nextflow main.nf -profile test,conda --output $output --skip_bqsr
 
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
+test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
diff --git a/tests/test_03.sh b/tests/test_03.sh
index f94cd48..4bd336c 100644
--- a/tests/test_03.sh
+++ b/tests/test_03.sh
@@ -5,7 +5,7 @@ source tests/assert.sh
 output=output/test3
 nextflow main.nf -profile test,conda --output $output --skip_realignment
 
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
+test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
diff --git a/tests/test_04.sh b/tests/test_04.sh
index b4f9281..a5c15f6 100644
--- a/tests/test_04.sh
+++ b/tests/test_04.sh
@@ -5,7 +5,7 @@ source tests/assert.sh
 output=output/test4
 nextflow main.nf -profile test,conda --output $output --skip_deduplication
 
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
+test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
diff --git a/tests/test_05.sh b/tests/test_05.sh
index 29c3f0c..731bbe4 100644
--- a/tests/test_05.sh
+++ b/tests/test_05.sh
@@ -5,7 +5,7 @@ source tests/assert.sh
 output=output/test5
 nextflow main.nf -profile test,conda --output $output --skip_deduplication --skip_bqsr --skip_metrics --known_indels1 false --known_indels2 false
 
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
+test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
diff --git a/tests/test_06.sh b/tests/test_06.sh
index c8f6cbf..80776a5 100644
--- a/tests/test_06.sh
+++ b/tests/test_06.sh
@@ -5,7 +5,7 @@ source tests/assert.sh
 output=output/test6
 nextflow main.nf -profile test,conda --output $output --intervals false --skip_deduplication --skip_bqsr --skip_realignment
 
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
+test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
diff --git a/tests/test_07.sh b/tests/test_07.sh
index b00e937..07e461d 100644
--- a/tests/test_07.sh
+++ b/tests/test_07.sh
@@ -5,7 +5,7 @@ source tests/assert.sh
 output=output/test7
 nextflow main.nf -profile test,conda --output $output --skip_bqsr --skip_realignment
 
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
+test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bam || { echo "Missing output BAM file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bai || { echo "Missing output BAI file!"; exit 1; }
\ No newline at end of file
diff --git a/tests/test_08.sh b/tests/test_08.sh
index ea9a156..4337444 100644
--- a/tests/test_08.sh
+++ b/tests/test_08.sh
@@ -6,9 +6,11 @@ output=output/test8
 nextflow main.nf -profile test,conda --output $output --collect_hs_metrics_min_base_quality 10 \
 --collect_hs_metrics_min_mapping_quality 10 --remove_duplicates false --skip_bqsr --skip_realignment
 
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bam || { echo "Missing test 8 output file!"; exit 1; }
-test -s $output/sample1/TESTX_S1_L001.preprocessed.bai || { echo "Missing test 8 output file!"; exit 1; }
-test -s $output/sample1/metrics/TESTX_S1_L001.prepared.dedup.hs_metrics.txt || { echo "Missing test 8 output file!"; exit 1; }
-test -s $output/sample1/metrics/TESTX_S1_L001.prepared.dedup_metrics.txt || { echo "Missing test 8 output file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bam || { echo "Missing test 8 output file!"; exit 1; }
-test -s $output/sample2/TESTX_S1_L002.preprocessed.bai || { echo "Missing test 8 output file!"; exit 1; }
\ No newline at end of file
+test -s $output/sample1/sample1.preprocessed.bam || { echo "Missing BAM file!"; exit 1; }
+test -s $output/sample1/sample1.preprocessed.bai || { echo "Missing BAI file!"; exit 1; }
+test -s $output/sample1/metrics/hs_metrics/sample1.hs_metrics.txt || { echo "Missing HS metrics file!"; exit 1; }
+test -s $output/sample1/metrics/mark_duplicates/sample1.dedup_metrics.txt || { echo "Missing dedup metrics file!"; exit 1; }
+test -s $output/sample1/metrics/coverage/sample1.coverage.tsv || { echo "Missing horizontal coverage file!"; exit 1; }
+test -s $output/sample1/metrics/coverage/sample1.depth.tsv || { echo "Missing depth of coverage file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bam || { echo "Missing BAM file!"; exit 1; }
+test -s $output/sample2/sample2.preprocessed.bai || { echo "Missing BAI file!"; exit 1; }