diff --git a/.ci/build_doc.sh b/.ci/build_doc.sh
index e15a2d163c9edf257b430ffd0fd916304d669949..e62c71f4a64faca227318492ae93ca71fefb8dcb 100644
--- a/.ci/build_doc.sh
+++ b/.ci/build_doc.sh
@@ -2,7 +2,6 @@
 
 set -e
 
-pip install -r requirements-dev.txt
-python setup.py doc
-mkdir -p public
-mv doc/html/* public/
+source /test.env/bin/activate
+pip install ".[doc]"
+sphinx-build doc public
diff --git a/.ci/build_pypi_dist.sh b/.ci/build_pypi_dist.sh
index 14cee6119baa4e84c55cff1850da7204bdb43391..07557488bc1cd2fbe0179b0466c7ff9c4a0f6917 100644
--- a/.ci/build_pypi_dist.sh
+++ b/.ci/build_pypi_dist.sh
@@ -2,9 +2,11 @@
 
 set -e
 
-pip install wheel setuptools twine
-python setup.py sdist
-python setup.py bdist_wheel
+source /test.venv/bin/activate
+
+pip install --upgrade pip wheel setuptools twine build
+
+python -m build
 twine check dist/*
 
 # do a test install from both source and wheel
diff --git a/.ci/setup_ssh.sh b/.ci/setup_ssh.sh
index 9c07270b15dc173ee0001d926036d70952e97990..18d4ceeee51601dddcd2d54496fde0666f4dc3cd 100644
--- a/.ci/setup_ssh.sh
+++ b/.ci/setup_ssh.sh
@@ -43,37 +43,20 @@ if [[ -f /.dockerenv ]]; then
  eval $(ssh-agent -s);
  mkdir -p $HOME/.ssh;
 
- echo "$SSH_PRIVATE_KEY_GIT"          > $HOME/.ssh/id_git;
  echo "$SSH_PRIVATE_KEY_FSL_DOWNLOAD" > $HOME/.ssh/id_fsl_download;
 
- if [[ "$CI_PROJECT_PATH" == "$UPSTREAM_PROJECT" ]]; then
-   echo "$SSH_PRIVATE_KEY_DOC_DEPLOY"  > $HOME/.ssh/id_doc_deploy;
- fi;
-
  chmod go-rwx $HOME/.ssh/id_*;
 
- ssh-add $HOME/.ssh/id_git;
  ssh-add $HOME/.ssh/id_fsl_download;
 
  if [[ "$CI_PROJECT_PATH" == "$UPSTREAM_PROJECT" ]]; then
    ssh-add $HOME/.ssh/id_doc_deploy;
  fi
 
- ssh-keyscan ${UPSTREAM_URL##*@} >> $HOME/.ssh/known_hosts;
- ssh-keyscan ${DOC_HOST##*@}     >> $HOME/.ssh/known_hosts;
- ssh-keyscan ${FSL_HOST##*@}     >> $HOME/.ssh/known_hosts;
+ ssh-keyscan ${FSL_HOST##*@} >> $HOME/.ssh/known_hosts;
 
  touch $HOME/.ssh/config;
 
- echo "Host ${UPSTREAM_URL##*@}"                    >> $HOME/.ssh/config;
- echo "    User ${UPSTREAM_URL%@*}"                 >> $HOME/.ssh/config;
- echo "    IdentityFile $HOME/.ssh/id_git"          >> $HOME/.ssh/config;
-
- echo "Host docdeploy"                              >> $HOME/.ssh/config;
- echo "    HostName ${DOC_HOST##*@}"                >> $HOME/.ssh/config;
- echo "    User ${DOC_HOST%@*}"                     >> $HOME/.ssh/config;
- echo "    IdentityFile $HOME/.ssh/id_doc_deploy"   >> $HOME/.ssh/config;
-
  echo "Host fsldownload"                            >> $HOME/.ssh/config;
  echo "    HostName ${FSL_HOST##*@}"                >> $HOME/.ssh/config;
  echo "    User ${FSL_HOST%@*}"                     >> $HOME/.ssh/config;
diff --git a/.ci/test_template.sh b/.ci/test_template.sh
index f0a8c7103e835411884441f2da6464c17af167c3..711a66604f20cd9b4d9bd5546efeedfb5b93cd39 100644
--- a/.ci/test_template.sh
+++ b/.ci/test_template.sh
@@ -2,34 +2,14 @@
 
 set -e
 
-# Temporary: this should be done
-# in docker image definition
-apt install -y locales
-locale-gen en_US.UTF-8
-locale-gen en_GB.UTF-8
-update-locale
-
-# If running on a fork repository, we merge in the
-# upstream/master branch. This is done so that merge
-# requests from fork to the parent repository will
-# have unit tests run on the merged code, something
-# which gitlab CE does not currently do for us.
-if [[ "$CI_PROJECT_PATH" != "$UPSTREAM_PROJECT" ]]; then
-  git fetch upstream;
-  git merge --no-commit --no-ff -s recursive -X ours upstream/master;
-fi;
-
 source /test.venv/bin/activate
 
-pip install --retries 10 -r requirements.txt
-pip install --retries 10 -r requirements-extra.txt
-pip install --retries 10 -r requirements-dev.txt
+pip install ".[extra,test,style]"
 
 # style stage
-if [ "$TEST_STYLE"x != "x" ]; then pip install --retries 10 pylint flake8; fi;
 if [ "$TEST_STYLE"x != "x" ]; then flake8                           fsl || true; fi;
 if [ "$TEST_STYLE"x != "x" ]; then pylint --output-format=colorized fsl || true; fi;
-if [ "$TEST_STYLE"x != "x" ]; then exit 0; fi
+if [ "$TEST_STYLE"x != "x" ]; then exit 0;                                       fi;
 
 # We need the FSL atlases for the atlas
 # tests, and need $FSLDIR to be defined
@@ -37,15 +17,16 @@ export FSLDIR=/fsl/
 mkdir -p $FSLDIR/data/
 rsync -rv "fsldownload:$FSL_ATLAS_DIR" "$FSLDIR/data/atlases/"
 
-# Finally, run the damned tests.
+# Run the tests. Suppress coverage
+# reporting until after we're finished.
 TEST_OPTS="--cov-report= --cov-append"
 
 # We run some tests under xvfb-run
 # because they invoke wx. Sleep in
 # between, otherwise xvfb gets upset.
-xvfb-run -a python setup.py test --addopts="$TEST_OPTS tests/test_idle.py"
+xvfb-run -a pytest $TEST_OPTS fsl/tests/test_idle.py
 sleep 5
-xvfb-run -a python setup.py test --addopts="$TEST_OPTS tests/test_platform.py"
+xvfb-run -a pytest $TEST_OPTS fsl/tests/test_platform.py
 
 # We run the immv/imcp tests as the nobody
 # user because some tests expect permission
@@ -54,16 +35,20 @@ xvfb-run -a python setup.py test --addopts="$TEST_OPTS tests/test_platform.py"
 # this directory writable by anybody (which,
 # unintuitively, includes nobody)
 chmod -R a+w `pwd`
-cmd="source /test.venv/bin/activate && python setup.py test"
-cmd="$cmd --addopts='$TEST_OPTS tests/test_scripts/test_immv_imcp.py tests/test_immv_imcp.py'"
+cmd="source /test.venv/bin/activate && pytest"
+cmd="$cmd $TEST_OPTS fsl/tests/test_scripts/test_immv_imcp.py fsl/tests/test_immv_imcp.py"
 su -s /bin/bash -c "$cmd" nobody
 
 # All other tests can be run as normal.
-python setup.py test --addopts="$TEST_OPTS -m 'not longtest' --ignore=tests/test_idle.py --ignore=tests/test_platform.py --ignore=tests/test_immv_imcp.py --ignore=tests/test_scripts/test_immv_imcp.py"
+pytest $TEST_OPTS -m 'not longtest'         \
+       --ignore=fsl/tests/test_idle.py      \
+       --ignore=fsl/tests/test_platform.py  \
+       --ignore=fsl/tests/test_immv_imcp.py \
+       --ignore=fsl/tests/test_scripts/test_immv_imcp.py
 
 # Long tests are only run on release branches
 if [[ $CI_COMMIT_REF_NAME == v* ]]; then
-    python setup.py test --addopts="$TEST_OPTS -m 'longtest'"
+    pytest $TEST_OPTS -m 'longtest'
 fi
 
 python -m coverage report -i
diff --git a/.ci/zenodo_deposit.sh b/.ci/zenodo_deposit.sh
index 32856bb59d850033d4eaa155bec2f6ee61d94862..9c4a0ed7ee85a5355d55b8775f19ae425c7ba93b 100644
--- a/.ci/zenodo_deposit.sh
+++ b/.ci/zenodo_deposit.sh
@@ -9,10 +9,14 @@ zenodo_url=$1
 zenodo_tkn=$2
 zenodo_depid=$3
 
-version=`python setup.py -V`
-upfile=`pwd`/dist/fslpy-"$version".tar.gz
-metafile=`pwd`/.ci/zenodo_meta.json.jinja2
-date=`date +"%Y-%m-%d"`
+version=$(cat fsl/version.py      |
+          egrep '^__version__ +=' |
+          cut -d "=" -f 2         |
+          tr -d "'"               |
+          tr -d ' ')
+upfile=$(pwd)/dist/fslpy-"$version".tar.gz
+metafile=$(pwd)/.ci/zenodo_meta.json.jinja2
+date=$(date +"%Y-%m-%d")
 
 pip install --retries 10 requests jinja2
 
diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index 4022c993cf882e646781b248f1d186b473b4c0ba..0000000000000000000000000000000000000000
--- a/.coveragerc
+++ /dev/null
@@ -1,4 +0,0 @@
-[run]
-source = fsl
-omit =
-    fsl/data/imagewrapper.py
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ee283a717c74987994814da47b6f3758fd218cea..e2fd66a75e6ca97652f15f2280b5ebc7121d8642 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,9 +2,21 @@ This document contains the ``fslpy`` release history in reverse chronological
 order.
 
 
+3.14.0 (Under development)
+--------------------------
+
+
+Changed
+^^^^^^^
+
+* The ``sform``/``qform`` fields of a :class:`.DeformationField` instance are
+  automatically set from the reference image if they are not already set (!402).
+* Replaced ``setup.py``-based build system with ``pyproject.toml`` (!402).
+* Tests have been moved into the ``fsl/tests/`` package (!402).
+
 
 3.13.3 (Monday 17th July 2023)
--------------------=----------
+------------------------------
 
 
 Changed
diff --git a/COPYRIGHT b/COPYRIGHT
index ca6e317895149e49a34705663c4c40bbc2277cec..ab5e5b0297b0bed665ed63bfc739c3cc9adb3e65 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1 +1 @@
-Copyright 2016-2021 University of Oxford, Oxford, UK
+Copyright 2016-2023 University of Oxford, Oxford, UK
diff --git a/LICENSE b/LICENSE
index 29dca5745c25932d5ed83f120fce41be0c17340f..785c943e87f87499b583f2929a1b7fb01cd60f9e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The fslpy library
 
-Copyright 2016-2021 University of Oxford, Oxford, UK.
+Copyright 2016-2023 University of Oxford, Oxford, UK.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/MANIFEST.in b/MANIFEST.in
index b0332d96464e6ad2c78ce129c9a401bc079c254e..85b607fe616aad5c50d231a21b6eb698f5cebc1f 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,12 +1,8 @@
 include           AUTHOR
-include           LICENSE
-include           COPYRIGHT
 include           CHANGELOG.rst
+include           COPYRIGHT
+include           LICENSE
 include           README.rst
-include           requirements.txt
-include           requirements-dev.txt
-include           requirements-extra.txt
-include           setup.cfg
-recursive-include doc      *
-recursive-exclude doc/html *
-recursive-include tests    *
+include           conftest.py
+recursive-include doc       *
+recursive-include fsl/tests *
diff --git a/tests/conftest.py b/conftest.py
similarity index 100%
rename from tests/conftest.py
rename to conftest.py
diff --git a/tests/__init__.py b/fsl/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to fsl/tests/__init__.py
diff --git a/tests/test_assertions.py b/fsl/tests/test_assertions.py
similarity index 100%
rename from tests/test_assertions.py
rename to fsl/tests/test_assertions.py
diff --git a/tests/test_atlases.py b/fsl/tests/test_atlases.py
similarity index 99%
rename from tests/test_atlases.py
rename to fsl/tests/test_atlases.py
index ccc73b27841c21833897c3ba4c819ed32368b0b4..623858c219314896315f9ecf96b4c227378175ba 100644
--- a/tests/test_atlases.py
+++ b/fsl/tests/test_atlases.py
@@ -17,7 +17,7 @@ import numpy     as np
 from unittest import mock
 import pytest
 
-import tests
+import fsl.tests                as tests
 import fsl.utils.image.resample as resample
 import fsl.data.atlases         as atlases
 import fsl.data.image           as fslimage
diff --git a/tests/test_atlases_query.py b/fsl/tests/test_atlases_query.py
similarity index 100%
rename from tests/test_atlases_query.py
rename to fsl/tests/test_atlases_query.py
diff --git a/tests/test_bids.py b/fsl/tests/test_bids.py
similarity index 100%
rename from tests/test_bids.py
rename to fsl/tests/test_bids.py
diff --git a/tests/test_bitmap.py b/fsl/tests/test_bitmap.py
similarity index 100%
rename from tests/test_bitmap.py
rename to fsl/tests/test_bitmap.py
diff --git a/tests/test_cache.py b/fsl/tests/test_cache.py
similarity index 100%
rename from tests/test_cache.py
rename to fsl/tests/test_cache.py
diff --git a/tests/test_cifti.py b/fsl/tests/test_cifti.py
similarity index 99%
rename from tests/test_cifti.py
rename to fsl/tests/test_cifti.py
index d0b758f2bd1ff6baec7c9eece4023795583e5340..2e496f2290faebb882e3c82255461d04c0224b15 100644
--- a/tests/test_cifti.py
+++ b/fsl/tests/test_cifti.py
@@ -3,7 +3,7 @@ import os.path as op
 import numpy as np
 import nibabel as nib
 from numpy import testing
-import tests
+import fsl.tests as tests
 from nibabel.cifti2 import cifti2_axes
 
 
diff --git a/tests/test_deprecated.py b/fsl/tests/test_deprecated.py
similarity index 100%
rename from tests/test_deprecated.py
rename to fsl/tests/test_deprecated.py
diff --git a/tests/test_dicom.py b/fsl/tests/test_dicom.py
similarity index 100%
rename from tests/test_dicom.py
rename to fsl/tests/test_dicom.py
diff --git a/tests/test_dtifit.py b/fsl/tests/test_dtifit.py
similarity index 99%
rename from tests/test_dtifit.py
rename to fsl/tests/test_dtifit.py
index 00fc058ffca6dabc4f70a0e15459748681d0d539..cb5026940e013b80a3dd016559145f86af3fd015 100644
--- a/tests/test_dtifit.py
+++ b/fsl/tests/test_dtifit.py
@@ -10,7 +10,7 @@ import numpy   as np
 
 import pytest
 
-import tests
+import fsl.tests       as tests
 import fsl.data.dtifit as dtifit
 import fsl.data.image  as fslimage
 
diff --git a/tests/test_ensure.py b/fsl/tests/test_ensure.py
similarity index 100%
rename from tests/test_ensure.py
rename to fsl/tests/test_ensure.py
diff --git a/tests/test_featanalysis.py b/fsl/tests/test_featanalysis.py
similarity index 99%
rename from tests/test_featanalysis.py
rename to fsl/tests/test_featanalysis.py
index 96445cdbd38d1bf983bfa6c33cb89c7399e12cb1..6f07109ed18b5c20f6cd810988a20deb97f26f87 100644
--- a/tests/test_featanalysis.py
+++ b/fsl/tests/test_featanalysis.py
@@ -17,7 +17,7 @@ import numpy     as np
 
 import pytest
 
-import tests
+import fsl.tests             as tests
 import fsl.data.featanalysis as featanalysis
 import fsl.data.featdesign   as featdesign
 import fsl.data.image        as fslimage
diff --git a/tests/test_featdesign.py b/fsl/tests/test_featdesign.py
similarity index 99%
rename from tests/test_featdesign.py
rename to fsl/tests/test_featdesign.py
index 5c5d1a7e3433cb2c62bcb1c13b0e4bf061aa6028..e8ffdecec98d373b40b03b9fa1dfa9983a5444c1 100644
--- a/tests/test_featdesign.py
+++ b/fsl/tests/test_featdesign.py
@@ -108,7 +108,7 @@ import numpy   as np
 
 import pytest
 
-import tests
+import fsl.tests             as     tests
 from   fsl.utils.tempdir     import tempdir
 import fsl.data.featdesign   as     featdesign
 import fsl.data.featanalysis as     featanalysis
diff --git a/tests/test_featimage.py b/fsl/tests/test_featimage.py
similarity index 99%
rename from tests/test_featimage.py
rename to fsl/tests/test_featimage.py
index fb33c6e4ddb13b43dbc4d1883faddf227489b305..370e797366597d44afaf39414e81cdf7f185bd5e 100644
--- a/tests/test_featimage.py
+++ b/fsl/tests/test_featimage.py
@@ -16,7 +16,7 @@ import numpy   as np
 
 import pytest
 
-import tests
+import fsl.tests             as tests
 import fsl.data.featimage    as featimage
 import fsl.data.featdesign   as featdesign
 import fsl.data.featanalysis as featanalysis
@@ -138,7 +138,7 @@ def test_FEATImage_imageAccessors():
 
         shape = TEST_ANALYSES[featdir]['shape']
         xform = TEST_ANALYSES[featdir]['xform']
-        
+
         with tests.testdir() as testdir:
 
             if 'realdata' not in featdir:
diff --git a/tests/test_filetree/__init__.py b/fsl/tests/test_filetree/__init__.py
similarity index 100%
rename from tests/test_filetree/__init__.py
rename to fsl/tests/test_filetree/__init__.py
diff --git a/tests/test_filetree/custom.tree b/fsl/tests/test_filetree/custom.tree
similarity index 100%
rename from tests/test_filetree/custom.tree
rename to fsl/tests/test_filetree/custom.tree
diff --git a/tests/test_filetree/extract_vars.tree b/fsl/tests/test_filetree/extract_vars.tree
similarity index 100%
rename from tests/test_filetree/extract_vars.tree
rename to fsl/tests/test_filetree/extract_vars.tree
diff --git a/tests/test_filetree/format.tree b/fsl/tests/test_filetree/format.tree
similarity index 100%
rename from tests/test_filetree/format.tree
rename to fsl/tests/test_filetree/format.tree
diff --git a/tests/test_filetree/local_parent.tree b/fsl/tests/test_filetree/local_parent.tree
similarity index 100%
rename from tests/test_filetree/local_parent.tree
rename to fsl/tests/test_filetree/local_parent.tree
diff --git a/tests/test_filetree/parent.tree b/fsl/tests/test_filetree/parent.tree
similarity index 100%
rename from tests/test_filetree/parent.tree
rename to fsl/tests/test_filetree/parent.tree
diff --git a/tests/test_filetree/parent/opt_file_test.nii.gz b/fsl/tests/test_filetree/parent/opt_file_test.nii.gz
similarity index 100%
rename from tests/test_filetree/parent/opt_file_test.nii.gz
rename to fsl/tests/test_filetree/parent/opt_file_test.nii.gz
diff --git a/tests/test_filetree/parent/opt_layer_test/opt_file_test.nii.gz b/fsl/tests/test_filetree/parent/opt_layer_test/opt_file_test.nii.gz
similarity index 100%
rename from tests/test_filetree/parent/opt_layer_test/opt_file_test.nii.gz
rename to fsl/tests/test_filetree/parent/opt_layer_test/opt_file_test.nii.gz
diff --git a/tests/test_filetree/parent/opt_layer_test/opt_file_test2.nii.gz b/fsl/tests/test_filetree/parent/opt_layer_test/opt_file_test2.nii.gz
similarity index 100%
rename from tests/test_filetree/parent/opt_layer_test/opt_file_test2.nii.gz
rename to fsl/tests/test_filetree/parent/opt_layer_test/opt_file_test2.nii.gz
diff --git a/tests/test_filetree/parent/opt_layer_test/sub_file.nii.gz b/fsl/tests/test_filetree/parent/opt_layer_test/sub_file.nii.gz
similarity index 100%
rename from tests/test_filetree/parent/opt_layer_test/sub_file.nii.gz
rename to fsl/tests/test_filetree/parent/opt_layer_test/sub_file.nii.gz
diff --git a/tests/test_filetree/parent/sub_file.nii.gz b/fsl/tests/test_filetree/parent/sub_file.nii.gz
similarity index 100%
rename from tests/test_filetree/parent/sub_file.nii.gz
rename to fsl/tests/test_filetree/parent/sub_file.nii.gz
diff --git a/tests/test_filetree/test_query.py b/fsl/tests/test_filetree/test_query.py
similarity index 100%
rename from tests/test_filetree/test_query.py
rename to fsl/tests/test_filetree/test_query.py
diff --git a/tests/test_filetree/test_read.py b/fsl/tests/test_filetree/test_read.py
similarity index 100%
rename from tests/test_filetree/test_read.py
rename to fsl/tests/test_filetree/test_read.py
diff --git a/tests/test_filetree/test_registration.py b/fsl/tests/test_filetree/test_registration.py
similarity index 100%
rename from tests/test_filetree/test_registration.py
rename to fsl/tests/test_filetree/test_registration.py
diff --git a/tests/test_filetree/test_template.py b/fsl/tests/test_filetree/test_template.py
similarity index 100%
rename from tests/test_filetree/test_template.py
rename to fsl/tests/test_filetree/test_template.py
diff --git a/tests/test_fixlabels.py b/fsl/tests/test_fixlabels.py
similarity index 99%
rename from tests/test_fixlabels.py
rename to fsl/tests/test_fixlabels.py
index a6049d57b2ee45cc42e6b75f0d3b418d37b6121d..6d2844643220fd72491be5befb0cae22e71edd57 100644
--- a/tests/test_fixlabels.py
+++ b/fsl/tests/test_fixlabels.py
@@ -10,7 +10,7 @@ import            textwrap
 
 import pytest
 
-import tests
+import fsl.tests          as tests
 import fsl.data.fixlabels as fixlabels
 
 goodfiles = []
diff --git a/tests/test_freesurfer.py b/fsl/tests/test_freesurfer.py
similarity index 100%
rename from tests/test_freesurfer.py
rename to fsl/tests/test_freesurfer.py
diff --git a/tests/test_fsl_data_utils.py b/fsl/tests/test_fsl_data_utils.py
similarity index 100%
rename from tests/test_fsl_data_utils.py
rename to fsl/tests/test_fsl_data_utils.py
diff --git a/tests/test_fsl_utils_path.py b/fsl/tests/test_fsl_utils_path.py
similarity index 100%
rename from tests/test_fsl_utils_path.py
rename to fsl/tests/test_fsl_utils_path.py
diff --git a/tests/test_fslsub.py b/fsl/tests/test_fslsub.py
similarity index 100%
rename from tests/test_fslsub.py
rename to fsl/tests/test_fslsub.py
diff --git a/tests/test_gifti.py b/fsl/tests/test_gifti.py
similarity index 100%
rename from tests/test_gifti.py
rename to fsl/tests/test_gifti.py
diff --git a/tests/test_idle.py b/fsl/tests/test_idle.py
similarity index 100%
rename from tests/test_idle.py
rename to fsl/tests/test_idle.py
diff --git a/tests/test_image.py b/fsl/tests/test_image.py
similarity index 100%
rename from tests/test_image.py
rename to fsl/tests/test_image.py
diff --git a/tests/test_image_data_access.py b/fsl/tests/test_image_data_access.py
similarity index 100%
rename from tests/test_image_data_access.py
rename to fsl/tests/test_image_data_access.py
diff --git a/tests/test_image_resample.py b/fsl/tests/test_image_resample.py
similarity index 100%
rename from tests/test_image_resample.py
rename to fsl/tests/test_image_resample.py
diff --git a/tests/test_image_roi.py b/fsl/tests/test_image_roi.py
similarity index 100%
rename from tests/test_image_roi.py
rename to fsl/tests/test_image_roi.py
diff --git a/tests/test_immv_imcp.py b/fsl/tests/test_immv_imcp.py
similarity index 100%
rename from tests/test_immv_imcp.py
rename to fsl/tests/test_immv_imcp.py
diff --git a/tests/test_importall.py b/fsl/tests/test_importall.py
similarity index 100%
rename from tests/test_importall.py
rename to fsl/tests/test_importall.py
diff --git a/tests/test_melodicanalysis.py b/fsl/tests/test_melodicanalysis.py
similarity index 99%
rename from tests/test_melodicanalysis.py
rename to fsl/tests/test_melodicanalysis.py
index f80e4def0796c8bb176774336c8d11f674bd1b6b..6b4dbe6d4d2429cd203413160aca603c76990e8f 100644
--- a/tests/test_melodicanalysis.py
+++ b/fsl/tests/test_melodicanalysis.py
@@ -12,7 +12,7 @@ import itertools as it
 import numpy     as np
 import pytest
 
-import tests
+import fsl.tests                as tests
 import fsl.utils.path           as fslpath
 import fsl.data.melodicanalysis as mela
 
diff --git a/tests/test_melodicimage.py b/fsl/tests/test_melodicimage.py
similarity index 99%
rename from tests/test_melodicimage.py
rename to fsl/tests/test_melodicimage.py
index 9bf89f6e0d6ead111ef0d366b146ba2af3978c04..bb48e8916f3709c3e0d0090159649bb256c8f538 100644
--- a/tests/test_melodicimage.py
+++ b/fsl/tests/test_melodicimage.py
@@ -14,7 +14,7 @@ import nibabel as nib
 
 import pytest
 
-import tests
+import fsl.tests                as tests
 import fsl.data.image           as fslimage
 import fsl.data.melodicimage    as meli
 import fsl.data.melodicanalysis as mela
diff --git a/tests/test_memoize.py b/fsl/tests/test_memoize.py
similarity index 100%
rename from tests/test_memoize.py
rename to fsl/tests/test_memoize.py
diff --git a/tests/test_mesh.py b/fsl/tests/test_mesh.py
similarity index 100%
rename from tests/test_mesh.py
rename to fsl/tests/test_mesh.py
diff --git a/tests/test_meta.py b/fsl/tests/test_meta.py
similarity index 100%
rename from tests/test_meta.py
rename to fsl/tests/test_meta.py
diff --git a/tests/test_mghimage.py b/fsl/tests/test_mghimage.py
similarity index 100%
rename from tests/test_mghimage.py
rename to fsl/tests/test_mghimage.py
diff --git a/tests/test_naninfrange.py b/fsl/tests/test_naninfrange.py
similarity index 100%
rename from tests/test_naninfrange.py
rename to fsl/tests/test_naninfrange.py
diff --git a/tests/test_notifier.py b/fsl/tests/test_notifier.py
similarity index 100%
rename from tests/test_notifier.py
rename to fsl/tests/test_notifier.py
diff --git a/tests/test_parse_data.py b/fsl/tests/test_parse_data.py
similarity index 100%
rename from tests/test_parse_data.py
rename to fsl/tests/test_parse_data.py
diff --git a/tests/test_platform.py b/fsl/tests/test_platform.py
similarity index 100%
rename from tests/test_platform.py
rename to fsl/tests/test_platform.py
diff --git a/tests/test_run.py b/fsl/tests/test_run.py
similarity index 100%
rename from tests/test_run.py
rename to fsl/tests/test_run.py
diff --git a/tests/test_scripts/__init__.py b/fsl/tests/test_scripts/__init__.py
similarity index 100%
rename from tests/test_scripts/__init__.py
rename to fsl/tests/test_scripts/__init__.py
diff --git a/tests/test_scripts/test_atlasq_list_summary.py b/fsl/tests/test_scripts/test_atlasq_list_summary.py
similarity index 100%
rename from tests/test_scripts/test_atlasq_list_summary.py
rename to fsl/tests/test_scripts/test_atlasq_list_summary.py
diff --git a/tests/test_scripts/test_atlasq_ohi.py b/fsl/tests/test_scripts/test_atlasq_ohi.py
similarity index 100%
rename from tests/test_scripts/test_atlasq_ohi.py
rename to fsl/tests/test_scripts/test_atlasq_ohi.py
diff --git a/tests/test_scripts/test_atlasq_query.py b/fsl/tests/test_scripts/test_atlasq_query.py
similarity index 100%
rename from tests/test_scripts/test_atlasq_query.py
rename to fsl/tests/test_scripts/test_atlasq_query.py
diff --git a/tests/test_scripts/test_fsl_abspath.py b/fsl/tests/test_scripts/test_fsl_abspath.py
similarity index 94%
rename from tests/test_scripts/test_fsl_abspath.py
rename to fsl/tests/test_scripts/test_fsl_abspath.py
index 1657128978f003dc551789e00d4f24f161c797ae..e585bca20fb7c7bf2e05c78f14c4a31a46a6e371 100644
--- a/tests/test_scripts/test_fsl_abspath.py
+++ b/fsl/tests/test_scripts/test_fsl_abspath.py
@@ -10,7 +10,7 @@ import os.path as op
 
 import fsl.scripts.fsl_abspath as fsl_abspath
 
-from tests import tempdir, CaptureStdout
+from fsl.tests import tempdir, CaptureStdout
 
 
 def test_usage():
diff --git a/tests/test_scripts/test_fsl_apply_x5.py b/fsl/tests/test_scripts/test_fsl_apply_x5.py
similarity index 100%
rename from tests/test_scripts/test_fsl_apply_x5.py
rename to fsl/tests/test_scripts/test_fsl_apply_x5.py
diff --git a/tests/test_scripts/test_fsl_convert_x5.py b/fsl/tests/test_scripts/test_fsl_convert_x5.py
similarity index 100%
rename from tests/test_scripts/test_fsl_convert_x5.py
rename to fsl/tests/test_scripts/test_fsl_convert_x5.py
diff --git a/tests/test_scripts/test_fsl_ents.py b/fsl/tests/test_scripts/test_fsl_ents.py
similarity index 100%
rename from tests/test_scripts/test_fsl_ents.py
rename to fsl/tests/test_scripts/test_fsl_ents.py
diff --git a/tests/test_scripts/test_imglob.py b/fsl/tests/test_scripts/test_imglob.py
similarity index 100%
rename from tests/test_scripts/test_imglob.py
rename to fsl/tests/test_scripts/test_imglob.py
diff --git a/tests/test_scripts/test_imln.py b/fsl/tests/test_scripts/test_imln.py
similarity index 99%
rename from tests/test_scripts/test_imln.py
rename to fsl/tests/test_scripts/test_imln.py
index b9fea4e4fc00f9cf9b94370c801f4fb1d9a4606b..7821ceb844b3336b0f66d7cccd2de71722d50533 100644
--- a/tests/test_scripts/test_imln.py
+++ b/fsl/tests/test_scripts/test_imln.py
@@ -15,7 +15,7 @@ from   fsl.utils.tempdir import tempdir
 import fsl.utils.path    as     fslpath
 import fsl.scripts.imln  as     imln
 
-from tests import touch
+from fsl.tests import touch
 
 
 def test_usage():
diff --git a/tests/test_scripts/test_immv_imcp.py b/fsl/tests/test_scripts/test_immv_imcp.py
similarity index 100%
rename from tests/test_scripts/test_immv_imcp.py
rename to fsl/tests/test_scripts/test_immv_imcp.py
diff --git a/tests/test_scripts/test_imrm.py b/fsl/tests/test_scripts/test_imrm.py
similarity index 98%
rename from tests/test_scripts/test_imrm.py
rename to fsl/tests/test_scripts/test_imrm.py
index 8be4108683bbcffeab842c09c08aac58d5e36a97..cb4dd2c80382cc8a9ed9d53849a8e35c5342b76a 100644
--- a/tests/test_scripts/test_imrm.py
+++ b/fsl/tests/test_scripts/test_imrm.py
@@ -10,7 +10,7 @@ import os
 from fsl.utils.tempdir import tempdir
 import fsl.scripts.imrm as imrm
 
-from tests import touch
+from fsl.tests import touch
 
 def test_imrm_usage():
     assert imrm.main([]) != 0
diff --git a/tests/test_scripts/test_imtest.py b/fsl/tests/test_scripts/test_imtest.py
similarity index 98%
rename from tests/test_scripts/test_imtest.py
rename to fsl/tests/test_scripts/test_imtest.py
index 819afa959175391d8b6fc44c986fe7b12e2021b3..b81ab70f613e28fee50ed7232ed2eaaf354a0553 100644
--- a/tests/test_scripts/test_imtest.py
+++ b/fsl/tests/test_scripts/test_imtest.py
@@ -13,7 +13,7 @@ from   fsl.utils.tempdir  import tempdir
 
 import fsl.scripts.imtest as imtest
 
-from tests import CaptureStdout, touch
+from fsl.tests import CaptureStdout, touch
 
 
 def test_wrongargs():
diff --git a/tests/test_scripts/test_remove_ext.py b/fsl/tests/test_scripts/test_remove_ext.py
similarity index 95%
rename from tests/test_scripts/test_remove_ext.py
rename to fsl/tests/test_scripts/test_remove_ext.py
index bb65a893af9d8dd6f3b6abcb5f60b1f7b4e576d9..b0a512fab7b4f95ed198cd48cbbfd275afc9b57e 100644
--- a/tests/test_scripts/test_remove_ext.py
+++ b/fsl/tests/test_scripts/test_remove_ext.py
@@ -8,7 +8,7 @@
 
 import fsl.scripts.remove_ext as remove_ext
 
-from tests import CaptureStdout
+from fsl.tests import CaptureStdout
 
 def test_usage():
     assert remove_ext.main([]) != 0
diff --git a/tests/test_scripts/test_resample_image.py b/fsl/tests/test_scripts/test_resample_image.py
similarity index 100%
rename from tests/test_scripts/test_resample_image.py
rename to fsl/tests/test_scripts/test_resample_image.py
diff --git a/tests/test_scripts/test_vest2text.py b/fsl/tests/test_scripts/test_vest2text.py
similarity index 98%
rename from tests/test_scripts/test_vest2text.py
rename to fsl/tests/test_scripts/test_vest2text.py
index 040c84e0dd471ab113f72de82ec3150da30b4b5f..7de7ec57f9f45f100c0d9a9889c78b34d3351e41 100644
--- a/tests/test_scripts/test_vest2text.py
+++ b/fsl/tests/test_scripts/test_vest2text.py
@@ -12,7 +12,7 @@ import fsl.data.vest         as fslvest
 import fsl.scripts.Text2Vest as Text2Vest
 import fsl.scripts.Vest2Text as Vest2Text
 
-from tests import tempdir
+from fsl.tests import tempdir
 
 
 def test_usage():
diff --git a/tests/test_settings.py b/fsl/tests/test_settings.py
similarity index 99%
rename from tests/test_settings.py
rename to fsl/tests/test_settings.py
index fc0ca9edf7f90c0f5051d09c8e30a59319aae6c4..fa38f8cf15605d46dee7aac88e9b067e3c3e1637 100644
--- a/tests/test_settings.py
+++ b/fsl/tests/test_settings.py
@@ -16,7 +16,7 @@ import unittest.mock as mock
 
 import pytest
 
-import tests
+import fsl.tests          as tests
 import fsl.utils.settings as settings
 import fsl.utils.tempdir  as tempdir
 
diff --git a/tests/test_tempdir.py b/fsl/tests/test_tempdir.py
similarity index 100%
rename from tests/test_tempdir.py
rename to fsl/tests/test_tempdir.py
diff --git a/tests/test_transform/__init__.py b/fsl/tests/test_transform/__init__.py
similarity index 100%
rename from tests/test_transform/__init__.py
rename to fsl/tests/test_transform/__init__.py
diff --git a/tests/test_transform/test_affine.py b/fsl/tests/test_transform/test_affine.py
similarity index 100%
rename from tests/test_transform/test_affine.py
rename to fsl/tests/test_transform/test_affine.py
diff --git a/tests/test_transform/test_flirt.py b/fsl/tests/test_transform/test_flirt.py
similarity index 100%
rename from tests/test_transform/test_flirt.py
rename to fsl/tests/test_transform/test_flirt.py
diff --git a/tests/test_transform/test_fnirt.py b/fsl/tests/test_transform/test_fnirt.py
similarity index 100%
rename from tests/test_transform/test_fnirt.py
rename to fsl/tests/test_transform/test_fnirt.py
diff --git a/tests/test_transform/test_nonlinear.py b/fsl/tests/test_transform/test_nonlinear.py
similarity index 100%
rename from tests/test_transform/test_nonlinear.py
rename to fsl/tests/test_transform/test_nonlinear.py
diff --git a/tests/test_transform/test_x5.py b/fsl/tests/test_transform/test_x5.py
similarity index 100%
rename from tests/test_transform/test_x5.py
rename to fsl/tests/test_transform/test_x5.py
diff --git a/tests/test_transform/testdata/nonlinear/coefficientfield.nii.gz b/fsl/tests/test_transform/testdata/nonlinear/coefficientfield.nii.gz
similarity index 100%
rename from tests/test_transform/testdata/nonlinear/coefficientfield.nii.gz
rename to fsl/tests/test_transform/testdata/nonlinear/coefficientfield.nii.gz
diff --git a/tests/test_transform/testdata/nonlinear/displacementfield.nii.gz b/fsl/tests/test_transform/testdata/nonlinear/displacementfield.nii.gz
similarity index 100%
rename from tests/test_transform/testdata/nonlinear/displacementfield.nii.gz
rename to fsl/tests/test_transform/testdata/nonlinear/displacementfield.nii.gz
diff --git a/tests/test_transform/testdata/nonlinear/displacementfield_no_premat.nii.gz b/fsl/tests/test_transform/testdata/nonlinear/displacementfield_no_premat.nii.gz
similarity index 100%
rename from tests/test_transform/testdata/nonlinear/displacementfield_no_premat.nii.gz
rename to fsl/tests/test_transform/testdata/nonlinear/displacementfield_no_premat.nii.gz
diff --git a/tests/test_transform/testdata/nonlinear/ref.nii.gz b/fsl/tests/test_transform/testdata/nonlinear/ref.nii.gz
similarity index 100%
rename from tests/test_transform/testdata/nonlinear/ref.nii.gz
rename to fsl/tests/test_transform/testdata/nonlinear/ref.nii.gz
diff --git a/tests/test_transform/testdata/nonlinear/src.nii.gz b/fsl/tests/test_transform/testdata/nonlinear/src.nii.gz
similarity index 100%
rename from tests/test_transform/testdata/nonlinear/src.nii.gz
rename to fsl/tests/test_transform/testdata/nonlinear/src.nii.gz
diff --git a/tests/test_transform/testdata/nonlinear/src2ref.mat b/fsl/tests/test_transform/testdata/nonlinear/src2ref.mat
similarity index 100%
rename from tests/test_transform/testdata/nonlinear/src2ref.mat
rename to fsl/tests/test_transform/testdata/nonlinear/src2ref.mat
diff --git a/tests/test_transform/testdata/test_transform_test_axisBounds.txt b/fsl/tests/test_transform/testdata/test_transform_test_axisBounds.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_axisBounds.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_axisBounds.txt
diff --git a/tests/test_transform/testdata/test_transform_test_compose.txt b/fsl/tests/test_transform/testdata/test_transform_test_compose.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_compose.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_compose.txt
diff --git a/tests/test_transform/testdata/test_transform_test_concat.txt b/fsl/tests/test_transform/testdata/test_transform_test_concat.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_concat.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_concat.txt
diff --git a/tests/test_transform/testdata/test_transform_test_flirtMatrixToSform.txt b/fsl/tests/test_transform/testdata/test_transform_test_flirtMatrixToSform.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_flirtMatrixToSform.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_flirtMatrixToSform.txt
diff --git a/tests/test_transform/testdata/test_transform_test_invert.txt b/fsl/tests/test_transform/testdata/test_transform_test_invert.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_invert.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_invert.txt
diff --git a/tests/test_transform/testdata/test_transform_test_scaleoffsetxform.txt b/fsl/tests/test_transform/testdata/test_transform_test_scaleoffsetxform.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_scaleoffsetxform.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_scaleoffsetxform.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_00.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_00.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_00.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_00.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_01.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_01.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_01.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_01.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_02.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_02.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_02.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_02.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_03.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_03.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_03.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_03.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_04.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_04.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_04.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_04.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_05.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_05.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_05.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_05.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_06.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_06.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_06.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_06.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_07.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_07.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_07.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_07.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_08.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_08.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_08.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_08.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_09.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_09.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_09.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_09.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_10.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_10.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_10.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_10.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_11.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_11.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_11.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_11.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_12.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_12.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_12.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_12.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_13.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_13.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_13.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_13.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_14.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_14.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_14.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_14.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_15.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_15.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_15.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_15.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_16.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_16.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_16.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_16.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_17.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_17.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_17.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_17.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_18.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_18.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_18.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_18.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_19.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_19.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_19.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_19.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_20.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_20.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_20.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_20.txt
diff --git a/tests/test_transform/testdata/test_transform_test_transform_coords.txt b/fsl/tests/test_transform/testdata/test_transform_test_transform_coords.txt
similarity index 100%
rename from tests/test_transform/testdata/test_transform_test_transform_coords.txt
rename to fsl/tests/test_transform/testdata/test_transform_test_transform_coords.txt
diff --git a/tests/test_version.py b/fsl/tests/test_version.py
similarity index 100%
rename from tests/test_version.py
rename to fsl/tests/test_version.py
diff --git a/tests/test_vest.py b/fsl/tests/test_vest.py
similarity index 99%
rename from tests/test_vest.py
rename to fsl/tests/test_vest.py
index a49f5fc3afb7c5469438a8facf70aed35a079ca1..86668e08b9081a84b91f19af31f24d1987d6aac7 100644
--- a/tests/test_vest.py
+++ b/fsl/tests/test_vest.py
@@ -18,7 +18,7 @@ import             pytest
 
 import fsl.data.vest as vest
 
-from tests import tempdir
+from fsl.tests import tempdir
 
 
 testfile1 = """%!VEST-LUT
diff --git a/tests/test_volumelabels.py b/fsl/tests/test_volumelabels.py
similarity index 95%
rename from tests/test_volumelabels.py
rename to fsl/tests/test_volumelabels.py
index 6119a565697878258e0ab61f6ef0319b7d29b576..af051690e8ce5a5171ea1ea527500a7884a0ea0b 100644
--- a/tests/test_volumelabels.py
+++ b/fsl/tests/test_volumelabels.py
@@ -11,29 +11,29 @@ import              textwrap
 
 import pytest
 
-import tests
+import fsl.tests             as tests
 import fsl.data.fixlabels    as fixlbls
 import fsl.data.volumelabels as vollbls
 
 
 def test_add_get_hasLabel():
-    
+
     ncomps = 5
     labels = ['Label {}'.format(i) for i in range(ncomps)]
     lowers = [lbl.lower()          for lbl in labels]
     lblobj = vollbls.VolumeLabels(ncomps)
 
     called = [False]
-    
+
     def labelAdded(lo, topic, value):
         called[0] = True
 
     lblobj.register('callback', labelAdded, topic='added')
 
     for i in range(ncomps):
-        
+
         called[0] = False
-        
+
         assert lblobj.addLabel(i, labels[i])
         assert called[0]
         assert lblobj.getLabels(i)              == [lowers[i]]
@@ -47,7 +47,7 @@ def test_add_get_hasLabel():
         called[0] = False
         assert not lblobj.addLabel(i, labels[i])
         assert not called[0]
-        
+
         # Labels are case insensitive
         assert not lblobj.addLabel(i, lowers[i])
         assert not called[0]
@@ -56,7 +56,7 @@ def test_add_get_hasLabel():
 
 
 def test_removeLabel():
-    
+
     ncomps = 5
     labels = ['Label {}'.format(i) for i in range(ncomps)]
     lowers = [lbl.lower()          for lbl in labels]
@@ -66,7 +66,7 @@ def test_removeLabel():
         lblobj.addLabel(i, labels[i])
 
     called = [False]
-    
+
     def removed(*a):
         called[0] = True
 
@@ -80,14 +80,14 @@ def test_removeLabel():
 
         called[0] = False
         assert lblobj.removeLabel(i, labels[i])
-        assert called[0] 
-        
+        assert called[0]
+
         assert lblobj.getLabels(i) == []
         assert sorted(lblobj.getAllLabels()) == lowers[i + 1:]
 
 
 def test_clearLabels():
-    
+
     ncomps = 5
     labels = [('Label {}'.format(i), 'Label b')
               for i in range(ncomps)]
@@ -99,7 +99,7 @@ def test_clearLabels():
             lblobj.addLabel(i, l)
 
     calledValue = []
-    
+
     def removed(lo, topic, value):
         calledValue.append(value)
 
@@ -125,14 +125,14 @@ def test_add_get_hasComponents():
     lblobj = vollbls.VolumeLabels(ncomps)
 
     called = [False]
-    
+
     def labelAdded(lo, topic, value):
         called[0] = True
 
     lblobj.register('callback', labelAdded, topic='added')
 
     for i in range(ncomps):
-        
+
         called[0] = False
         assert lblobj.addComponent(labels[i], i)
         assert called[0]
@@ -167,8 +167,8 @@ def test_removeComponent():
 
         called[0] = False
         assert lblobj.removeComponent(labels[i], i)
-        assert called[0] 
-        
+        assert called[0]
+
         assert lblobj.getComponents(labels[i]) == []
         assert sorted(lblobj.getAllLabels()) == labels[i + 1:]
 
@@ -184,7 +184,7 @@ def test_clearComponents():
             lblobj.addLabel(i, l)
 
     calledValue = []
-    
+
     def removed(lo, topic, value):
         calledValue.append(value)
 
@@ -199,11 +199,11 @@ def test_clearComponents():
     labels = [l[0] for l in labels]
 
     for i in range(ncomps):
-        
+
         calledValue = []
-        
+
         lblobj.clearComponents(labels[i])
-        
+
         assert calledValue[0]                  == [(i, labels[i])]
         assert lblobj.getComponents(labels[i]) == []
         assert lblobj.getLabels(i)             == []
@@ -250,7 +250,7 @@ def test_load_fixfile_long():
         lblobj = vollbls.VolumeLabels(4)
         lblobj.load(fname)
         for i in range(4):
-            assert lblobj.getLabels(i) == expected[i] 
+            assert lblobj.getLabels(i) == expected[i]
 
 
 def test_load_fixfile_short():
@@ -285,7 +285,7 @@ def test_load_fixfile_short():
         lblobj = vollbls.VolumeLabels(5)
         lblobj.load(fname)
         for i in range(4):
-            assert lblobj.getLabels(i) == expected[i] 
+            assert lblobj.getLabels(i) == expected[i]
 
 
 def test_load_aromafile():
@@ -320,7 +320,7 @@ def test_load_aromafile():
         lblobj = vollbls.VolumeLabels(5)
         lblobj.load(fname)
         for i in range(4):
-            assert lblobj.getLabels(i) == expected[i] 
+            assert lblobj.getLabels(i) == expected[i]
 
 
 def test_save():
@@ -341,15 +341,15 @@ def test_save():
     lbls.addLabel(3, 'Movement')
 
     with tests.testdir() as testdir:
-        
+
         fname = op.join(testdir, 'labels.txt')
 
         # Test saving without dirname
         lbls.save(fname)
-        exp = '.\n{}'.format(expected) 
+        exp = '.\n{}'.format(expected)
         with open(fname, 'rt') as f:
             assert f.read().strip() == exp.strip()
- 
+
         # And with dirname
         lbls.save(fname, 'path/to/analysis.ica')
         exp = 'path/to/analysis.ica\n{}'.format(expected)
diff --git a/tests/test_vtk.py b/fsl/tests/test_vtk.py
similarity index 100%
rename from tests/test_vtk.py
rename to fsl/tests/test_vtk.py
diff --git a/tests/test_weakfuncref.py b/fsl/tests/test_weakfuncref.py
similarity index 100%
rename from tests/test_weakfuncref.py
rename to fsl/tests/test_weakfuncref.py
diff --git a/tests/test_wrappers/__init__.py b/fsl/tests/test_wrappers/__init__.py
similarity index 100%
rename from tests/test_wrappers/__init__.py
rename to fsl/tests/test_wrappers/__init__.py
diff --git a/tests/test_wrappers/test_fslmaths.py b/fsl/tests/test_wrappers/test_fslmaths.py
similarity index 100%
rename from tests/test_wrappers/test_fslmaths.py
rename to fsl/tests/test_wrappers/test_fslmaths.py
diff --git a/tests/test_wrappers/test_fslstats.py b/fsl/tests/test_wrappers/test_fslstats.py
similarity index 100%
rename from tests/test_wrappers/test_fslstats.py
rename to fsl/tests/test_wrappers/test_fslstats.py
diff --git a/tests/test_wrappers/test_wrappers.py b/fsl/tests/test_wrappers/test_wrappers.py
similarity index 100%
rename from tests/test_wrappers/test_wrappers.py
rename to fsl/tests/test_wrappers/test_wrappers.py
diff --git a/tests/test_wrappers/test_wrappers_run_arguments.py b/fsl/tests/test_wrappers/test_wrappers_run_arguments.py
similarity index 100%
rename from tests/test_wrappers/test_wrappers_run_arguments.py
rename to fsl/tests/test_wrappers/test_wrappers_run_arguments.py
diff --git a/tests/test_wrappers/test_wrapperutils.py b/fsl/tests/test_wrappers/test_wrapperutils.py
similarity index 100%
rename from tests/test_wrappers/test_wrapperutils.py
rename to fsl/tests/test_wrappers/test_wrapperutils.py
diff --git a/tests/testdata/example.mgz b/fsl/tests/testdata/example.mgz
similarity index 100%
rename from tests/testdata/example.mgz
rename to fsl/tests/testdata/example.mgz
diff --git a/tests/testdata/example.shape.gii b/fsl/tests/testdata/example.shape.gii
similarity index 100%
rename from tests/testdata/example.shape.gii
rename to fsl/tests/testdata/example.shape.gii
diff --git a/tests/testdata/example.surf.gii b/fsl/tests/testdata/example.surf.gii
similarity index 100%
rename from tests/testdata/example.surf.gii
rename to fsl/tests/testdata/example.surf.gii
diff --git a/tests/testdata/example4D.shape.gii b/fsl/tests/testdata/example4D.shape.gii
similarity index 100%
rename from tests/testdata/example4D.shape.gii
rename to fsl/tests/testdata/example4D.shape.gii
diff --git a/tests/testdata/example4D_multiple_darrays.shape.gii b/fsl/tests/testdata/example4D_multiple_darrays.shape.gii
similarity index 100%
rename from tests/testdata/example4D_multiple_darrays.shape.gii
rename to fsl/tests/testdata/example4D_multiple_darrays.shape.gii
diff --git a/tests/testdata/example_bad1.surf.gii b/fsl/tests/testdata/example_bad1.surf.gii
similarity index 100%
rename from tests/testdata/example_bad1.surf.gii
rename to fsl/tests/testdata/example_bad1.surf.gii
diff --git a/tests/testdata/example_bad2.surf.gii b/fsl/tests/testdata/example_bad2.surf.gii
similarity index 100%
rename from tests/testdata/example_bad2.surf.gii
rename to fsl/tests/testdata/example_bad2.surf.gii
diff --git a/tests/testdata/example_bad3.surf.gii b/fsl/tests/testdata/example_bad3.surf.gii
similarity index 100%
rename from tests/testdata/example_bad3.surf.gii
rename to fsl/tests/testdata/example_bad3.surf.gii
diff --git a/tests/testdata/example_bad4.surf.gii b/fsl/tests/testdata/example_bad4.surf.gii
similarity index 100%
rename from tests/testdata/example_bad4.surf.gii
rename to fsl/tests/testdata/example_bad4.surf.gii
diff --git a/tests/testdata/example_bad5.surf.gii b/fsl/tests/testdata/example_bad5.surf.gii
similarity index 100%
rename from tests/testdata/example_bad5.surf.gii
rename to fsl/tests/testdata/example_bad5.surf.gii
diff --git a/tests/testdata/example_bad6.surf.gii b/fsl/tests/testdata/example_bad6.surf.gii
similarity index 100%
rename from tests/testdata/example_bad6.surf.gii
rename to fsl/tests/testdata/example_bad6.surf.gii
diff --git a/tests/testdata/example_dicom.tbz2 b/fsl/tests/testdata/example_dicom.tbz2
similarity index 100%
rename from tests/testdata/example_dicom.tbz2
rename to fsl/tests/testdata/example_dicom.tbz2
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/absbrainthresh.txt b/fsl/tests/testdata/test_feat/1stlevel_1.feat/absbrainthresh.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/absbrainthresh.txt
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/absbrainthresh.txt
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/cluster_mask_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_mask_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/cluster_mask_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_mask_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/cluster_mask_zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_mask_zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/cluster_mask_zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_mask_zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat1.txt b/fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat1.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat1.txt
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat1.txt
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat1_std.txt b/fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat1_std.txt
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat2.txt b/fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat2.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat2.txt
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat2.txt
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat2_std.txt b/fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat2_std.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat2_std.txt
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/cluster_zstat2_std.txt
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/confoundevs.txt b/fsl/tests/testdata/test_feat/1stlevel_1.feat/confoundevs.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/confoundevs.txt
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/confoundevs.txt
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/design.con b/fsl/tests/testdata/test_feat/1stlevel_1.feat/design.con
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/design.con
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/design.con
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/design.frf b/fsl/tests/testdata/test_feat/1stlevel_1.feat/design.frf
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/design.frf
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/design.frf
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/design.fsf b/fsl/tests/testdata/test_feat/1stlevel_1.feat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/design.fsf
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/design.fsf
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/design.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/design.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/design.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/design.min b/fsl/tests/testdata/test_feat/1stlevel_1.feat/design.min
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/design.min
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/design.min
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/design.trg b/fsl/tests/testdata/test_feat/1stlevel_1.feat/design.trg
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/design.trg
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/design.trg
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/example_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/example_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat1.txt b/fsl/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat1.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat1.txt
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat1.txt
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat1_std.txt b/fsl/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat1_std.txt
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat2.txt b/fsl/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat2.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat2.txt
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat2.txt
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat2_std.txt b/fsl/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat2_std.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat2_std.txt
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/lmax_zstat2_std.txt
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mask.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mask.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044 b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.par b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.par
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.par
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf.par
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_abs.rms b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_abs.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_abs.rms
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_abs.rms
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_abs_mean.rms b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_final.par b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_final.par
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_final.par
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_final.par
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_rel.rms b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_rel.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_rel.rms
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_rel.rms
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_rel_mean.rms b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2highres.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2initial_highres.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2initial_highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2initial_highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2initial_highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2initial_highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2initial_highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2initial_highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2initial_highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2standard.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2standard.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2standard.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2standard.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2standard.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2standard.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2standard.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/example_func2standard.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2example_func.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2example_func.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/highres2example_func.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2example_func.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2initial_highres.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2initial_highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/highres2initial_highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2initial_highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2standard.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2standard.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/highres2standard.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2standard.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2standard.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2standard.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/highres2standard.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres2standard.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/highres_head.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres_head.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/highres_head.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/highres_head.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2example_func.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2example_func.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2example_func.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2example_func.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_fast_wmedge.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_fast_wmedge.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_fast_wmedge.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_fast_wmedge.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_fast_wmseg.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_fast_wmseg.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_fast_wmseg.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_fast_wmseg.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_init.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_init.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_init.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/initial_highres2highres_init.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/standard.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/standard.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/standard.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/standard.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/standard2example_func.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/standard2example_func.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/standard2example_func.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/standard2example_func.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg/standard2highres.mat b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/standard2highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg/standard2highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg/standard2highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/example_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg_standard/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/example_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/mask.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg_standard/mask.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/mask.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/mean_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg_standard/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/reg/highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/reg/highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg_standard/reg/highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/reg/highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/cope1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/cope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/cope1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/cope1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/cope2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/cope2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/cope2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/cope2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/varcope1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/varcope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/varcope1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/varcope1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/varcope2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/varcope2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/varcope2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/reg_standard/stats/varcope2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/rendered_thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/rendered_thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/rendered_thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/rendered_thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/rendered_thresh_zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/rendered_thresh_zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/rendered_thresh_zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/rendered_thresh_zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/cope1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/cope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/cope1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/cope1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/cope2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/cope2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/cope2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/cope2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/dof b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/dof
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/dof
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/dof
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/logfile b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/logfile
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/logfile
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/logfile
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/pe1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/pe1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/pe10.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe10.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/pe10.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe10.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/pe2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/pe2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/pe3.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe3.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/pe3.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe3.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/pe4.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe4.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/pe4.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe4.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/pe5.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe5.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/pe5.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe5.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/pe6.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe6.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/pe6.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe6.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/pe7.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe7.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/pe7.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe7.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/pe8.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe8.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/pe8.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe8.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/pe9.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe9.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/pe9.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/pe9.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/res4d.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/res4d.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/res4d.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/res4d.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/sigmasquareds.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/sigmasquareds.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/sigmasquareds.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/sigmasquareds.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/smoothness b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/smoothness
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/smoothness
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/smoothness
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/threshac1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/threshac1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/threshac1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/threshac1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/tstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/tstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/tstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/tstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/tstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/tstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/tstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/tstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/varcope1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/varcope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/varcope1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/varcope1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/varcope2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/varcope2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/varcope2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/varcope2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/stats/zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/stats/zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/stats/zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat1.vol b/fsl/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat1.vol
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat1.vol
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat1.vol
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat2.vol b/fsl/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat2.vol
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat2.vol
rename to fsl/tests/testdata/test_feat/1stlevel_1.feat/thresh_zstat2.vol
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/absbrainthresh.txt b/fsl/tests/testdata/test_feat/1stlevel_2.feat/absbrainthresh.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/absbrainthresh.txt
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/absbrainthresh.txt
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/cluster_mask_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_mask_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/cluster_mask_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_mask_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/cluster_mask_zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_mask_zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/cluster_mask_zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_mask_zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat1.txt b/fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat1.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat1.txt
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat1.txt
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat1_std.txt b/fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat1_std.txt
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat2.txt b/fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat2.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat2.txt
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat2.txt
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat2_std.txt b/fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat2_std.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat2_std.txt
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/cluster_zstat2_std.txt
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/confoundevs.txt b/fsl/tests/testdata/test_feat/1stlevel_2.feat/confoundevs.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/confoundevs.txt
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/confoundevs.txt
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/design.con b/fsl/tests/testdata/test_feat/1stlevel_2.feat/design.con
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/design.con
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/design.con
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/design.frf b/fsl/tests/testdata/test_feat/1stlevel_2.feat/design.frf
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/design.frf
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/design.frf
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/design.fsf b/fsl/tests/testdata/test_feat/1stlevel_2.feat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/design.fsf
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/design.fsf
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/design.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/design.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/design.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/design.min b/fsl/tests/testdata/test_feat/1stlevel_2.feat/design.min
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/design.min
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/design.min
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/design.trg b/fsl/tests/testdata/test_feat/1stlevel_2.feat/design.trg
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/design.trg
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/design.trg
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/designInputVoxelwiseEV3.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/designInputVoxelwiseEV3.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/designInputVoxelwiseEV3.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/designInputVoxelwiseEV3.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/designVoxelwiseEV3.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/designVoxelwiseEV3.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/designVoxelwiseEV3.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/designVoxelwiseEV3.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/example_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/example_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat1.txt b/fsl/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat1.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat1.txt
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat1.txt
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat1_std.txt b/fsl/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat1_std.txt
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat2.txt b/fsl/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat2.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat2.txt
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat2.txt
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat2_std.txt b/fsl/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat2_std.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat2_std.txt
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/lmax_zstat2_std.txt
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mask.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mask.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044 b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.par b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.par
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.par
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf.par
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_abs.rms b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_abs.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_abs.rms
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_abs.rms
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_abs_mean.rms b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_final.par b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_final.par
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_final.par
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_final.par
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_rel.rms b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_rel.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_rel.rms
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_rel.rms
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_rel_mean.rms b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2highres.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2initial_highres.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2initial_highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2initial_highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2initial_highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2initial_highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2initial_highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2initial_highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2initial_highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2standard.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2standard.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2standard.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2standard.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2standard.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2standard.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2standard.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/example_func2standard.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2example_func.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2example_func.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/highres2example_func.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2example_func.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2initial_highres.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2initial_highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/highres2initial_highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2initial_highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2standard.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2standard.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/highres2standard.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2standard.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2standard.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2standard.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/highres2standard.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres2standard.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/highres_head.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres_head.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/highres_head.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/highres_head.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2example_func.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2example_func.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2example_func.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2example_func.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_fast_wmedge.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_fast_wmedge.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_fast_wmedge.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_fast_wmedge.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_fast_wmseg.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_fast_wmseg.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_fast_wmseg.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_fast_wmseg.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_init.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_init.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_init.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/initial_highres2highres_init.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/standard.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/standard.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/standard.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/standard.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/standard2example_func.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/standard2example_func.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/standard2example_func.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/standard2example_func.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/reg/standard2highres.mat b/fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/standard2highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/reg/standard2highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/reg/standard2highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/rendered_thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/rendered_thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/rendered_thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/rendered_thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/rendered_thresh_zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/rendered_thresh_zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/rendered_thresh_zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/rendered_thresh_zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/cope1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/cope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/cope1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/cope1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/cope2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/cope2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/cope2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/cope2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/dof b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/dof
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/dof
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/dof
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/logfile b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/logfile
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/logfile
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/logfile
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/pe1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/pe1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/pe10.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe10.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/pe10.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe10.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/pe11.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe11.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/pe11.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe11.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/pe2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/pe2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/pe3.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe3.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/pe3.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe3.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/pe4.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe4.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/pe4.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe4.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/pe5.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe5.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/pe5.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe5.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/pe6.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe6.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/pe6.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe6.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/pe7.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe7.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/pe7.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe7.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/pe8.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe8.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/pe8.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe8.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/pe9.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe9.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/pe9.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/pe9.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/res4d.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/res4d.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/res4d.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/res4d.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/sigmasquareds.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/sigmasquareds.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/sigmasquareds.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/sigmasquareds.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/smoothness b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/smoothness
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/smoothness
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/smoothness
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/threshac1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/threshac1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/threshac1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/threshac1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/tstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/tstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/tstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/tstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/tstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/tstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/tstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/tstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/varcope1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/varcope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/varcope1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/varcope1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/varcope2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/varcope2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/varcope2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/varcope2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/stats/zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/stats/zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/stats/zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat1.vol b/fsl/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat1.vol
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat1.vol
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat1.vol
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat2.vol b/fsl/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat2.vol
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat2.vol
rename to fsl/tests/testdata/test_feat/1stlevel_2.feat/thresh_zstat2.vol
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/InputconfoundEV1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/InputconfoundEV1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/InputconfoundEV1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/InputconfoundEV1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/absbrainthresh.txt b/fsl/tests/testdata/test_feat/1stlevel_3.feat/absbrainthresh.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/absbrainthresh.txt
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/absbrainthresh.txt
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/cluster_mask_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/cluster_mask_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/cluster_mask_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/cluster_mask_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/cluster_mask_zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/cluster_mask_zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/cluster_mask_zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/cluster_mask_zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/cluster_zstat1.txt b/fsl/tests/testdata/test_feat/1stlevel_3.feat/cluster_zstat1.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/cluster_zstat1.txt
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/cluster_zstat1.txt
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/cluster_zstat2.txt b/fsl/tests/testdata/test_feat/1stlevel_3.feat/cluster_zstat2.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/cluster_zstat2.txt
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/cluster_zstat2.txt
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/confoundEV1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/confoundEV1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/confoundEV1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/confoundEV1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/confoundevs.txt b/fsl/tests/testdata/test_feat/1stlevel_3.feat/confoundevs.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/confoundevs.txt
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/confoundevs.txt
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/design.con b/fsl/tests/testdata/test_feat/1stlevel_3.feat/design.con
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/design.con
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/design.con
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/design.frf b/fsl/tests/testdata/test_feat/1stlevel_3.feat/design.frf
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/design.frf
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/design.frf
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/design.fsf b/fsl/tests/testdata/test_feat/1stlevel_3.feat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/design.fsf
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/design.fsf
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/design.mat b/fsl/tests/testdata/test_feat/1stlevel_3.feat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/design.mat
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/design.mat
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/design.min b/fsl/tests/testdata/test_feat/1stlevel_3.feat/design.min
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/design.min
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/design.min
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/design.trg b/fsl/tests/testdata/test_feat/1stlevel_3.feat/design.trg
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/design.trg
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/design.trg
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/example_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/example_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/lmax_zstat1.txt b/fsl/tests/testdata/test_feat/1stlevel_3.feat/lmax_zstat1.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/lmax_zstat1.txt
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/lmax_zstat1.txt
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/lmax_zstat2.txt b/fsl/tests/testdata/test_feat/1stlevel_3.feat/lmax_zstat2.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/lmax_zstat2.txt
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/lmax_zstat2.txt
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mask.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mask.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044 b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.par b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.par
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.par
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf.par
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_abs.rms b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_abs.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_abs.rms
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_abs.rms
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_abs_mean.rms b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_diff.dat b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_diff.dat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_diff.dat
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_diff.dat
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_final.par b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_final.par
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_final.par
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_final.par
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_rel.rms b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_rel.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_rel.rms
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_rel.rms
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_rel_mean.rms b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/meanConfounds.dat b/fsl/tests/testdata/test_feat/1stlevel_3.feat/meanConfounds.dat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/meanConfounds.dat
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/meanConfounds.dat
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/rendered_thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/rendered_thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/rendered_thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/rendered_thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/rendered_thresh_zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/rendered_thresh_zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/rendered_thresh_zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/rendered_thresh_zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/cope1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/cope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/cope1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/cope1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/cope2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/cope2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/cope2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/cope2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/dof b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/dof
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/dof
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/dof
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/logfile b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/logfile
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/logfile
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/logfile
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe10.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe10.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe10.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe10.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe11.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe11.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe11.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe11.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe12.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe12.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe12.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe12.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe13.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe13.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe13.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe13.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe14.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe14.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe14.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe14.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe15.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe15.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe15.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe15.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe16.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe16.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe16.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe16.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe17.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe17.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe17.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe17.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe18.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe18.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe18.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe18.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe19.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe19.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe19.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe19.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe20.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe20.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe20.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe20.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe21.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe21.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe21.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe21.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe22.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe22.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe22.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe22.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe23.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe23.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe23.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe23.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe24.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe24.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe24.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe24.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe25.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe25.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe25.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe25.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe26.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe26.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe26.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe26.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe27.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe27.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe27.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe27.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe28.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe28.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe28.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe28.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe29.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe29.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe29.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe29.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe3.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe3.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe3.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe3.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe30.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe30.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe30.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe30.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe31.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe31.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe31.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe31.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe32.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe32.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe32.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe32.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe4.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe4.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe4.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe4.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe5.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe5.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe5.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe5.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe6.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe6.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe6.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe6.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe7.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe7.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe7.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe7.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe8.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe8.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe8.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe8.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/pe9.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe9.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/pe9.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/pe9.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/res4d.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/res4d.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/res4d.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/res4d.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/sigmasquareds.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/sigmasquareds.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/sigmasquareds.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/sigmasquareds.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/smoothness b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/smoothness
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/smoothness
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/smoothness
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/threshac1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/threshac1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/threshac1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/threshac1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/tstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/tstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/tstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/tstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/tstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/tstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/tstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/tstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/varcope1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/varcope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/varcope1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/varcope1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/varcope2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/varcope2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/varcope2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/varcope2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/stats/zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/stats/zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/stats/zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat1.vol b/fsl/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat1.vol
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat1.vol
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat1.vol
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat2.vol b/fsl/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat2.vol
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat2.vol
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/thresh_zstat2.vol
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/vef.dat b/fsl/tests/testdata/test_feat/1stlevel_3.feat/vef.dat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/vef.dat
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/vef.dat
diff --git a/tests/testdata/test_feat/1stlevel_3.feat/ven.dat b/fsl/tests/testdata/test_feat/1stlevel_3.feat/ven.dat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_3.feat/ven.dat
rename to fsl/tests/testdata/test_feat/1stlevel_3.feat/ven.dat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/absbrainthresh.txt b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/absbrainthresh.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/absbrainthresh.txt
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/absbrainthresh.txt
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/design.con b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.con
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/design.con
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.con
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/design.frf b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.frf
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/design.frf
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.frf
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/design.fsf b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/design.fsf
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.fsf
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/design.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/design.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.mat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/design.min b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.min
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/design.min
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.min
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/design.trg b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.trg
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/design.trg
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/design.trg
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/example_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/example_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mask.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mask.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0000
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0001
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0002
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0003
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0004
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0005
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0006
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0007
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0008
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0009
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0010
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0011
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0012
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0013
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0014
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0015
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0016
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0017
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0018
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0019
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0020
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0021
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0022
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0023
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0024
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0025
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0026
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0027
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0028
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0029
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0030
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0031
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0032
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0033
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0034
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0035
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0036
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0037
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0038
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0039
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0040
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0041
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0042
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0043
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044 b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.mat/MAT_0044
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.par b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.par
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.par
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf.par
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_abs.rms b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_abs.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_abs.rms
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_abs.rms
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_abs_mean.rms b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_abs_mean.rms
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_rel.rms b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_rel.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_rel.rms
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_rel.rms
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_rel_mean.rms b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mc/prefiltered_func_data_mcf_rel_mean.rms
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2highres.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2initial_highres.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2initial_highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2initial_highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2initial_highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2initial_highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2initial_highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2initial_highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2initial_highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2standard.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2standard.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2standard.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2standard.mat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2standard.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2standard.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2standard.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/example_func2standard.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2example_func.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2example_func.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2example_func.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2example_func.mat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2initial_highres.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2initial_highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2initial_highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2initial_highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2standard.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2standard.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2standard.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2standard.mat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2standard.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2standard.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2standard.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres2standard.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres_head.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres_head.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres_head.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/highres_head.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2example_func.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2example_func.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2example_func.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2example_func.mat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_fast_wmedge.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_fast_wmedge.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_fast_wmedge.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_fast_wmedge.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_fast_wmseg.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_fast_wmseg.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_fast_wmseg.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_fast_wmseg.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_init.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_init.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_init.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/initial_highres2highres_init.mat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard2example_func.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard2example_func.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard2example_func.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard2example_func.mat
diff --git a/tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard2highres.mat b/fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard2highres.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard2highres.mat
rename to fsl/tests/testdata/test_feat/1stlevel_nostats.feat/reg/standard2highres.mat
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/absbrainthresh.txt b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/absbrainthresh.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/absbrainthresh.txt
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/absbrainthresh.txt
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_mask_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_mask_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/cluster_mask_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_mask_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_mask_zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_mask_zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/cluster_mask_zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_mask_zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_zstat1.txt b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_zstat1.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/cluster_zstat1.txt
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_zstat1.txt
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_zstat2.txt b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_zstat2.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/cluster_zstat2.txt
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/cluster_zstat2.txt
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/design.con b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.con
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/design.con
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.con
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/design.frf b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.frf
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/design.frf
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.frf
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/design.fsf b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/design.fsf
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.fsf
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/design.mat b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/design.mat
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.mat
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/design.min b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.min
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/design.min
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.min
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/design.trg b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.trg
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/design.trg
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/design.trg
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/example_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/example_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/lmax_zstat1.txt b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/lmax_zstat1.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/lmax_zstat1.txt
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/lmax_zstat1.txt
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/lmax_zstat2.txt b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/lmax_zstat2.txt
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/lmax_zstat2.txt
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/lmax_zstat2.txt
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/mask.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/mask.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/rendered_thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/rendered_thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/rendered_thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/rendered_thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/cope1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/cope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/cope1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/cope1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/cope2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/cope2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/cope2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/cope2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/dof b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/dof
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/dof
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/dof
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/logfile b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/logfile
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/logfile
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/logfile
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe3.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe3.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe3.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe3.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe4.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe4.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe4.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/pe4.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/res4d.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/res4d.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/res4d.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/res4d.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/sigmasquareds.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/sigmasquareds.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/sigmasquareds.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/sigmasquareds.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/smoothness b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/smoothness
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/smoothness
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/smoothness
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/threshac1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/threshac1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/threshac1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/threshac1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/tstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/tstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/tstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/tstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/tstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/tstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/tstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/tstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/varcope1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/varcope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/varcope1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/varcope1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/varcope2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/varcope2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/varcope2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/varcope2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/stats/zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/stats/zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/stats/zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat1.vol b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat1.vol
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat1.vol
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat1.vol
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat2.nii.gz b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat2.nii.gz
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat2.nii.gz
diff --git a/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat2.vol b/fsl/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat2.vol
similarity index 100%
rename from tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat2.vol
rename to fsl/tests/testdata/test_feat/1stlevel_realdata.feat/thresh_zstat2.vol
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/bg_image.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/bg_image.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/bg_image.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/bg_image.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/.flame b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/.flame
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/.flame
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/.flame
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/cluster_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/cluster_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/cluster_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/cluster_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.con b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.con
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.con
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.con
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.fsf b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.fsf
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.fsf
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.grp b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.grp
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.grp
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.grp
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.lcon b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.lcon
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.lcon
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.lcon
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.lev b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.lev
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.lev
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.lev
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.mat b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.mat
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/design.mat
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/example_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/example_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/lmax_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/lmax_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/lmax_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/lmax_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/mask.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/mask.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/cope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/cope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/cope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/cope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/dof b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/dof
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/dof
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/dof
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/logfile b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/logfile
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/logfile
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/logfile
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/pe1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/pe1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/pe1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/pe1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/res4d.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/res4d.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/res4d.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/res4d.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/smoothness b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/smoothness
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/smoothness
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/smoothness
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/tdof_t1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/tdof_t1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/tdof_t1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/tdof_t1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/tstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/tstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/tstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/tstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/varcope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/varcope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/varcope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/varcope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/weights1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/weights1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/weights1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/weights1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/stats/zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/thresh_zstat1.vol b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/thresh_zstat1.vol
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/thresh_zstat1.vol
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/thresh_zstat1.vol
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/var_filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/var_filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/var_filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope1.feat/var_filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/.flame b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/.flame
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/.flame
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/.flame
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/cluster_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/cluster_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/cluster_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/cluster_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.con b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.con
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.con
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.con
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.fsf b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.fsf
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.fsf
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.grp b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.grp
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.grp
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.grp
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.lcon b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.lcon
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.lcon
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.lcon
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.lev b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.lev
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.lev
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.lev
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.mat b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.mat
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/design.mat
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/example_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/example_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/lmax_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/lmax_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/lmax_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/lmax_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/mask.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/mask.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/cope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/cope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/cope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/cope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/dof b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/dof
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/dof
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/dof
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/logfile b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/logfile
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/logfile
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/logfile
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/pe1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/pe1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/pe1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/pe1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/res4d.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/res4d.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/res4d.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/res4d.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/smoothness b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/smoothness
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/smoothness
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/smoothness
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/tdof_t1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/tdof_t1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/tdof_t1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/tdof_t1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/tstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/tstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/tstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/tstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/varcope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/varcope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/varcope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/varcope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/weights1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/weights1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/weights1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/weights1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/stats/zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/thresh_zstat1.vol b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/thresh_zstat1.vol
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/thresh_zstat1.vol
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/thresh_zstat1.vol
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/var_filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/var_filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/var_filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/cope2.feat/var_filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/design.con b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/design.con
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/design.con
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/design.con
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/design.fsf b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/design.fsf
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/design.fsf
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/design.grp b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/design.grp
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/design.grp
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/design.grp
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/design.lcon b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/design.lcon
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/design.lcon
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/design.lcon
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/design.mat b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/design.mat
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/design.mat
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/masksum.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/masksum.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/masksum.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/masksum.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/masksum_overlay.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/masksum_overlay.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/masksum_overlay.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/masksum_overlay.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/maskunique.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/maskunique.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/maskunique.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/maskunique.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/maskunique_overlay.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/maskunique_overlay.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/maskunique_overlay.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/inputreg/maskunique_overlay.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/mask.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/mask.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_1.gfeat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_1.gfeat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_1.gfeat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/bg_image.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/bg_image.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/bg_image.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/bg_image.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/.flame b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/.flame
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/.flame
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/.flame
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/cluster_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/cluster_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/cluster_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/cluster_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.con b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.con
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.con
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.con
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.fsf b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.fsf
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.fsf
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.grp b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.grp
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.grp
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.grp
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.lcon b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.lcon
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.lcon
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.lcon
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.lev b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.lev
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.lev
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.lev
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.mat b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.mat
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/design.mat
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/example_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/example_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/lmax_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/lmax_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/lmax_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/lmax_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/mask.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/mask.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/cope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/cope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/cope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/cope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/dof b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/dof
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/dof
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/dof
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/logfile b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/logfile
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/logfile
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/logfile
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/pe1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/pe1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/pe1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/pe1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/pe2.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/pe2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/pe2.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/pe2.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/res4d.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/res4d.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/res4d.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/res4d.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/smoothness b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/smoothness
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/smoothness
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/smoothness
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/tdof_t1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/tdof_t1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/tdof_t1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/tdof_t1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/tstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/tstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/tstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/tstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/varcope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/varcope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/varcope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/varcope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/weights1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/weights1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/weights1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/weights1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/stats/zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/thresh_zstat1.vol b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/thresh_zstat1.vol
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/thresh_zstat1.vol
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/thresh_zstat1.vol
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/var_filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/var_filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/var_filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope1.feat/var_filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/.flame b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/.flame
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/.flame
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/.flame
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/cluster_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/cluster_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/cluster_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/cluster_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.con b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.con
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.con
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.con
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.fsf b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.fsf
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.fsf
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.grp b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.grp
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.grp
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.grp
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.lcon b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.lcon
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.lcon
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.lcon
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.lev b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.lev
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.lev
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.lev
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.mat b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.mat
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/design.mat
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/example_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/example_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/lmax_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/lmax_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/lmax_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/lmax_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/mask.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/mask.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/cope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/cope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/cope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/cope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/dof b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/dof
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/dof
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/dof
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/logfile b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/logfile
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/logfile
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/logfile
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/pe1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/pe1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/pe1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/pe1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/pe2.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/pe2.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/pe2.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/pe2.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/res4d.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/res4d.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/res4d.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/res4d.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/smoothness b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/smoothness
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/smoothness
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/smoothness
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/tdof_t1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/tdof_t1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/tdof_t1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/tdof_t1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/tstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/tstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/tstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/tstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/varcope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/varcope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/varcope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/varcope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/weights1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/weights1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/weights1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/weights1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/stats/zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/thresh_zstat1.vol b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/thresh_zstat1.vol
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/thresh_zstat1.vol
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/thresh_zstat1.vol
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/var_filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/var_filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/var_filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/cope2.feat/var_filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/design.con b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/design.con
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/design.con
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/design.con
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/design.fsf b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/design.fsf
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/design.fsf
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/design.grp b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/design.grp
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/design.grp
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/design.grp
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/design.lcon b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/design.lcon
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/design.lcon
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/design.lcon
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/design.mat b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/design.mat
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/design.mat
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/masksum.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/masksum.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/masksum.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/masksum.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/masksum_overlay.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/masksum_overlay.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/masksum_overlay.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/masksum_overlay.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/maskunique.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/maskunique.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/maskunique.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/maskunique.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/maskunique_overlay.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/maskunique_overlay.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/maskunique_overlay.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/inputreg/maskunique_overlay.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/mask.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/mask.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_2.gfeat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_2.gfeat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_2.gfeat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/bg_image.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/bg_image.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/bg_image.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/bg_image.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/.flame b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/.flame
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/.flame
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/.flame
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/cluster_mask_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/cluster_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/cluster_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/cluster_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/cluster_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.con b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.con
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.con
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.con
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.fsf b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.fsf
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.fsf
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.grp b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.grp
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.grp
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.grp
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.lcon b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.lcon
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.lcon
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.lcon
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.lev b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.lev
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.lev
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.lev
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.mat b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.mat
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/design.mat
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/example_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/example_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/lmax_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/lmax_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/lmax_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/lmax_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/mask.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/mask.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/rendered_thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/cope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/cope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/cope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/cope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/dof b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/dof
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/dof
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/dof
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/logfile b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/logfile
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/logfile
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/logfile
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/mean_random_effects_var1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/pe1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/pe1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/pe1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/pe1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/res4d.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/res4d.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/res4d.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/res4d.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/smoothness b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/smoothness
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/smoothness
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/smoothness
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/tdof_t1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/tdof_t1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/tdof_t1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/tdof_t1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/tstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/tstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/tstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/tstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/varcope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/varcope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/varcope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/varcope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/weights1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/weights1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/weights1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/weights1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zflame1lowertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zflame1uppertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/stats/zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/tdof_filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/tdof_filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/tdof_filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/tdof_filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/thresh_zstat1.vol b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/thresh_zstat1.vol
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/thresh_zstat1.vol
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/thresh_zstat1.vol
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/var_filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/var_filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/var_filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope1.feat/var_filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/.flame b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/.flame
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/.flame
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/.flame
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/cluster_mask_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/cluster_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/cluster_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/cluster_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/cluster_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.con b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.con
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.con
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.con
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.fsf b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.fsf
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.fsf
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.grp b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.grp
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.grp
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.grp
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.lcon b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.lcon
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.lcon
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.lcon
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.lev b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.lev
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.lev
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.lev
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.mat b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.mat
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/design.mat
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/example_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/example_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/example_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/example_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/lmax_zstat1_std.txt b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/lmax_zstat1_std.txt
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/lmax_zstat1_std.txt
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/lmax_zstat1_std.txt
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/mask.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/mask.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/mean_func.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/rendered_thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/cope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/cope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/cope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/cope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/dof b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/dof
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/dof
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/dof
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/logfile b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/logfile
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/logfile
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/logfile
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/mean_random_effects_var1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/pe1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/pe1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/pe1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/pe1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/res4d.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/res4d.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/res4d.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/res4d.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/smoothness b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/smoothness
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/smoothness
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/smoothness
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/tdof_t1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/tdof_t1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/tdof_t1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/tdof_t1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/tstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/tstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/tstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/tstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/varcope1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/varcope1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/varcope1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/varcope1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/weights1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/weights1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/weights1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/weights1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zflame1lowertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zflame1uppertstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/stats/zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/tdof_filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/tdof_filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/tdof_filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/tdof_filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/thresh_zstat1.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/thresh_zstat1.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/thresh_zstat1.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/thresh_zstat1.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/thresh_zstat1.vol b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/thresh_zstat1.vol
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/thresh_zstat1.vol
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/thresh_zstat1.vol
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/var_filtered_func_data.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/var_filtered_func_data.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/var_filtered_func_data.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/cope2.feat/var_filtered_func_data.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.con b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.con
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.con
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.con
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.fsf b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.fsf
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.fsf
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.fsf
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.grp b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.grp
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.grp
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.grp
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.lcon b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.lcon
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.lcon
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.lcon
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.mat b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.mat
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.mat
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/design.mat
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/mask.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/mask.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/mask.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/mask.nii.gz
diff --git a/tests/testdata/test_feat/2ndlevel_realdata.gfeat/mean_func.nii.gz b/fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/mean_func.nii.gz
similarity index 100%
rename from tests/testdata/test_feat/2ndlevel_realdata.gfeat/mean_func.nii.gz
rename to fsl/tests/testdata/test_feat/2ndlevel_realdata.gfeat/mean_func.nii.gz
diff --git a/tests/testdata/test_mesh.vtk b/fsl/tests/testdata/test_mesh.vtk
similarity index 100%
rename from tests/testdata/test_mesh.vtk
rename to fsl/tests/testdata/test_mesh.vtk
diff --git a/tests/testdata/test_mesh_data.txt b/fsl/tests/testdata/test_mesh_data.txt
similarity index 100%
rename from tests/testdata/test_mesh_data.txt
rename to fsl/tests/testdata/test_mesh_data.txt
diff --git a/fsl/transform/nonlinear.py b/fsl/transform/nonlinear.py
index 7a9b8e786bdf35a6cfb7d1eeca15d554477a1842..280047a2d44674a9d4437b4deba9d8cb3434a708 100644
--- a/fsl/transform/nonlinear.py
+++ b/fsl/transform/nonlinear.py
@@ -32,6 +32,7 @@ import scipy.ndimage.interpolation as ndinterp
 
 import fsl.utils.memoize           as memoize
 import fsl.data.image              as fslimage
+import fsl.data.constants          as fslconstants
 import fsl.utils.image.resample    as resample
 from . import                         affine
 
@@ -200,10 +201,29 @@ class DeformationField(NonLinearTransform):
         defType = kwargs.pop('defType', None)
 
         if defType not in (None, 'relative', 'absolute'):
-            raise ValueError('Invalid value for defType: {}'.format(defType))
+            raise ValueError(f'Invalid value for defType: {defType}')
 
         NonLinearTransform.__init__(self, image, src, ref, **kwargs)
 
+        # Displacement fields generated by the FSL
+        # convertwarp tool prior to FSL 6.0.5 would
+        # often not have their sform/qform affines
+        # set correctly. Here we check the sform/
+        # qform and, if necessary, construct a new
+        # affine from the reference image.
+        if self.getXFormCode() == fslconstants.NIFTI_XFORM_UNKNOWN:
+            xform = self.ref.voxToWorldMat
+
+            # It is possible for a displacement field
+            # to have different resolution to its
+            # reference space - they just have to be
+            # aligned in the world coordinate system.
+            if self.shape[:3] != self.ref.shape[:3]:
+                rescale = affine.rescale(self.shape[:3], self.ref.shape[:3])
+                xform   = affine.concat(xform, rescale)
+
+            self.voxToWorldMat = xform
+
         self.__defType = defType
 
 
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000000000000000000000000000000000000..fa61d946d06e15925cb9e903cbf3b3d87b30fabb
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,113 @@
+[build-system]
+requires      = ["setuptools"]
+build-backend = "setuptools.build_meta"
+
+
+[project]
+name            = "fslpy"
+dynamic         = ["version"]
+description     = "FSL Python library"
+readme          = {file = "README.rst", content-type="text/x-rst"}
+license         = {text = "Apache License Version 2.0"}
+requires-python = ">=3.8"
+authors         = [{name = "Paul McCarthy", email = "pauldmccarthy@gmail.com"}]
+
+dependencies = [
+ "dill",
+ "h5py >=2.9",
+ "nibabel >=2.4",
+ "numpy >=1",
+ "scipy >=0.18"
+]
+
+classifiers = [
+  "Development Status :: 3 - Alpha",
+  "Intended Audience :: Developers",
+  "License :: OSI Approved :: Apache Software License",
+  "Programming Language :: Python :: 3.8",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Topic :: Software Development :: Libraries :: Python Modules"
+]
+
+
+[project.urls]
+"Repository"    = "https://git.fmrib.ox.ac.uk/fsl/fslpy/"
+"Documentation" = "https://open.win.ox.ac.uk/pages/fsl/fslpy/"
+
+
+[project.optional-dependencies]
+extra = [
+  "indexed_gzip >=0.7",
+  "wxpython >=4",
+  "trimesh >=2.37.29",
+  "rtree >=0.8.3",
+  "Pillow >=3.2.0"
+]
+doc = [
+  "sphinx",
+  "sphinx_rtd_theme"
+]
+test = [
+  "pytest",
+  "coverage",
+  "pytest-cov",
+  "tomli; python_version < \"3.11\""
+]
+style = [
+  "pylint",
+  "flake8"
+]
+
+
+[project.scripts]
+imcp           = "fsl.scripts.imcp:main"
+imln           = "fsl.scripts.imln:main"
+immv           = "fsl.scripts.immv:main"
+imrm           = "fsl.scripts.imrm:main"
+imglob         = "fsl.scripts.imglob:main"
+imtest         = "fsl.scripts.imtest:main"
+remove_ext     = "fsl.scripts.remove_ext:main"
+fsl_abspath    = "fsl.scripts.fsl_abspath:main"
+Text2Vest      = "fsl.scripts.Text2Vest:main"
+Vest2Text      = "fsl.scripts.Vest2Text:main"
+atlasq         = "fsl.scripts.atlasq:main"
+atlasquery     = "fsl.scripts.atlasq:atlasquery_emulation"
+fsl_ents       = "fsl.scripts.fsl_ents:main"
+resample_image = "fsl.scripts.resample_image:main"
+fsl_convert_x5 = "fsl.scripts.fsl_convert_x5:main"
+fsl_apply_x5   = "fsl.scripts.fsl_apply_x5:main"
+
+
+[tool.setuptools.packages.find]
+include = ["fsl*"]
+exclude = ["fsl.tests*"]
+
+
+[tool.setuptools.package-data]
+fsl = ["utils/filetree/trees/*"]
+
+
+[tool.setuptools.dynamic]
+version = {attr = "fsl.version.__version__"}
+
+
+[tool.coverage.run]
+include = ["fsl/*"]
+omit    = ["fsl/tests/*", "fsl/data/imagewrapper.py"]
+
+
+[tool.pytest.ini_options]
+testpaths = ["fsl/tests"]
+addopts   = "-v --cov=fsl --showlocals --import-mode=importlib"
+markers   = [
+  "fsltest:    Requires FSL",
+  "wxtest:     Requires wxPython",
+  "dicomtest:  Requires dcm2niix",
+  "meshtest:   Requires trimesh and rtree",
+  "igziptest:  Requires indexed_gzip",
+  "piltest:    Requires Pillow",
+  "noroottest: Need to be executed as non-root user (will fail otherwise)",
+  "longtest:   Takes a long time",
+  "unixtest:   Only works on *nix systems"]
\ No newline at end of file
diff --git a/requirements-dev.txt b/requirements-dev.txt
deleted file mode 100644
index 0077afd5ed1cd129bfea288b879dc45cdb87dc18..0000000000000000000000000000000000000000
--- a/requirements-dev.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-sphinx
-sphinx_rtd_theme
-coverage
-pytest
-pytest-cov
diff --git a/requirements-extra.txt b/requirements-extra.txt
deleted file mode 100644
index 735bdaff40382b196be77390a2ee610bbeee8258..0000000000000000000000000000000000000000
--- a/requirements-extra.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-indexed_gzip>=0.7.0
-wxpython==4.*
-trimesh>=2.37.29
-rtree>=0.8.3
-Pillow>=3.2.0
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index d4f1b242fece5d04915f285f58fe92e39bf87ef8..0000000000000000000000000000000000000000
--- a/requirements.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-h5py>=2.9
-nibabel>=2.4
-numpy>=1
-scipy>=0.18
-dill
diff --git a/setup.cfg b/setup.cfg
index 59bf3d21a56b4da0a7878e93e682bd38dee3bb06..2f1e33f9036154f627cd2174f60e2b6d1eb44c90 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,25 +1,2 @@
-[aliases]
-test=pytest
-
-[bdist_wheel]
-universal=1
-
-[tool:pytest]
-markers =
-    fsltest:    Requires FSL
-    wxtest:     Requires wxPython
-    dicomtest:  Requires dcm2niix
-    meshtest:   Requires trimesh and rtree
-    igziptest:  Requires indexed_gzip
-    piltest:    Requires Pillow
-    noroottest: Need to be executed as non-root user (will fail otherwise)
-    longtest:   Takes a long time
-    unixtest:   Only works on *nix systems
-
-
-testpaths = tests
-addopts   = -v --cov=fsl -m "not longtest" --showlocals
-
-
 [flake8]
 ignore = E127,E201,E203,E221,E222,E241,E271,E272,E301,E302,E303,E701,W504
\ No newline at end of file
diff --git a/setup.py b/setup.py
deleted file mode 100644
index c588d8370f8948b1d78b9f6e4d3ba8ddf487dda4..0000000000000000000000000000000000000000
--- a/setup.py
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env python
-#
-# setup.py - setuptools configuration for installing the fslpy package.
-#
-# Author: Paul McCarthy <pauldmccarthy@gmail.com>
-#
-
-
-from __future__ import print_function
-
-import os.path       as op
-import                  shutil
-import unittest.mock as mock
-
-from setuptools import setup
-from setuptools import find_namespace_packages
-from setuptools import Command
-
-
-# The directory in which this setup.py file is contained.
-basedir = op.dirname(__file__)
-
-# Dependencies are listed in requirements.txt
-with open(op.join(basedir, 'requirements.txt'), 'rt') as f:
-    install_requires = [l.strip() for l in f.readlines()]
-
-# Optional dependencies are listed in requirements-extra.txt
-with open(op.join(basedir, 'requirements-extra.txt'), 'rt') as f:
-    extra_requires = {'extras' : [l.strip() for l in f.readlines()]}
-
-packages = find_namespace_packages(include=('fsl', 'fsl.*'))
-
-# Figure out the current fslpy version, as defined in fsl/version.py. We
-# don't want to import the fsl package,  as this may cause build problems.
-# So we manually parse the contents of fsl/version.py to extract the
-# version number.
-version = {}
-with open(op.join(basedir, "fsl", "version.py")) as f:
-    for line in f:
-        if line.startswith('__version__'):
-            exec(line, version)
-            break
-version = version['__version__']
-
-with open(op.join(basedir, 'README.rst'), 'rt') as f:
-    readme = f.read()
-
-
-class doc(Command):
-    """Build the API documentation. """
-
-    user_options = []
-
-    def initialize_options(self):
-        pass
-
-    def finalize_options(self):
-        pass
-
-    def run(self):
-
-        docdir  = op.join(basedir, 'doc')
-        destdir = op.join(docdir, 'html')
-
-        if op.exists(destdir):
-            shutil.rmtree(destdir)
-
-        print('Building documentation [{}]'.format(destdir))
-
-        import sphinx.cmd.build as sphinx_build
-
-        mockobj       = mock.MagicMock()
-        mockobj.__version__ = '2.2.0'
-        mockedModules = open(op.join(docdir, 'mock_modules.txt')).readlines()
-        mockedModules = [l.strip()   for l in mockedModules]
-        mockedModules = {m : mockobj for m in mockedModules}
-
-        patches = [mock.patch.dict('sys.modules', **mockedModules)]
-
-        [p.start() for p in patches]
-        sphinx_build.main([docdir, destdir])
-        [p.stop() for p in patches]
-
-
-setup(
-
-    name='fslpy',
-    version=version,
-    description='FSL Python library',
-    long_description=readme,
-    long_description_content_type='text/x-rst',
-    url='https://git.fmrib.ox.ac.uk/fsl/fslpy',
-    author='Paul McCarthy',
-    author_email='pauldmccarthy@gmail.com',
-    license='Apache License Version 2.0',
-    python_requires='>=3.7',
-
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: Apache Software License',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.9',
-        'Topic :: Software Development :: Libraries :: Python Modules'],
-
-    packages=packages,
-
-    install_requires=install_requires,
-    extras_require=extra_requires,
-    package_data={'fsl': ['utils/filetree/trees/*']},
-
-    test_suite='tests',
-
-    cmdclass={'doc' : doc},
-
-    entry_points={
-        'console_scripts' : [
-            'imcp           = fsl.scripts.imcp:main',
-            'imln           = fsl.scripts.imln:main',
-            'immv           = fsl.scripts.immv:main',
-            'imrm           = fsl.scripts.imrm:main',
-            'imglob         = fsl.scripts.imglob:main',
-            'imtest         = fsl.scripts.imtest:main',
-            'remove_ext     = fsl.scripts.remove_ext:main',
-            'fsl_abspath    = fsl.scripts.fsl_abspath:main',
-            'Text2Vest      = fsl.scripts.Text2Vest:main',
-            'Vest2Text      = fsl.scripts.Vest2Text:main',
-            'atlasq         = fsl.scripts.atlasq:main',
-            'atlasquery     = fsl.scripts.atlasq:atlasquery_emulation',
-            'fsl_ents       = fsl.scripts.fsl_ents:main',
-            'resample_image = fsl.scripts.resample_image:main',
-            'fsl_convert_x5 = fsl.scripts.fsl_convert_x5:main',
-            'fsl_apply_x5   = fsl.scripts.fsl_apply_x5:main'
-        ]
-    }
-)