diff --git a/modules.json b/modules.json
index 449832c..4bc9e2e 100644
--- a/modules.json
+++ b/modules.json
@@ -23,7 +23,7 @@
                     },
                     "spaceranger/count": {
                         "branch": "master",
-                        "git_sha": "2f0ef0cd414ea43e33625023c72b6af936dce63d",
+                        "git_sha": "238b3efbbd113529d19ec866eba545911bc27682",
                         "installed_by": ["modules"]
                     },
                     "untar": {
diff --git a/modules/nf-core/spaceranger/count/tests/main.nf.test b/modules/nf-core/spaceranger/count/tests/main.nf.test
index 7631d85..2be6525 100644
--- a/modules/nf-core/spaceranger/count/tests/main.nf.test
+++ b/modules/nf-core/spaceranger/count/tests/main.nf.test
@@ -19,7 +19,7 @@ nextflow_process {
                 script "../../mkgtf/main.nf"
                 process {
                     """
-                    input[0] = file(params.test_data['homo_sapiens']['genome']['genome_gtf'], checkIfExists: true)
+                    input[0] = file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true)
                     """
                 }
             }
@@ -30,8 +30,8 @@ nextflow_process {
                 script "../../mkref/main.nf"
                 process {
                     """
-                    input[0] = file(params.test_data['homo_sapiens']['genome']['genome_fasta'], checkIfExists: true)
-                    input[1] = file(params.test_data['homo_sapiens']['genome']['genome_gtf'], checkIfExists: true)
+                    input[0] = file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true)
+                    input[1] = file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true)
                     input[2] = 'homo_sapiens_chr22_reference'
                     """
                 }
@@ -48,10 +48,10 @@ nextflow_process {
                         area: 'D1'
                     ], // Meta map
                     [
-                        file(params.test_data['homo_sapiens']['10xgenomics']['spaceranger']['test_10x_ffpe_v1_fastq_1_gz']),
-                        file(params.test_data['homo_sapiens']['10xgenomics']['spaceranger']['test_10x_ffpe_v1_fastq_2_gz'])
+                        file(params.modules_testdata_base_path + 'genomics/homo_sapiens/10xgenomics/spaceranger/human-ovarian-cancer-1-standard_v1_ffpe/Visium_FFPE_Human_Ovarian_Cancer_S1_L001_R1_001.fastq.gz', checkIfExists: true),
+                        file(params.modules_testdata_base_path + 'genomics/homo_sapiens/10xgenomics/spaceranger/human-ovarian-cancer-1-standard_v1_ffpe/Visium_FFPE_Human_Ovarian_Cancer_S1_L001_R2_001.fastq.gz', checkIfExists: true)
                     ], // Reads
-                    file(params.test_data['homo_sapiens']['10xgenomics']['spaceranger']['test_10x_ffpe_v1_image']), // Image
+                    file(params.modules_testdata_base_path + 'genomics/homo_sapiens/10xgenomics/spaceranger/human-ovarian-cancer-1-standard_v1_ffpe/Visium_FFPE_Human_Ovarian_Cancer_image.jpg', checkIfExists: true), // Image
                     [], // Cytaimage
                     [], // Darkimage
                     [], // Colorizedimage
@@ -94,7 +94,7 @@ nextflow_process {
                 script "../../mkgtf/main.nf"
                 process {
                     """
-                    input[0] = file(params.test_data['homo_sapiens']['genome']['genome_gtf'], checkIfExists: true)
+                    input[0] = file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true)
                     """
                 }
             }
@@ -105,8 +105,8 @@ nextflow_process {
                 script "../../mkref/main.nf"
                 process {
                     """
-                    input[0] = file(params.test_data['homo_sapiens']['genome']['genome_fasta'], checkIfExists: true)
-                    input[1] = file(params.test_data['homo_sapiens']['genome']['genome_gtf'], checkIfExists: true)
+                    input[0] = file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true)
+                    input[1] = file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true)
                     input[2] = 'homo_sapiens_chr22_reference'
                     """
                 }
@@ -125,10 +125,10 @@ nextflow_process {
                         area: 'D1'
                     ], // Meta map
                     [
-                        file(params.test_data['homo_sapiens']['10xgenomics']['spaceranger']['test_10x_ffpe_v1_fastq_1_gz']),
-                        file(params.test_data['homo_sapiens']['10xgenomics']['spaceranger']['test_10x_ffpe_v1_fastq_2_gz'])
+                        file(params.modules_testdata_base_path + 'genomics/homo_sapiens/10xgenomics/spaceranger/human-ovarian-cancer-1-standard_v1_ffpe/Visium_FFPE_Human_Ovarian_Cancer_S1_L001_R1_001.fastq.gz', checkIfExists: true),
+                        file(params.modules_testdata_base_path + 'genomics/homo_sapiens/10xgenomics/spaceranger/human-ovarian-cancer-1-standard_v1_ffpe/Visium_FFPE_Human_Ovarian_Cancer_S1_L001_R2_001.fastq.gz', checkIfExists: true)
                     ], // Reads
-                    file(params.test_data['homo_sapiens']['10xgenomics']['spaceranger']['test_10x_ffpe_v1_image']), // Image
+                    file(params.modules_testdata_base_path + 'genomics/homo_sapiens/10xgenomics/spaceranger/human-ovarian-cancer-1-standard_v1_ffpe/Visium_FFPE_Human_Ovarian_Cancer_image.jpg', checkIfExists: true), // Image
                     [], // Cytaimage
                     [], // Darkimage
                     [], // Colorizedimage
@@ -155,7 +155,7 @@ nextflow_process {
                 script "../../mkgtf/main.nf"
                 process {
                     """
-                    input[0] = file(params.test_data['homo_sapiens']['genome']['genome_gtf'], checkIfExists: true)
+                    input[0] = file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true)
                     """
                 }
             }
@@ -166,8 +166,8 @@ nextflow_process {
                 script "../../mkref/main.nf"
                 process {
                     """
-                    input[0] = file(params.test_data['homo_sapiens']['genome']['genome_fasta'], checkIfExists: true)
-                    input[1] = file(params.test_data['homo_sapiens']['genome']['genome_gtf'], checkIfExists: true)
+                    input[0] = file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.fasta', checkIfExists: true)
+                    input[1] = file(params.modules_testdata_base_path + 'genomics/homo_sapiens/genome/genome.gtf', checkIfExists: true)
                     input[2] = 'homo_sapiens_chr22_reference'
                     """
                 }
@@ -184,18 +184,18 @@ nextflow_process {
                         area: 'B1'
                     ], // Meta map
                     [
-                        file(params.test_data['homo_sapiens']['10xgenomics']['spaceranger']['test_10x_ffpe_cytassist_fastq_1_gz']),
-                        file(params.test_data['homo_sapiens']['10xgenomics']['spaceranger']['test_10x_ffpe_cytassist_fastq_2_gz'])
+                        file(params.modules_testdata_base_path + 'genomics/homo_sapiens/10xgenomics/spaceranger/human-brain-cancer-11-mm-capture-area-ffpe-2-standard_v2_ffpe_cytassist/CytAssist_11mm_FFPE_Human_Glioblastoma_2_S1_L001_R1_001.fastq.gz', checkIfExists: true),
+                        file(params.modules_testdata_base_path + 'genomics/homo_sapiens/10xgenomics/spaceranger/human-brain-cancer-11-mm-capture-area-ffpe-2-standard_v2_ffpe_cytassist/CytAssist_11mm_FFPE_Human_Glioblastoma_2_S1_L001_R2_001.fastq.gz', checkIfExists: true)
                     ], // Reads
                     [], // Image
-                    file(params.test_data['homo_sapiens']['10xgenomics']['spaceranger']['test_10x_ffpe_cytassist_image']), // Cytaimage
+                    file(params.modules_testdata_base_path + 'genomics/homo_sapiens/10xgenomics/spaceranger/human-brain-cancer-11-mm-capture-area-ffpe-2-standard_v2_ffpe_cytassist/CytAssist_11mm_FFPE_Human_Glioblastoma_image.tif', checkIfExists: true), // Cytaimage
                     [], // Darkimage
                     [], // Colorizedimage
                     [], // Manual alignment (default: automatic alignment)
                     file('https://s3.us-west-2.amazonaws.com/10x.spatial-slides/gpr/V52Y10/V52Y10-317.gpr') // Slide specification (default: automatic download)
                 ]
                 input[1] = SPACERANGER_MKREF.out.reference // Reference
-                input[2] = file(params.test_data['homo_sapiens']['10xgenomics']['spaceranger']['test_10x_ffpe_cytassist_probeset']) // Probeset (default: use the one included with Space Ranger)
+                input[2] = file(params.modules_testdata_base_path + 'genomics/homo_sapiens/10xgenomics/spaceranger/human-brain-cancer-11-mm-capture-area-ffpe-2-standard_v2_ffpe_cytassist/CytAssist_11mm_FFPE_Human_Glioblastoma_probe_set.csv', checkIfExists: true) // Probeset (default: use the one included with Space Ranger)
                 """
             }
         }