diff --git a/.circleci/config.yml b/.circleci/config.yml
index 59ec4dfb..209d4ed6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -348,6 +348,56 @@ jobs:
       - store_artifacts:
           path: /src/qsiprep/.circleci/out/drbuddi_rpe/
 
+  maternal_brain_project:
+    resource_class: xlarge
+    environment:
+      CIRCLE_CPUS: 4
+    <<: *dockersetup
+    steps:
+      - checkout
+      - run: *runinstall
+      - run:
+          name: Run QSIPrep on multi-shell dataset with GRE field maps
+          no_output_timeout: 3h
+          command: |
+            pytest -rP -o log_cli=true -m "maternal_brain_project" --cov-config=/src/qsiprep/pyproject.toml --cov-append --cov-report term-missing --cov=qsiprep --data_dir=/src/qsiprep/.circleci/data --output_dir=/src/qsiprep/.circleci/out --working_dir=/src/qsiprep/.circleci/work qsiprep
+            mkdir /src/coverage
+            mv /src/qsiprep/.coverage /src/coverage/.coverage.maternal_brain_project
+            # remove nifti files before uploading artifacts
+            find /src/qsiprep/.circleci/out/ -name "*.nii.gz" -type f -delete
+            find /src/qsiprep/.circleci/out/ -name "*.fib.gz" -type f -delete
+      - persist_to_workspace:
+          root: /src/coverage/
+          paths:
+            - .coverage.maternal_brain_project
+      - store_artifacts:
+          path: /src/qsiprep/.circleci/out/maternal_brain_project/
+
+  forrest_gump:
+    resource_class: xlarge
+    environment:
+      CIRCLE_CPUS: 4
+    <<: *dockersetup
+    steps:
+      - checkout
+      - run: *runinstall
+      - run:
+          name: Run QSIPrep on single-shell dataset with GRE field maps
+          no_output_timeout: 3h
+          command: |
+            pytest -rP -o log_cli=true -m "forrest_gump" --cov-config=/src/qsiprep/pyproject.toml --cov-append --cov-report term-missing --cov=qsiprep --data_dir=/src/qsiprep/.circleci/data --output_dir=/src/qsiprep/.circleci/out --working_dir=/src/qsiprep/.circleci/work qsiprep
+            mkdir /src/coverage
+            mv /src/qsiprep/.coverage /src/coverage/.coverage.forrest_gump
+            # remove nifti files before uploading artifacts
+            find /src/qsiprep/.circleci/out/ -name "*.nii.gz" -type f -delete
+            find /src/qsiprep/.circleci/out/ -name "*.fib.gz" -type f -delete
+      - persist_to_workspace:
+          root: /src/coverage/
+          paths:
+            - .coverage.forrest_gump
+      - store_artifacts:
+          path: /src/qsiprep/.circleci/out/forrest_gump/
+
   IntramodalTemplate:
     resource_class: large
     <<: *dockersetup
@@ -855,6 +905,26 @@ workflows:
             tags:
               only: /.*/
 
+      - maternal_brain_project:
+          requires:
+            - build
+          filters:
+            branches:
+              ignore:
+                - /recon\/.*/
+            tags:
+              only: /.*/
+
+      - forrest_gump:
+          requires:
+            - build
+          filters:
+            branches:
+              ignore:
+                - /recon\/.*/
+            tags:
+              only: /.*/
+
       - IntramodalTemplate:
           requires:
             - build
@@ -961,6 +1031,8 @@ workflows:
             - DRBUDDI_SHORELine_EPI
             - DRBUDDI_eddy_rpe_series
             - DRBUDDI_TENSORLine_EPI
+            - maternal_brain_project
+            - forrest_gump
             - IntramodalTemplate
             - MultiT1w
             - Recon_3Tissue_Singleshell_ACT
@@ -991,6 +1063,8 @@ workflows:
             - DRBUDDI_SHORELine_EPI
             - DRBUDDI_eddy_rpe_series
             - DRBUDDI_TENSORLine_EPI
+            - maternal_brain_project
+            - forrest_gump
             - IntramodalTemplate
             - MultiT1w
             - Recon_3Tissue_Singleshell_ACT
diff --git a/pyproject.toml b/pyproject.toml
index ca22085f..95891de1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -191,6 +191,8 @@ markers = [
     "mrtrix3_recon: test 20",
     "tortoise_recon: test 21",
     "multi_t1w: test 22",
+    "maternal_brain_project: multi-shell with GRE field map",
+    "forrest_gump: single-shell with GRE field map",
 ]
 env = [
     "RUNNING_PYTEST = 1",
diff --git a/qsiprep/interfaces/niworkflows.py b/qsiprep/interfaces/niworkflows.py
index 19f74e7c..ecebb412 100644
--- a/qsiprep/interfaces/niworkflows.py
+++ b/qsiprep/interfaces/niworkflows.py
@@ -8,8 +8,11 @@
 
 
 """
+
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+from mimetypes import guess_type
+
 import matplotlib.pyplot as plt
 import nibabel as nb
 import numpy as np
@@ -18,8 +21,15 @@
 from nipype import logging
 from nipype.interfaces import ants
 from nipype.interfaces.ants import Registration
-from nipype.interfaces.base import traits
+from nipype.interfaces.base import (
+    BaseInterfaceInputSpec,
+    File,
+    SimpleInterface,
+    TraitedSpec,
+    traits,
+)
 from nipype.interfaces.mixins import reporting
+from nipype.utils.filemanip import fname_presuffix
 from niworkflows.interfaces.norm import (
     SpatialNormalization,
     _SpatialNormalizationInputSpec,
@@ -112,7 +122,9 @@ def plot(self, figure=None):
             grid_id += 1
 
         plot_sliceqc(
-            self.qc_data["slice_scores"].T, self.qc_data["slice_counts"], subplot=grid[-1]
+            self.qc_data["slice_scores"].T,
+            self.qc_data["slice_counts"],
+            subplot=grid[-1],
         )
         return figure
 
@@ -231,7 +243,6 @@ def confoundplot(
     cutoff=None,
     ylims=None,
 ):
-
     # Define TR and number of frames
     notr = False
     if tr is None:
@@ -439,3 +450,182 @@ def _post_run_hook(self, runtime):
         )
 
         return super(RobustMNINormalizationRPT, self)._post_run_hook(runtime)
+
+
+class FUGUEvsm2ANTSwarpInputSpec(BaseInterfaceInputSpec):
+    in_file = File(exists=True, mandatory=True, desc="input displacements field map")
+    pe_dir = traits.Enum("i", "i-", "j", "j-", "k", "k-", desc="phase-encoding axis")
+
+
+class FUGUEvsm2ANTSwarpOutputSpec(TraitedSpec):
+    out_file = File(desc="the output warp field")
+
+
+class FUGUEvsm2ANTSwarp(SimpleInterface):
+    """Convert a voxel-shift-map to ants warp."""
+
+    input_spec = FUGUEvsm2ANTSwarpInputSpec
+    output_spec = FUGUEvsm2ANTSwarpOutputSpec
+
+    def _run_interface(self, runtime):
+        nii = nb.load(self.inputs.in_file)
+
+        phaseEncDim = {"i": 0, "j": 1, "k": 2}[self.inputs.pe_dir[0]]
+
+        if len(self.inputs.pe_dir) == 2:
+            phaseEncSign = 1.0
+        else:
+            phaseEncSign = -1.0
+
+        # Fix header
+        hdr = nii.header.copy()
+        hdr.set_data_dtype(np.dtype("<f4"))
+        hdr.set_intent("vector", (), "")
+
+        # Get data, convert to mm
+        data = nii.get_fdata()
+
+        aff = np.diag([1.0, 1.0, -1.0])
+        if np.linalg.det(aff) < 0 and phaseEncDim != 0:
+            # Reverse direction since ITK is LPS
+            aff *= -1.0
+
+        aff = aff.dot(nii.affine[:3, :3])
+
+        data *= phaseEncSign * nii.header.get_zooms()[phaseEncDim]
+
+        # Add missing dimensions
+        zeros = np.zeros_like(data)
+        field = [zeros, zeros]
+        field.insert(phaseEncDim, data)
+        field = np.stack(field, -1)
+        # Add empty axis
+        field = field[:, :, :, np.newaxis, :]
+
+        # Write out
+        self._results["out_file"] = fname_presuffix(
+            self.inputs.in_file, suffix="_antswarp", newpath=runtime.cwd
+        )
+        nb.Nifti1Image(field.astype(np.dtype("<f4")), nii.affine, hdr).to_filename(
+            self._results["out_file"]
+        )
+
+        return runtime
+
+
+def _mat2itk(args):
+    from nipype.interfaces.c3 import C3dAffineTool
+    from nipype.utils.filemanip import fname_presuffix
+
+    in_file, in_ref, in_src, index, newpath = args
+    # Generate a temporal file name
+    out_file = fname_presuffix(in_file, suffix="_itk-%05d.txt" % index, newpath=newpath)
+
+    # Run c3d_affine_tool
+    C3dAffineTool(
+        transform_file=in_file,
+        reference_file=in_ref,
+        source_file=in_src,
+        fsl2ras=True,
+        itk_transform=out_file,
+        resource_monitor=False,
+    ).run()
+    transform = "#Transform %d\n" % index
+    with open(out_file) as itkfh:
+        transform += "".join(itkfh.readlines()[2:])
+
+    return (index, transform)
+
+
+def _applytfms(args):
+    """
+    Applies ANTs' antsApplyTransforms to the input image.
+    All inputs are zipped in one tuple to make it digestible by
+    multiprocessing's map
+    """
+    import nibabel as nb
+    from nipype.utils.filemanip import fname_presuffix
+    from niworkflows.interfaces.fixes import FixHeaderApplyTransforms as ApplyTransforms
+
+    in_file, in_xform, ifargs, index, newpath = args
+    out_file = fname_presuffix(
+        in_file, suffix="_xform-%05d" % index, newpath=newpath, use_ext=True
+    )
+
+    copy_dtype = ifargs.pop("copy_dtype", False)
+    xfm = ApplyTransforms(
+        input_image=in_file, transforms=in_xform, output_image=out_file, **ifargs
+    )
+    xfm.terminal_output = "allatonce"
+    xfm.resource_monitor = False
+    runtime = xfm.run().runtime
+
+    if copy_dtype:
+        nii = nb.load(out_file)
+        in_dtype = nb.load(in_file).get_data_dtype()
+
+        # Overwrite only iff dtypes don't match
+        if in_dtype != nii.get_data_dtype():
+            nii.set_data_dtype(in_dtype)
+            nii.to_filename(out_file)
+
+    return (out_file, runtime.cmdline)
+
+
+def _arrange_xfms(transforms, num_files, tmp_folder):
+    """
+    Convenience method to arrange the list of transforms that should be applied
+    to each input file
+    """
+    base_xform = ["#Insight Transform File V1.0", "#Transform 0"]
+    # Initialize the transforms matrix
+    xfms_T = []
+    for i, tf_file in enumerate(transforms):
+        # If it is a deformation field, copy to the tfs_matrix directly
+        if guess_type(tf_file)[0] != "text/plain":
+            xfms_T.append([tf_file] * num_files)
+            continue
+
+        with open(tf_file) as tf_fh:
+            tfdata = tf_fh.read().strip()
+
+        # If it is not an ITK transform file, copy to the tfs_matrix directly
+        if not tfdata.startswith("#Insight Transform File"):
+            xfms_T.append([tf_file] * num_files)
+            continue
+
+        # Count number of transforms in ITK transform file
+        nxforms = tfdata.count("#Transform")
+
+        # Remove first line
+        tfdata = tfdata.split("\n")[1:]
+
+        # If it is a ITK transform file with only 1 xform, copy to the tfs_matrix directly
+        if nxforms == 1:
+            xfms_T.append([tf_file] * num_files)
+            continue
+
+        if nxforms != num_files:
+            raise RuntimeError(
+                "Number of transforms (%d) found in the ITK file does not match"
+                " the number of input image files (%d)." % (nxforms, num_files)
+            )
+
+        # At this point splitting transforms will be necessary, generate a base name
+        out_base = fname_presuffix(
+            tf_file, suffix="_pos-%03d_xfm-{:05d}" % i, newpath=tmp_folder.name
+        ).format
+        # Split combined ITK transforms file
+        split_xfms = []
+        for xform_i in range(nxforms):
+            # Find start token to extract
+            startidx = tfdata.index("#Transform %d" % xform_i)
+            next_xform = base_xform + tfdata[startidx + 1 : startidx + 4] + [""]
+            xfm_file = out_base(xform_i)
+            with open(xfm_file, "w") as out_xfm:
+                out_xfm.write("\n".join(next_xform))
+            split_xfms.append(xfm_file)
+        xfms_T.append(split_xfms)
+
+    # Transpose back (only Python 3)
+    return list(map(list, zip(*xfms_T)))
diff --git a/qsiprep/tests/data/forrest_gump_filter.json b/qsiprep/tests/data/forrest_gump_filter.json
new file mode 100644
index 00000000..42b7af2c
--- /dev/null
+++ b/qsiprep/tests/data/forrest_gump_filter.json
@@ -0,0 +1,8 @@
+{
+    "t1w": {
+        "reconstruction": "autobox"
+    },
+    "t2w": {
+        "reconstruction": "autobox"
+    }
+}
diff --git a/qsiprep/tests/data/forrest_gump_outputs.txt b/qsiprep/tests/data/forrest_gump_outputs.txt
new file mode 100644
index 00000000..bd4ba0c1
--- /dev/null
+++ b/qsiprep/tests/data/forrest_gump_outputs.txt
@@ -0,0 +1,35 @@
+qsiprep
+qsiprep/dataset_description.json
+qsiprep/dwiqc.json
+qsiprep/logs
+qsiprep/logs/CITATION.bib
+qsiprep/logs/CITATION.html
+qsiprep/logs/CITATION.md
+qsiprep/logs/CITATION.tex
+qsiprep/sub-01
+qsiprep/sub-01.html
+qsiprep/sub-01/anat
+qsiprep/sub-01/anat/sub-01_desc-aseg_dseg.nii.gz
+qsiprep/sub-01/anat/sub-01_desc-brain_mask.nii.gz
+qsiprep/sub-01/anat/sub-01_desc-preproc_T1w.nii.gz
+qsiprep/sub-01/anat/sub-01_dseg.nii.gz
+qsiprep/sub-01/anat/sub-01_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
+qsiprep/sub-01/anat/sub-01_from-T1wACPC_to-T1wNative_mode-image_xfm.mat
+qsiprep/sub-01/anat/sub-01_from-T1wNative_to-T1wACPC_mode-image_xfm.mat
+qsiprep/sub-01/anat/sub-01_from-T1w_to-MNI152NLin2009cAsym_mode-image_xfm.h5
+qsiprep/sub-01/ses-forrestgump
+qsiprep/sub-01/ses-forrestgump/anat
+qsiprep/sub-01/ses-forrestgump/anat/sub-01_ses-forrestgump_rec-autobox_from-orig_to-T1w_mode-image_xfm.txt
+qsiprep/sub-01/ses-forrestgump/dwi
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_confounds.tsv
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_desc-ImageQC_dwi.csv
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_desc-SliceQC_dwi.json
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_dwiqc.json
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_space-T1w_desc-brain_mask.nii.gz
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_space-T1w_desc-eddy_cnr.nii.gz
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_space-T1w_desc-preproc_dwi.b
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_space-T1w_desc-preproc_dwi.bval
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_space-T1w_desc-preproc_dwi.bvec
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_space-T1w_desc-preproc_dwi.nii.gz
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_space-T1w_desc-preproc_dwi.txt
+qsiprep/sub-01/ses-forrestgump/dwi/sub-01_ses-forrestgump_space-T1w_dwiref.nii.gz
diff --git a/qsiprep/tests/data/maternal_brain_project_filter.json b/qsiprep/tests/data/maternal_brain_project_filter.json
new file mode 100644
index 00000000..bb7f364e
--- /dev/null
+++ b/qsiprep/tests/data/maternal_brain_project_filter.json
@@ -0,0 +1,5 @@
+{
+    "t1w": {
+        "reconstruction": "autobox"
+    }
+}
diff --git a/qsiprep/tests/data/maternal_brain_project_outputs.txt b/qsiprep/tests/data/maternal_brain_project_outputs.txt
new file mode 100644
index 00000000..41e7bb0a
--- /dev/null
+++ b/qsiprep/tests/data/maternal_brain_project_outputs.txt
@@ -0,0 +1,36 @@
+qsiprep
+qsiprep/dataset_description.json
+qsiprep/dwiqc.json
+qsiprep/logs
+qsiprep/logs/CITATION.bib
+qsiprep/logs/CITATION.html
+qsiprep/logs/CITATION.md
+qsiprep/logs/CITATION.tex
+qsiprep/sub-01
+qsiprep/sub-01.html
+qsiprep/sub-01/anat
+qsiprep/sub-01/anat/sub-01_desc-aseg_dseg.nii.gz
+qsiprep/sub-01/anat/sub-01_desc-brain_mask.nii.gz
+qsiprep/sub-01/anat/sub-01_desc-preproc_T1w.nii.gz
+qsiprep/sub-01/anat/sub-01_dseg.nii.gz
+qsiprep/sub-01/anat/sub-01_from-MNI152NLin2009cAsym_to-T1w_mode-image_xfm.h5
+qsiprep/sub-01/anat/sub-01_from-T1wACPC_to-T1wNative_mode-image_xfm.mat
+qsiprep/sub-01/anat/sub-01_from-T1wNative_to-T1wACPC_mode-image_xfm.mat
+qsiprep/sub-01/anat/sub-01_from-T1w_to-MNI152NLin2009cAsym_mode-image_xfm.h5
+qsiprep/sub-01/ses-01
+qsiprep/sub-01/ses-01/anat
+qsiprep/sub-01/ses-01/anat/sub-01_ses-01_rec-autobox_from-orig_to-T1w_mode-image_xfm.txt
+qsiprep/sub-01/ses-01/dwi
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_confounds.tsv
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_desc-ImageQC_dwi.csv
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_desc-SliceQC_dwi.json
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_dwiqc.json
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_hmcOptimization.csv
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_space-T1w_desc-3dSHORE_cnr.nii.gz
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_space-T1w_desc-brain_mask.nii.gz
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_space-T1w_desc-preproc_dwi.b
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_space-T1w_desc-preproc_dwi.bval
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_space-T1w_desc-preproc_dwi.bvec
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_space-T1w_desc-preproc_dwi.nii.gz
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_space-T1w_desc-preproc_dwi.txt
+qsiprep/sub-01/ses-01/dwi/sub-01_ses-01_space-T1w_dwiref.nii.gz
diff --git a/qsiprep/tests/data/pyafq_recon_external_trk_optional_outputs.txt b/qsiprep/tests/data/pyafq_recon_external_trk_optional_outputs.txt
index f3690a59..104e9406 100644
--- a/qsiprep/tests/data/pyafq_recon_external_trk_optional_outputs.txt
+++ b/qsiprep/tests/data/pyafq_recon_external_trk_optional_outputs.txt
@@ -1,3 +1,5 @@
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuate_tractography.trk
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_core_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuateviz_dwi.html
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_core_bundles/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwi_space-RASMM_model-probCSD_algo-AFQ_desc-ARCLviz_dwi.html
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuate_tractography.trk
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_core_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuateviz_dwi.html
diff --git a/qsiprep/tests/data/pyafq_recon_full_optional_outputs.txt b/qsiprep/tests/data/pyafq_recon_full_optional_outputs.txt
index 2043c227..f5d15b24 100644
--- a/qsiprep/tests/data/pyafq_recon_full_optional_outputs.txt
+++ b/qsiprep/tests/data/pyafq_recon_full_optional_outputs.txt
@@ -1,4 +1,3 @@
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuateviz_dwi.html
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuate_tractography.trk
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuate_tractography.trk
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuateviz_dwi.html
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_core_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuateviz_dwi.html
diff --git a/qsiprep/tests/data/pyafq_recon_full_outputs.txt b/qsiprep/tests/data/pyafq_recon_full_outputs.txt
index f5e2361c..8a01940d 100644
--- a/qsiprep/tests/data/pyafq_recon_full_outputs.txt
+++ b/qsiprep/tests/data/pyafq_recon_full_outputs.txt
@@ -1,115 +1,114 @@
+qsiprep
+qsiprep/dataset_description.json
+qsiprep/dwiqc.json
+qsiprep/logs
+qsiprep/logs/CITATION.bib
+qsiprep/logs/CITATION.html
+qsiprep/logs/CITATION.md
+qsiprep/logs/CITATION.tex
+qsiprep/sub-ABCD
+qsiprep/sub-ABCD.html
 qsirecon
-qsirecon/sub-ABCD
 qsirecon-PYAFQ
 qsirecon-PYAFQ/sub-ABCD
 qsirecon-PYAFQ/sub-ABCD/dwi
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-slCount_dwi.csv
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-brainmasktrans_dwi.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_desc-seed_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_bundles
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-RightCorticospinalviz_dwi.html
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftCorticospinalviz_dwi.html
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftSuperiorLongitudinalviz_dwi.html
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_space-subject_desc-template_dwi.json
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalinclude1_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalstart0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalprob_map0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalend0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateprob_map0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuatestart0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalinclude1_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateinclude0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalprob_map0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateprob_map0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalinclude1_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalinclude0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalstart0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalstart0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalend0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateend0_mask.json
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateend0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalstart0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalinclude0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalprob_map0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateinclude1_mask.nii.gz
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateinclude0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalprob_map0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalinclude1_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalstart0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateend0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalprob_map0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalinclude0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalinclude0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalexclude0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalend0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalstart0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateinclude0_mask.nii.gz
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateinclude1_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateinclude1_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateprob_map0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuateprob_map0_mask.nii.gz
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuatestart0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftArcuatestart0_mask.nii.gz
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalend0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalend0_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalexclude0_mask.json
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalend0_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalprob_map0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalinclude0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalinclude0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalinclude1_mask.json
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalinclude1_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalinclude0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalprob_map0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalprob_map0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalstart0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftCorticospinalstart0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalend0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalend0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalexclude0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalexclude0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalinclude0_mask.json
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalinclude0_mask.nii.gz
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalinclude1_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-profiles_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalinclude1_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalprob_map0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalprob_map0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalstart0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-LeftSuperiorLongitudinalstart0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalend0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalend0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalinclude0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalinclude0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalinclude1_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalinclude1_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalprob_map0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalprob_map0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalstart0_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/ROIs/sub-ABCD_acq-10per000_space-subject_desc-RightCorticospinalstart0_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuate_tractography.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftCorticospinal_tractography.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftCorticospinal_tractography.trk
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftSuperiorLongitudinal_tractography.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftSuperiorLongitudinal_tractography.trk
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-RightCorticospinal_tractography.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-RightCorticospinal_tractography.trk
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_desc-seed_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_space-template_desc-b0_dwi.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_desc-seed_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_desc-stop_mask.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_desc-stop_mask.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-RightCorticospinalviz_dwi
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-medianBundleLengths_dwi.csv
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-medianBundleLengths_dwi.json
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-profiles_dwi.csv
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-DTI_desc-FA_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-profiles_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-slCount_dwi.csv
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-slCount_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-viz_dwi.html
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-viz_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_tractography.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_tractography.trk
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_tractography.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_tractography.trk
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-b0_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-b0_dwi.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-brainmasktrans_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-brainmasktrans_dwi.nii.gz
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-mapping_from-DWI_to-MNI_xform.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-DTI_desc-MD_dwi.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-mapping_from-DWI_to-MNI_xform.npy
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-maskedb0_dwi.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-CSD_desc-diffmodel_dwi.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_tractography.trk
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-maskedb0_dwi.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-DTI_desc-FA_dwi.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-DTI_desc-diffmodel_dwi.nii.gz
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-CSD_desc-APM_dwi.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-b0_dwi.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-medianBundleLengths_dwi.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_tractography.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-CSD_desc-APM_dwi.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-CSD_desc-diffmodel_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-CSD_desc-diffmodel_dwi.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-DTI_desc-FA_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-DTI_desc-FA_dwi.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-DTI_desc-MD_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-DTI_desc-MD_dwi.nii.gz
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-DTI_desc-diffmodel_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-DTI_desc-diffmodel_dwi.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_space-subject_desc-template_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_space-subject_desc-template_dwi.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_space-template_desc-b0_dwi.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_space-template_desc-b0_dwi.nii.gz
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_bundles
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftCorticospinalviz_dwi.html
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftSuperiorLongitudinalviz_dwi.html
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-RightCorticospinalviz_dwi.html
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_core_bundles
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_core_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-RightCorticospinalviz_dwi.html
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_core_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuateviz_dwi.html
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_core_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftCorticospinalviz_dwi.html
 qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_core_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftSuperiorLongitudinalviz_dwi.html
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_space-subject_desc-template_dwi.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-DTI_desc-MD_dwi.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_desc-stop_mask.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-viz_dwi.html
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-medianBundleLengths_dwi.csv
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_tractography.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-slCount_dwi.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-CSD_desc-APM_dwi.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-b0_dwi.nii.gz
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_odfmodel-CSD_desc-diffmodel_dwi.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_space-template_desc-b0_dwi.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-mapping_from-DWI_to-MNI_xform.npy
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_desc-stop_mask.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_tractography.trk
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_desc-brainmasktrans_dwi.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-RightCorticospinal_tractography.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftSuperiorLongitudinal_tractography.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftCorticospinal_tractography.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftCorticospinal_tractography.trk
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftArcuate_tractography.json
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-RightCorticospinal_tractography.trk
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-LeftSuperiorLongitudinal_tractography.trk
-qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-RightCorticospinalviz_dwi
-qsiprep
-qsiprep/sub-ABCD.html
-qsiprep/sub-ABCD
-qsiprep/logs
-qsiprep/logs/CITATION.tex
-qsiprep/logs/CITATION.bib
-qsiprep/logs/CITATION.md
-qsiprep/logs/CITATION.html
-qsiprep/dataset_description.json
-qsiprep/dwiqc.json
+qsirecon-PYAFQ/sub-ABCD/dwi/sub-ABCD_acq-10per000_space-T1w_desc-preproc_dwimap/viz_core_bundles/sub-ABCD_acq-10per000_coordsys-RASMM_trkmethod-probCSD_recogmethod-AFQ_desc-RightCorticospinalviz_dwi.html
+qsirecon/sub-ABCD
diff --git a/qsiprep/tests/test_cli.py b/qsiprep/tests/test_cli.py
index 89c89345..acf79ef3 100644
--- a/qsiprep/tests/test_cli.py
+++ b/qsiprep/tests/test_cli.py
@@ -965,11 +965,83 @@ def test_tortoise_recon(data_dir, output_dir, working_dir):
     _run_and_generate(TEST_NAME, parameters, test_main=True)
 
 
+@pytest.mark.integration
+@pytest.mark.maternal_brain_project
+def test_maternal_brain_project(data_dir, output_dir, working_dir):
+    """Run QSIPrep on Maternal Brain Project data.
+
+    The dataset was built from the Maternal Brain Project dataset:
+    https://openneuro.org/datasets/ds005299/versions/1.0.0
+
+    The first subject's first session DWI data were downsampled to 5 mm isotropic voxels.
+    The dataset contains multi-shell DWI data with a GRE field map.
+    """
+    TEST_NAME = "maternal_brain_project"
+
+    dataset_dir = download_test_data("maternal_brain_project", data_dir)
+    out_dir = os.path.join(output_dir, TEST_NAME)
+    work_dir = os.path.join(working_dir, TEST_NAME)
+
+    test_data_path = get_test_data_path()
+    bids_filter = os.path.join(test_data_path, f"{TEST_NAME}_filter.json")
+
+    parameters = [
+        dataset_dir,
+        out_dir,
+        "participant",
+        f"-w={work_dir}",
+        "--sloppy",
+        "--write-graph",
+        "--output-resolution=5",
+        "--hmc-model=3dSHORE",
+        f"--bids-filter-file={bids_filter}",
+        "--nthreads=4",
+        "--omp-nthreads=4",
+    ]
+
+    _run_and_generate(TEST_NAME, parameters, test_main=True)
+
+
+@pytest.mark.integration
+@pytest.mark.forrest_gump
+def test_forrest_gump(data_dir, output_dir, working_dir):
+    """Run QSIPrep on Forrest Gump data.
+
+    The dataset was built from the Forrest Gump dataset:
+    https://openneuro.org/datasets/ds000113/versions/1.3.0
+
+    The first subject's first session DWI data were downsampled to 5 mm isotropic voxels.
+    The dataset contains single-shell DWI data with a GRE field map.
+    """
+    TEST_NAME = "forrest_gump"
+
+    dataset_dir = download_test_data("forrest_gump", data_dir)
+    out_dir = os.path.join(output_dir, TEST_NAME)
+    work_dir = os.path.join(working_dir, TEST_NAME)
+
+    test_data_path = get_test_data_path()
+    bids_filter = os.path.join(test_data_path, f"{TEST_NAME}_filter.json")
+
+    parameters = [
+        dataset_dir,
+        out_dir,
+        "participant",
+        f"-w={work_dir}",
+        "--sloppy",
+        "--write-graph",
+        "--output-resolution=5",
+        f"--bids-filter-file={bids_filter}",
+        "--nthreads=4",
+        "--omp-nthreads=4",
+    ]
+
+    _run_and_generate(TEST_NAME, parameters, test_main=True)
+
+
 def _run_and_generate(test_name, parameters, test_main=True):
     from qsiprep import config
 
-    # TODO: Add this param
-    # parameters.append("--clean-workdir")
+    # TODO: Add --clean-workdir param to CLI
     parameters.append("--stop-on-first-crash")
     parameters.append("--notrack")
     parameters.append("-vv")
diff --git a/qsiprep/tests/utils.py b/qsiprep/tests/utils.py
index 9b9c9161..8dd6f8d2 100644
--- a/qsiprep/tests/utils.py
+++ b/qsiprep/tests/utils.py
@@ -35,6 +35,10 @@ def download_test_data(dset, data_dir=None):
         "drbuddi_epi": "https://upenn.box.com/shared/static/plyuee1nbj9v8eck03s38ojji8tkspwr.xz",
         "DSDTI_fmap": "https://upenn.box.com/shared/static/rxr6qbi6ezku9gw3esfpnvqlcxaw7n5n.gz",
         "DSCSDSI_fmap": "https://upenn.box.com/shared/static/l561psez1ojzi4p3a12eidaw9vbizwdc.gz",
+        "maternal_brain_project": (
+            "https://upenn.box.com/shared/static/tkahg1ctipmfihvpa1gmibvcv0gb721h.xz"
+        ),
+        "forrest_gump": "https://upenn.box.com/shared/static/qat58an322bzzyixrrsk7cmf52q3bepq.xz",
     }
     if dset == "*":
         for k in URLS:
diff --git a/qsiprep/workflows/fieldmap/unwarp.py b/qsiprep/workflows/fieldmap/unwarp.py
index f5dc82e4..cdc900a1 100644
--- a/qsiprep/workflows/fieldmap/unwarp.py
+++ b/qsiprep/workflows/fieldmap/unwarp.py
@@ -26,7 +26,6 @@
 from nipype.interfaces import utility as niu
 from nipype.pipeline import engine as pe
 from niworkflows.engine.workflows import LiterateWorkflow as Workflow
-from niworkflows.interfaces import itk
 from niworkflows.interfaces.nibabel import DemeanImage, FilledImageLike
 from niworkflows.interfaces.reportlets.registration import (
     ANTSApplyTransformsRPT,
@@ -37,6 +36,7 @@
 from ...interfaces import DerivativesDataSink
 from ...interfaces.fmap import FieldToHz, FieldToRadS
 from ...interfaces.fmap import get_ees as _get_ees
+from ...interfaces.niworkflows import FUGUEvsm2ANTSwarp
 
 
 def init_sdc_unwarp_wf(name="sdc_unwarp_wf"):
@@ -177,7 +177,7 @@ def init_sdc_unwarp_wf(name="sdc_unwarp_wf"):
     gen_vsm = pe.Node(fsl.FUGUE(save_unmasked_shift=True, save_fmap=True), name="gen_vsm")
     # Convert the VSM into a DFM (displacements field map)
     # or: FUGUE shift to ANTS warping.
-    vsm2dfm = pe.Node(itk.FUGUEvsm2ANTSwarp(), name="vsm2dfm")
+    vsm2dfm = pe.Node(FUGUEvsm2ANTSwarp(), name="vsm2dfm")
     jac_dfm = pe.Node(
         ants.CreateJacobianDeterminantImage(imageDimension=3, outputImage="jacobian.nii.gz"),
         name="jac_dfm",