diff --git a/.dvc/.gitignore b/.dvc/.gitignore
index 8bee8544..c2159360 100644
--- a/.dvc/.gitignore
+++ b/.dvc/.gitignore
@@ -1,12 +1,9 @@
-/config.local
-/updater
-/lock
-/updater.lock
-/state-journal
-/state-wal
-/state
-/cache
-/tmp
-/tmp
-/tmp
-/tmp
+/config.local
+/cache
+/updater
+/lock
+/updater.lock
+/state-journal
+/state-wal
+/state
+/tmp
\ No newline at end of file
diff --git a/.dvc/config b/.dvc/config
index f6a2ef73..42a9a249 100644
--- a/.dvc/config
+++ b/.dvc/config
@@ -1,6 +1,14 @@
 [core]
-    remote = gdrive2
+    remote = gdrive3
 ['remote "local"']
     url = ../../suite2p_data
-['remote "gdrive2"']
-    url = gdrive://1BH9yQf735uGMGyoGrPJ_HgxtwxEsVCGp
\ No newline at end of file
+['remote "gdrive3"']
+    url = gdrive://0ACw_QYaWTX7mUk9PVA
+    gdrive_client_id = 81639168383-ardpa0rrsolgo9geqekdeef5k78n3hh2.apps.googleusercontent.com
+    gdrive_client_secret = _2kMgM7BoFg27ID9zSNmdpy_
+    gdrive_user_credentials_file = tmp/gdrive-user-credentials.json
+['remote "gdrive-travis"']
+    url = gdrive://0ACw_QYaWTX7mUk9PVA
+    gdrive_use_service_account = true
+    gdrive_service_account_email = travis4@suite2p-testdata-dvc.iam.gserviceaccount.com
+    gdrive_service_account_p12_file_path = .dvc/creds/suite2p-testdata-dvc-b0d23791539c.p12
diff --git a/.dvc/creds/suite2p-testdata-dvc-b0d23791539c.p12 b/.dvc/creds/suite2p-testdata-dvc-b0d23791539c.p12
new file mode 100644
index 00000000..cd82c0cc
Binary files /dev/null and b/.dvc/creds/suite2p-testdata-dvc-b0d23791539c.p12 differ
diff --git a/.dvc/plots/confusion.json b/.dvc/plots/confusion.json
new file mode 100644
index 00000000..70a3b0dd
--- /dev/null
+++ b/.dvc/plots/confusion.json
@@ -0,0 +1,30 @@
+{
+    "$schema": "https://vega.github.io/schema/vega-lite/v4.json",
+    "data": {
+        "values": "<DVC_METRIC_DATA>"
+    },
+    "title": "<DVC_METRIC_TITLE>",
+    "mark": "rect",
+    "encoding": {
+        "x": {
+            "field": "<DVC_METRIC_X>",
+            "type": "nominal",
+            "sort": "ascending",
+            "title": "<DVC_METRIC_X_LABEL>"
+        },
+        "y": {
+            "field": "<DVC_METRIC_Y>",
+            "type": "nominal",
+            "sort": "ascending",
+            "title": "<DVC_METRIC_Y_LABEL>"
+        },
+        "color": {
+            "aggregate": "count",
+            "type": "quantitative"
+        },
+        "facet": {
+            "field": "rev",
+            "type": "nominal"
+        }
+    }
+}
diff --git a/.dvc/plots/default.json b/.dvc/plots/default.json
new file mode 100644
index 00000000..7885140f
--- /dev/null
+++ b/.dvc/plots/default.json
@@ -0,0 +1,29 @@
+{
+    "$schema": "https://vega.github.io/schema/vega-lite/v4.json",
+    "data": {
+        "values": "<DVC_METRIC_DATA>"
+    },
+    "title": "<DVC_METRIC_TITLE>",
+    "mark": {
+        "type": "line"
+    },
+    "encoding": {
+        "x": {
+            "field": "<DVC_METRIC_X>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_X_LABEL>"
+        },
+        "y": {
+            "field": "<DVC_METRIC_Y>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_Y_LABEL>",
+            "scale": {
+                "zero": false
+            }
+        },
+        "color": {
+            "field": "rev",
+            "type": "nominal"
+        }
+    }
+}
diff --git a/.dvc/plots/scatter.json b/.dvc/plots/scatter.json
new file mode 100644
index 00000000..fb1ea416
--- /dev/null
+++ b/.dvc/plots/scatter.json
@@ -0,0 +1,27 @@
+{
+    "$schema": "https://vega.github.io/schema/vega-lite/v4.json",
+    "data": {
+        "values": "<DVC_METRIC_DATA>"
+    },
+    "title": "<DVC_METRIC_TITLE>",
+    "mark": "point",
+    "encoding": {
+        "x": {
+            "field": "<DVC_METRIC_X>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_X_LABEL>"
+        },
+        "y": {
+            "field": "<DVC_METRIC_Y>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_Y_LABEL>",
+            "scale": {
+                "zero": false
+            }
+        },
+        "color": {
+            "field": "rev",
+            "type": "nominal"
+        }
+    }
+}
diff --git a/.dvc/plots/smooth.json b/.dvc/plots/smooth.json
new file mode 100644
index 00000000..79d0b38a
--- /dev/null
+++ b/.dvc/plots/smooth.json
@@ -0,0 +1,39 @@
+{
+    "$schema": "https://vega.github.io/schema/vega-lite/v4.json",
+    "data": {
+        "values": "<DVC_METRIC_DATA>"
+    },
+    "title": "<DVC_METRIC_TITLE>",
+    "mark": {
+        "type": "line"
+    },
+    "encoding": {
+        "x": {
+            "field": "<DVC_METRIC_X>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_X_LABEL>"
+        },
+        "y": {
+            "field": "<DVC_METRIC_Y>",
+            "type": "quantitative",
+            "title": "<DVC_METRIC_Y_LABEL>",
+            "scale": {
+                "zero": false
+            }
+        },
+        "color": {
+            "field": "rev",
+            "type": "nominal"
+        }
+    },
+    "transform": [
+        {
+            "loess": "<DVC_METRIC_Y>",
+            "on": "<DVC_METRIC_X>",
+            "groupby": [
+                "rev"
+            ],
+            "bandwidth": 0.3
+        }
+    ]
+}
diff --git a/.dvc/tmp/gdrive-user-credentials.json b/.dvc/tmp/gdrive-user-credentials.json
deleted file mode 100644
index ed45f345..00000000
--- a/.dvc/tmp/gdrive-user-credentials.json
+++ /dev/null
@@ -1 +0,0 @@
-{"access_token": "ya29.a0AfH6SMCn_2lpJ464HEazmgouXqAW72hTK7nuaNWBALOjElPAGNNyRUGMlan1Olnkv9T069743zQRB-ZZp1anag-cuMV-lNEuvy_JvT2_Ev5bUNeAL7phhGF_A0w1VKeHeJbZeZZrZYHO3zas1OaZ0DwChz_aCzIUuperUQ", "client_id": "710796635688-iivsgbgsb6uv1fap6635dhvuei09o66c.apps.googleusercontent.com", "client_secret": "a1Fz59uTpVNeG_VGuSKDLJXv", "refresh_token": "1//0fpJK6wboLxL7CgYIARAAGA8SNwF-L9IrKmhg8LLnJuWRCiN_YIE88ImD9Y0yV6iCIw220vP3gD4nISe-K5aq8l_r0m1qcUW1D_w", "token_expiry": "2020-07-23T14:27:57Z", "token_uri": "https://oauth2.googleapis.com/token", "user_agent": null, "revoke_uri": "https://oauth2.googleapis.com/revoke", "id_token": null, "id_token_jwt": null, "token_response": {"access_token": "ya29.a0AfH6SMCn_2lpJ464HEazmgouXqAW72hTK7nuaNWBALOjElPAGNNyRUGMlan1Olnkv9T069743zQRB-ZZp1anag-cuMV-lNEuvy_JvT2_Ev5bUNeAL7phhGF_A0w1VKeHeJbZeZZrZYHO3zas1OaZ0DwChz_aCzIUuperUQ", "expires_in": 3599, "scope": "https://www.googleapis.com/auth/drive.appdata https://www.googleapis.com/auth/drive", "token_type": "Bearer"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.appdata"], "token_info_uri": "https://oauth2.googleapis.com/tokeninfo", "invalid": false, "_class": "OAuth2Credentials", "_module": "oauth2client.client"}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 903d7777..344793cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,6 @@ doctrees/
 Network Trash Folder
 Temporary Items
 .apdisk
+
+# data
+data/test_data
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 17d203a5..5be8c5be 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,7 +25,7 @@ install:
 - conda env create -f environment.yml
 - source activate suite2p
 - pip install .[data]
-- dvc pull
+- dvc pull -r gdrive-travis
 - pip install coveralls
 script:
 - coverage run --source=suite2p setup.py test
diff --git a/README.md b/README.md
index 8e5bdd51..fd44a0cc 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,9 @@ The software has been heavily tested on Windows 10 and Ubuntu 18.04, and less we
 2. Run `conda env create -f environment.yml`
 3. To activate this new environment, run `conda activate suite2p` (you will have to activate every time you want to run suite2p)
 4. Install the local version of suite2p into this environment in develop mode, with everything to get test data: `pip install .[data]`
-5. Download the data: ``dvc pull``. Follow the authentication instructions in the output.
+5. Download the data: ``dvc pull``. Follow the authentication instructions in the output.  
+   a. (**Note**: do *not* commit the json credentials file that comes out afterwards, git should ignore it.)
+   b. if you only wan to download the data, you can download from the read-only remote with this command: ``dvc pull -r gdrive-travis``
 6. Run tests: `python setup.py test`
 
 
diff --git a/data/.gitignore b/data/.gitignore
deleted file mode 100644
index 44224559..00000000
--- a/data/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-# Only track dvc files.
-# Template from https://stackoverflow.com/questions/987142/make-gitignore-ignore-everything-except-a-few-files
-
-# Ignore everything
-*
-
-# But not these files...
-!*.dvc
-
-# ...even if they are in subdirectories
-!*/
diff --git a/data/test_data.dvc b/data/test_data.dvc
new file mode 100644
index 00000000..d13fe5b4
--- /dev/null
+++ b/data/test_data.dvc
@@ -0,0 +1,3 @@
+outs:
+- md5: 484b58990efd6929863cd77108f68ab0.dir
+  path: test_data
diff --git a/data/test_data/.gitignore b/data/test_data/.gitignore
deleted file mode 100644
index fbd9f7f2..00000000
--- a/data/test_data/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/input1.tif
diff --git a/data/test_data/1plane1chan/suite2p/ops1.npy.dvc b/data/test_data/1plane1chan/suite2p/ops1.npy.dvc
deleted file mode 100644
index 5ecd6cae..00000000
--- a/data/test_data/1plane1chan/suite2p/ops1.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: cc08fe994af7309088efa5ebdb90750e
-outs:
-- md5: 4680059696ea07d829c6213e71e8a681
-  path: ops1.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan/suite2p/plane0/F.npy.dvc b/data/test_data/1plane1chan/suite2p/plane0/F.npy.dvc
deleted file mode 100644
index b1d7b4b5..00000000
--- a/data/test_data/1plane1chan/suite2p/plane0/F.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: cb3209414cb9e1de2532d4bb2a033f91
-outs:
-- md5: 86713771ee3e99d0943a76fcf87b031f
-  path: F.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan/suite2p/plane0/Fneu.npy.dvc b/data/test_data/1plane1chan/suite2p/plane0/Fneu.npy.dvc
deleted file mode 100644
index 1b9fcffd..00000000
--- a/data/test_data/1plane1chan/suite2p/plane0/Fneu.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: a0336eb7f5fee9be411e8565fb3e4ac8
-outs:
-- md5: 74c1b3f0fbee2fee6413a89ee249c63e
-  path: Fneu.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan/suite2p/plane0/iscell.npy.dvc b/data/test_data/1plane1chan/suite2p/plane0/iscell.npy.dvc
deleted file mode 100644
index 2e021d23..00000000
--- a/data/test_data/1plane1chan/suite2p/plane0/iscell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 5e5ad9d364d92c5a0649b241dac5460a
-outs:
-- md5: e063ce2859f8df70ebeaa7a429411a68
-  path: iscell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan/suite2p/plane0/ops.npy.dvc b/data/test_data/1plane1chan/suite2p/plane0/ops.npy.dvc
deleted file mode 100644
index a0436a39..00000000
--- a/data/test_data/1plane1chan/suite2p/plane0/ops.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 4203de60c99d15e5555915df9b788476
-outs:
-- md5: 4b7cfbfa41ead96ed4896319486e6208
-  path: ops.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan/suite2p/plane0/spks.npy.dvc b/data/test_data/1plane1chan/suite2p/plane0/spks.npy.dvc
deleted file mode 100644
index e6e779c3..00000000
--- a/data/test_data/1plane1chan/suite2p/plane0/spks.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 0cda0dc9a2fa8f3a2c9dd639f9eb7ada
-outs:
-- md5: 3d2e13155f153a9b36b1a62ed6c0257c
-  path: spks.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan/suite2p/plane0/stat.npy.dvc b/data/test_data/1plane1chan/suite2p/plane0/stat.npy.dvc
deleted file mode 100644
index 87785e4b..00000000
--- a/data/test_data/1plane1chan/suite2p/plane0/stat.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: f3b4a3b549591afd9a7bff2c93cb47c6
-outs:
-- md5: 144484cd1e07eff62abee5f683847558
-  path: stat.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan/suite2p/test_write_tiff.tif.dvc b/data/test_data/1plane1chan/suite2p/test_write_tiff.tif.dvc
deleted file mode 100644
index a05b1ce2..00000000
--- a/data/test_data/1plane1chan/suite2p/test_write_tiff.tif.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 430095fcc5f245300f4e2aa57ab34302
-outs:
-- md5: 721425f9dc7aa32a677cbb3a35ba1ac1
-  path: test_write_tiff.tif
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan1500/suite2p/ops1.npy.dvc b/data/test_data/1plane1chan1500/suite2p/ops1.npy.dvc
deleted file mode 100644
index 0605ba6c..00000000
--- a/data/test_data/1plane1chan1500/suite2p/ops1.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: f8365d7c327e70250f9ea692cf798c6c
-outs:
-- md5: 12a0357062c63cd1821a0a2b7992694c
-  path: ops1.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan1500/suite2p/plane0/F.npy.dvc b/data/test_data/1plane1chan1500/suite2p/plane0/F.npy.dvc
deleted file mode 100644
index 377505ea..00000000
--- a/data/test_data/1plane1chan1500/suite2p/plane0/F.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: e6e4ce447aeb1d68356e758e740fb7c2
-outs:
-- md5: c2012e409aab2bab98de9431f9be8d31
-  path: F.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan1500/suite2p/plane0/Fneu.npy.dvc b/data/test_data/1plane1chan1500/suite2p/plane0/Fneu.npy.dvc
deleted file mode 100644
index 2785d0f9..00000000
--- a/data/test_data/1plane1chan1500/suite2p/plane0/Fneu.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 82f4886c7034e765c1ceef841a210963
-outs:
-- md5: 6b7b79f8b37184abb591d2a8757b3812
-  path: Fneu.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan1500/suite2p/plane0/iscell.npy.dvc b/data/test_data/1plane1chan1500/suite2p/plane0/iscell.npy.dvc
deleted file mode 100644
index 8945581e..00000000
--- a/data/test_data/1plane1chan1500/suite2p/plane0/iscell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: d05f5812d304cf69142d9d46817b6db4
-outs:
-- md5: c1c24e3264648697678d1e0d6bcecfee
-  path: iscell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan1500/suite2p/plane0/ops.npy.dvc b/data/test_data/1plane1chan1500/suite2p/plane0/ops.npy.dvc
deleted file mode 100644
index d7adde91..00000000
--- a/data/test_data/1plane1chan1500/suite2p/plane0/ops.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: aa31120aa9a43b43f9e8a42e5a0613a3
-outs:
-- md5: 377caef6cd5e2c4b6759b548759c180c
-  path: ops.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan1500/suite2p/plane0/spks.npy.dvc b/data/test_data/1plane1chan1500/suite2p/plane0/spks.npy.dvc
deleted file mode 100644
index 83671e81..00000000
--- a/data/test_data/1plane1chan1500/suite2p/plane0/spks.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 982dfd9fcef2fcbcd1d1115d8b7f4824
-outs:
-- md5: a6cbf8b8b3e9500e337747ce69c11f39
-  path: spks.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane1chan1500/suite2p/plane0/stat.npy.dvc b/data/test_data/1plane1chan1500/suite2p/plane0/stat.npy.dvc
deleted file mode 100644
index a9f58d0e..00000000
--- a/data/test_data/1plane1chan1500/suite2p/plane0/stat.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 4bba2585a6b6be704f68fe85df519370
-outs:
-- md5: f8b875e9d384aed4a018683474cb9bea
-  path: stat.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/ops1.npy.dvc b/data/test_data/1plane2chan-scanimage/suite2p/ops1.npy.dvc
deleted file mode 100644
index ae54a8e2..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/ops1.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 110ce1bfa5a15a735ebd095c1f877834
-outs:
-- md5: 769312152b4e1eab22dd54bf41567207
-  path: ops1.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/plane0/F.npy.dvc b/data/test_data/1plane2chan-scanimage/suite2p/plane0/F.npy.dvc
deleted file mode 100644
index ec9cb990..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/plane0/F.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 4f49c17cc935dff55f6d26a7e14ee566
-outs:
-- md5: e7268999f4ab0a592a74be0a0e02af61
-  path: F.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/plane0/F_chan2.npy.dvc b/data/test_data/1plane2chan-scanimage/suite2p/plane0/F_chan2.npy.dvc
deleted file mode 100644
index 8a1bddc4..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/plane0/F_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 938eaa6f35b87dd472e2a2baa7a2a372
-outs:
-- md5: acce8cdbaa799f428eecbe2b78f2e5c1
-  path: F_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/plane0/Fneu.npy.dvc b/data/test_data/1plane2chan-scanimage/suite2p/plane0/Fneu.npy.dvc
deleted file mode 100644
index f4a0b07f..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/plane0/Fneu.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 0551618c7c1a79e67d71d84b409096c0
-outs:
-- md5: f2ece53fddf426fc32d94d335f660614
-  path: Fneu.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/plane0/Fneu_chan2.npy.dvc b/data/test_data/1plane2chan-scanimage/suite2p/plane0/Fneu_chan2.npy.dvc
deleted file mode 100644
index e27f56e4..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/plane0/Fneu_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: cbf9a2578c4635daee8f710ce00fa561
-outs:
-- md5: f00fb412422aa59fb835b83c112ab063
-  path: Fneu_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/plane0/data.bin.dvc b/data/test_data/1plane2chan-scanimage/suite2p/plane0/data.bin.dvc
deleted file mode 100644
index c431992c..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/plane0/data.bin.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 5138160e16f7a433d3fad7091ab0cc46
-outs:
-- md5: 72fa6099927532baafe24a4b333e109c
-  path: data.bin
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/plane0/data_chan2.bin.dvc b/data/test_data/1plane2chan-scanimage/suite2p/plane0/data_chan2.bin.dvc
deleted file mode 100644
index faf2841c..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/plane0/data_chan2.bin.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: a1a3cf5807c6c86edf84cbddaff4d6dd
-outs:
-- md5: e67ab230b6e351b47d8d973645cdb97e
-  path: data_chan2.bin
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/plane0/iscell.npy.dvc b/data/test_data/1plane2chan-scanimage/suite2p/plane0/iscell.npy.dvc
deleted file mode 100644
index c5a4a7d5..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/plane0/iscell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: ccd718f821e336d54fbc758f83fefd46
-outs:
-- md5: 737d3be2e3d7b6921fedb9954ff80de8
-  path: iscell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/plane0/ops.npy.dvc b/data/test_data/1plane2chan-scanimage/suite2p/plane0/ops.npy.dvc
deleted file mode 100644
index 16e0ca9a..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/plane0/ops.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 70601e20276fba83ba5083e0737b8b7a
-outs:
-- md5: d0b336389728aec91d163e7c1178ac2d
-  path: ops.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/plane0/redcell.npy.dvc b/data/test_data/1plane2chan-scanimage/suite2p/plane0/redcell.npy.dvc
deleted file mode 100644
index 73f76761..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/plane0/redcell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 954c9732a5f976f7aa53231c2a1353d7
-outs:
-- md5: d3d01d264ffc4afd10461621271dea48
-  path: redcell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/plane0/spks.npy.dvc b/data/test_data/1plane2chan-scanimage/suite2p/plane0/spks.npy.dvc
deleted file mode 100644
index 000a380c..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/plane0/spks.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: ac8910db3c3785e4fb28732c33bde7a1
-outs:
-- md5: d2c7019dee1dcbabf2a25b0581ea3bb6
-  path: spks.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan-scanimage/suite2p/plane0/stat.npy.dvc b/data/test_data/1plane2chan-scanimage/suite2p/plane0/stat.npy.dvc
deleted file mode 100644
index a77e5f6c..00000000
--- a/data/test_data/1plane2chan-scanimage/suite2p/plane0/stat.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 85555b82cd3751b00754e408267e39cd
-outs:
-- md5: 4072fc572f96a37626a1355521467d6c
-  path: stat.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan/suite2p/ops1.npy.dvc b/data/test_data/1plane2chan/suite2p/ops1.npy.dvc
deleted file mode 100644
index ee78e23c..00000000
--- a/data/test_data/1plane2chan/suite2p/ops1.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 409725dfd216fd5c4f2bbc3b419cd52b
-outs:
-- md5: 530eee0c2d8447f325c0d1249b07885b
-  path: ops1.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan/suite2p/plane0/F.npy.dvc b/data/test_data/1plane2chan/suite2p/plane0/F.npy.dvc
deleted file mode 100644
index d585b5a0..00000000
--- a/data/test_data/1plane2chan/suite2p/plane0/F.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 342c910634d3975f1441891ebc572e20
-outs:
-- md5: 7f35bf7948f7f32a3c9ed67d01403f1a
-  path: F.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan/suite2p/plane0/F_chan2.npy.dvc b/data/test_data/1plane2chan/suite2p/plane0/F_chan2.npy.dvc
deleted file mode 100644
index 8ca8bfb5..00000000
--- a/data/test_data/1plane2chan/suite2p/plane0/F_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 2ab0e9708aeb70a3459ef977aa2b508f
-outs:
-- md5: 333fb5afca454bb7c471db68f7b64948
-  path: F_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan/suite2p/plane0/Fneu.npy.dvc b/data/test_data/1plane2chan/suite2p/plane0/Fneu.npy.dvc
deleted file mode 100644
index 89877290..00000000
--- a/data/test_data/1plane2chan/suite2p/plane0/Fneu.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 6e274869502c6bad5739720d1f47fdc2
-outs:
-- md5: 8049143474885dbe336c56fed97167d8
-  path: Fneu.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan/suite2p/plane0/Fneu_chan2.npy.dvc b/data/test_data/1plane2chan/suite2p/plane0/Fneu_chan2.npy.dvc
deleted file mode 100644
index 217b6e8f..00000000
--- a/data/test_data/1plane2chan/suite2p/plane0/Fneu_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 26279c6972fe6c5d0504c4048c8f2c95
-outs:
-- md5: 2c77b7b9be0276d888c5495a457856eb
-  path: Fneu_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan/suite2p/plane0/iscell.npy.dvc b/data/test_data/1plane2chan/suite2p/plane0/iscell.npy.dvc
deleted file mode 100644
index aa2d1ecc..00000000
--- a/data/test_data/1plane2chan/suite2p/plane0/iscell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 554ac029df952131b110283e611178a0
-outs:
-- md5: 63519dc05baa9f588e6787d4ba6d0b40
-  path: iscell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan/suite2p/plane0/ops.npy.dvc b/data/test_data/1plane2chan/suite2p/plane0/ops.npy.dvc
deleted file mode 100644
index 27eb4457..00000000
--- a/data/test_data/1plane2chan/suite2p/plane0/ops.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: c0b1ab8c53625c8fd79b804a541b0caf
-outs:
-- md5: 0234b52424556c7855cfb6cfd8c15d36
-  path: ops.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan/suite2p/plane0/redcell.npy.dvc b/data/test_data/1plane2chan/suite2p/plane0/redcell.npy.dvc
deleted file mode 100644
index c28a5805..00000000
--- a/data/test_data/1plane2chan/suite2p/plane0/redcell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: d02a2da71ed9dbbb63ab71d0cc062081
-outs:
-- md5: 11afd2e396e86a9e1bb65bd72bd0a786
-  path: redcell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan/suite2p/plane0/spks.npy.dvc b/data/test_data/1plane2chan/suite2p/plane0/spks.npy.dvc
deleted file mode 100644
index 3017643f..00000000
--- a/data/test_data/1plane2chan/suite2p/plane0/spks.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 72efda3a7003a9bdf6bc5c9869ad7a07
-outs:
-- md5: b4b623f0947a4f8d7bf6b236473a8a4a
-  path: spks.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/1plane2chan/suite2p/plane0/stat.npy.dvc b/data/test_data/1plane2chan/suite2p/plane0/stat.npy.dvc
deleted file mode 100644
index 7f54c4de..00000000
--- a/data/test_data/1plane2chan/suite2p/plane0/stat.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: a797d5666a8b9a77c01c8b66392e9117
-outs:
-- md5: 4b78132c8a6dd1c13cf9a2a9d02d2214
-  path: stat.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/combined/F.npy.dvc b/data/test_data/2plane2chan/suite2p/combined/F.npy.dvc
deleted file mode 100644
index f5f951bf..00000000
--- a/data/test_data/2plane2chan/suite2p/combined/F.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 0250c10c3a1273bb754cc014bcde3bef
-outs:
-- md5: d68804b6701a4de68ab16e0e52e14e10
-  path: F.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/combined/Fneu.npy.dvc b/data/test_data/2plane2chan/suite2p/combined/Fneu.npy.dvc
deleted file mode 100644
index d1bf34ca..00000000
--- a/data/test_data/2plane2chan/suite2p/combined/Fneu.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 04bbd3544916318d5ae43b8f825e1cb4
-outs:
-- md5: 14788ea26eb645819ac6450997a14b5e
-  path: Fneu.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/combined/iscell.npy.dvc b/data/test_data/2plane2chan/suite2p/combined/iscell.npy.dvc
deleted file mode 100644
index 54ce8e1d..00000000
--- a/data/test_data/2plane2chan/suite2p/combined/iscell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: bdb70f8b82e9f97cfe4196e27dd8a538
-outs:
-- md5: 68ff9ccbb222637541f2db94e13c63c0
-  path: iscell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/combined/ops.npy.dvc b/data/test_data/2plane2chan/suite2p/combined/ops.npy.dvc
deleted file mode 100644
index a7f69737..00000000
--- a/data/test_data/2plane2chan/suite2p/combined/ops.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: f3e0588552c3364e12b3a3a2cfe9581a
-outs:
-- md5: 923ecd291abba383b26f68d3a7583284
-  path: ops.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/combined/redcell.npy.dvc b/data/test_data/2plane2chan/suite2p/combined/redcell.npy.dvc
deleted file mode 100644
index 8765fcc7..00000000
--- a/data/test_data/2plane2chan/suite2p/combined/redcell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: cd3eca19497223aa7ee3009fa5c55eda
-outs:
-- md5: 899372609653f80db370434f77c9efdd
-  path: redcell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/combined/spks.npy.dvc b/data/test_data/2plane2chan/suite2p/combined/spks.npy.dvc
deleted file mode 100644
index 5314ba56..00000000
--- a/data/test_data/2plane2chan/suite2p/combined/spks.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 52e98ed3656c1259e932d67ba6738e7d
-outs:
-- md5: 2ebd6a244715815b1afc59b13b3fd740
-  path: spks.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/combined/stat.npy.dvc b/data/test_data/2plane2chan/suite2p/combined/stat.npy.dvc
deleted file mode 100644
index 349cecac..00000000
--- a/data/test_data/2plane2chan/suite2p/combined/stat.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: a24919df743bcc5709c2ce8ea8b1ebf4
-outs:
-- md5: 49dbc53052cafe3b92868fdc2305935e
-  path: stat.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/ops1.npy.dvc b/data/test_data/2plane2chan/suite2p/ops1.npy.dvc
deleted file mode 100644
index a76f716c..00000000
--- a/data/test_data/2plane2chan/suite2p/ops1.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 3f154bbf5e4a6b517033b6daaf62ff40
-outs:
-- md5: 146fda022c989c563cd34e557baa43bb
-  path: ops1.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane0/F.npy.dvc b/data/test_data/2plane2chan/suite2p/plane0/F.npy.dvc
deleted file mode 100644
index 96f14c80..00000000
--- a/data/test_data/2plane2chan/suite2p/plane0/F.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: ad9f5795ca801594528546f9bd948f82
-outs:
-- md5: 04d8a77ba39a4d0ff73ff2e0e4d0a3db
-  path: F.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane0/F_chan2.npy.dvc b/data/test_data/2plane2chan/suite2p/plane0/F_chan2.npy.dvc
deleted file mode 100644
index c907b0fe..00000000
--- a/data/test_data/2plane2chan/suite2p/plane0/F_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 117734cb310961d0b4b24cbe8596ea75
-outs:
-- md5: 928dbdff2802fcaa6710f54a45a05d43
-  path: F_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane0/Fneu.npy.dvc b/data/test_data/2plane2chan/suite2p/plane0/Fneu.npy.dvc
deleted file mode 100644
index 67c766b5..00000000
--- a/data/test_data/2plane2chan/suite2p/plane0/Fneu.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 63b6e61d3aaf5d0d4045eb27916a0b59
-outs:
-- md5: 198b66771a19295988532977a4df5ff1
-  path: Fneu.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane0/Fneu_chan2.npy.dvc b/data/test_data/2plane2chan/suite2p/plane0/Fneu_chan2.npy.dvc
deleted file mode 100644
index fe62f748..00000000
--- a/data/test_data/2plane2chan/suite2p/plane0/Fneu_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 4e32da80615dbcb1b955073f044eb55e
-outs:
-- md5: fef712bda6b8be0ba8ac1be0f77f5a83
-  path: Fneu_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane0/iscell.npy.dvc b/data/test_data/2plane2chan/suite2p/plane0/iscell.npy.dvc
deleted file mode 100644
index 22b6d358..00000000
--- a/data/test_data/2plane2chan/suite2p/plane0/iscell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: bbbf27eab373712f8e424b663bbe4478
-outs:
-- md5: 10b814c8850b1cc8a88698406e3d12cc
-  path: iscell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane0/ops.npy.dvc b/data/test_data/2plane2chan/suite2p/plane0/ops.npy.dvc
deleted file mode 100644
index ba81b0ce..00000000
--- a/data/test_data/2plane2chan/suite2p/plane0/ops.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 57565476045492f9c4ee59728f9a69ab
-outs:
-- md5: 8313a95d2bba4d2bfdf5a71dfcfc87fd
-  path: ops.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane0/redcell.npy.dvc b/data/test_data/2plane2chan/suite2p/plane0/redcell.npy.dvc
deleted file mode 100644
index 3d2a3757..00000000
--- a/data/test_data/2plane2chan/suite2p/plane0/redcell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 6f8fba363af4f350773327adc004ac6c
-outs:
-- md5: cf79065071a8414b0fbd2530f3909701
-  path: redcell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane0/spks.npy.dvc b/data/test_data/2plane2chan/suite2p/plane0/spks.npy.dvc
deleted file mode 100644
index 58c0c8d2..00000000
--- a/data/test_data/2plane2chan/suite2p/plane0/spks.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 79933a9b597260a818e795ed6b8ee84f
-outs:
-- md5: 3aec553a11e42639cafdf7f6462b08d4
-  path: spks.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane0/stat.npy.dvc b/data/test_data/2plane2chan/suite2p/plane0/stat.npy.dvc
deleted file mode 100644
index c0e7e315..00000000
--- a/data/test_data/2plane2chan/suite2p/plane0/stat.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 002f82a3b0fe7c1731f8f5c702352a8f
-outs:
-- md5: 21a42f03646458cebe219a207c98614f
-  path: stat.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane1/F.npy.dvc b/data/test_data/2plane2chan/suite2p/plane1/F.npy.dvc
deleted file mode 100644
index 015c7a4e..00000000
--- a/data/test_data/2plane2chan/suite2p/plane1/F.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: ef5ac5b14d3c411cb64b93f8dec1dac1
-outs:
-- md5: d30ba8f86cb8bc49b64806965e4db96a
-  path: F.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane1/F_chan2.npy.dvc b/data/test_data/2plane2chan/suite2p/plane1/F_chan2.npy.dvc
deleted file mode 100644
index 0de631eb..00000000
--- a/data/test_data/2plane2chan/suite2p/plane1/F_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 97ac795034449a5b5334c7f30c6c781b
-outs:
-- md5: 277cd3e3808a1e7c8a3c1d397eb48d89
-  path: F_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane1/Fneu.npy.dvc b/data/test_data/2plane2chan/suite2p/plane1/Fneu.npy.dvc
deleted file mode 100644
index 8c4694b3..00000000
--- a/data/test_data/2plane2chan/suite2p/plane1/Fneu.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 239f430c30b2299fa67c60328e5ff64f
-outs:
-- md5: 0d22f22c9444059e92c47bfd9c5f036c
-  path: Fneu.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane1/Fneu_chan2.npy.dvc b/data/test_data/2plane2chan/suite2p/plane1/Fneu_chan2.npy.dvc
deleted file mode 100644
index 834a34a0..00000000
--- a/data/test_data/2plane2chan/suite2p/plane1/Fneu_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 6d8a19613c268f486c5ee96f485c02f5
-outs:
-- md5: f605ba81d4800a58658a32babfcab9ff
-  path: Fneu_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane1/iscell.npy.dvc b/data/test_data/2plane2chan/suite2p/plane1/iscell.npy.dvc
deleted file mode 100644
index b44eeac7..00000000
--- a/data/test_data/2plane2chan/suite2p/plane1/iscell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 66017885b13d83ef160b0c55d143d4d6
-outs:
-- md5: 94cb5971d2f8c8f15213820a9210d702
-  path: iscell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane1/ops.npy.dvc b/data/test_data/2plane2chan/suite2p/plane1/ops.npy.dvc
deleted file mode 100644
index 77ea14b1..00000000
--- a/data/test_data/2plane2chan/suite2p/plane1/ops.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 3b5f115e549f32051cb5a86864456e19
-outs:
-- md5: f4392b90fd2d82bf433493799c915185
-  path: ops.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane1/redcell.npy.dvc b/data/test_data/2plane2chan/suite2p/plane1/redcell.npy.dvc
deleted file mode 100644
index c6f705e1..00000000
--- a/data/test_data/2plane2chan/suite2p/plane1/redcell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 8bbc97995d880445d660796d29dac663
-outs:
-- md5: e130007598176b2e603d6b27370704bf
-  path: redcell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane1/spks.npy.dvc b/data/test_data/2plane2chan/suite2p/plane1/spks.npy.dvc
deleted file mode 100644
index 60715e56..00000000
--- a/data/test_data/2plane2chan/suite2p/plane1/spks.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 852ec0491d8cb3a47600e9d798c3703b
-outs:
-- md5: 1cca00e554cf6b1c9bf08d43dce54279
-  path: spks.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan/suite2p/plane1/stat.npy.dvc b/data/test_data/2plane2chan/suite2p/plane1/stat.npy.dvc
deleted file mode 100644
index 646e87f5..00000000
--- a/data/test_data/2plane2chan/suite2p/plane1/stat.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 5a3470767ea5087d18055e866505d09c
-outs:
-- md5: c8caecfd71a82a8914d6bdb5b0c73d3c
-  path: stat.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/ops1.npy.dvc b/data/test_data/2plane2chan1500/suite2p/ops1.npy.dvc
deleted file mode 100644
index 4cc17252..00000000
--- a/data/test_data/2plane2chan1500/suite2p/ops1.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 657ecb1a614d4ab6540124271f3de690
-outs:
-- md5: 2b52b4b24840dad01a01d8ac312ed987
-  path: ops1.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane0/F.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane0/F.npy.dvc
deleted file mode 100644
index 35c08d54..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane0/F.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: fbd68768181741362fc60b83a8c71421
-outs:
-- md5: 61a16e1610029b33fe4534e2c8733578
-  path: F.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane0/F_chan2.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane0/F_chan2.npy.dvc
deleted file mode 100644
index e388b78d..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane0/F_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 301ddd7c36a4d2f1e965b68b9177a9bf
-outs:
-- md5: 4f13e841e09463cf39d93efaf2dcb4a1
-  path: F_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane0/Fneu.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane0/Fneu.npy.dvc
deleted file mode 100644
index 8f6fd4b6..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane0/Fneu.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: a0026012f0e78ed0d26c385e5b845f8a
-outs:
-- md5: 092074d6127b02c7a032cac02648608d
-  path: Fneu.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane0/Fneu_chan2.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane0/Fneu_chan2.npy.dvc
deleted file mode 100644
index 79b58a18..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane0/Fneu_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: c25d49eb06d95b54e4bf99da905fa300
-outs:
-- md5: 7b04af2d3533ee764f162fd7f171c23d
-  path: Fneu_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane0/iscell.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane0/iscell.npy.dvc
deleted file mode 100644
index c27e4cc8..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane0/iscell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 78810a0367a83b0809ca4bde82f23ce3
-outs:
-- md5: 0ee2b78fd6d37bda9a54dc7036cd6e5c
-  path: iscell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane0/ops.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane0/ops.npy.dvc
deleted file mode 100644
index e60e90a8..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane0/ops.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 22543a40a7a1757807babf6b3b168968
-outs:
-- md5: 167f603337f13dcce22faf64640c742a
-  path: ops.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane0/redcell.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane0/redcell.npy.dvc
deleted file mode 100644
index 87ebdebd..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane0/redcell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 43a1826882f27a585fa1cc88c9d467a5
-outs:
-- md5: e4d13616bf3605adc552718c4bad1717
-  path: redcell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane0/reg_tif/file000_chan0.tif.dvc b/data/test_data/2plane2chan1500/suite2p/plane0/reg_tif/file000_chan0.tif.dvc
deleted file mode 100644
index be0a902e..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane0/reg_tif/file000_chan0.tif.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-outs:
-- md5: 24b9fc2855d19f49362f33aeeb30e153
-  path: file000_chan0.tif
-  cache: true
-  metric: false
-  persist: false
-md5: 19ec6610d89d890af072bcb4b55b2cd2
diff --git a/data/test_data/2plane2chan1500/suite2p/plane0/reg_tif_chan2/file000_chan1.tif.dvc b/data/test_data/2plane2chan1500/suite2p/plane0/reg_tif_chan2/file000_chan1.tif.dvc
deleted file mode 100644
index 681de5e5..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane0/reg_tif_chan2/file000_chan1.tif.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-outs:
-- md5: 6fc06ed68722994edd1b6e627edba902
-  path: file000_chan1.tif
-  cache: true
-  metric: false
-  persist: false
-md5: c91cd509db2c5a918e4dc56d3d0f2048
diff --git a/data/test_data/2plane2chan1500/suite2p/plane0/spks.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane0/spks.npy.dvc
deleted file mode 100644
index 696ddf2b..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane0/spks.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 69cee1267aac4743a52d44f3dac51cab
-outs:
-- md5: 2fec3b288556374f0bd2a459481eb461
-  path: spks.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane0/stat.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane0/stat.npy.dvc
deleted file mode 100644
index 26a76c45..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane0/stat.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 50c966460f55111de6a39f18a80ee9d8
-outs:
-- md5: 76ba3c6d99382a4a1df1145c5c30ef94
-  path: stat.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane1/F.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane1/F.npy.dvc
deleted file mode 100644
index 2254dc30..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane1/F.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 22c69a9cb3a62ae4cfaff829f3efefff
-outs:
-- md5: b88699455061febe3b07a8ec1a51ff0c
-  path: F.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane1/F_chan2.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane1/F_chan2.npy.dvc
deleted file mode 100644
index a5480f36..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane1/F_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: cee3091ac7fa171f7d9d4f5cf7667f8e
-outs:
-- md5: e0f9ce8de0371efa8e2447d93642ceff
-  path: F_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane1/Fneu.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane1/Fneu.npy.dvc
deleted file mode 100644
index 8330f5a1..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane1/Fneu.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: bb8b93c6389d689e9d6cca36760f9b65
-outs:
-- md5: 5cd6dee88a7499eaf71de0d69051055a
-  path: Fneu.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane1/Fneu_chan2.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane1/Fneu_chan2.npy.dvc
deleted file mode 100644
index 6f5996f9..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane1/Fneu_chan2.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: eaff5ab87d51b094d929d0ed10b0678f
-outs:
-- md5: 008a5d911cc02e0ed355ec7194e1bac7
-  path: Fneu_chan2.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane1/iscell.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane1/iscell.npy.dvc
deleted file mode 100644
index a8f9f9ce..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane1/iscell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 928f089a265f156de0ab47d433771880
-outs:
-- md5: fe68b0ca83aeb98eef38ccf00a63b417
-  path: iscell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane1/ops.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane1/ops.npy.dvc
deleted file mode 100644
index a0f4f972..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane1/ops.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: f884ffc2049275aadaa7b5b04888343e
-outs:
-- md5: 1db3400d43b4e182bc0a652bd3691e56
-  path: ops.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane1/redcell.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane1/redcell.npy.dvc
deleted file mode 100644
index 8ed10488..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane1/redcell.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: af49533a226947a81dc8dc6f57ee2996
-outs:
-- md5: eb026fbf46718c06bec3e6e42e55492d
-  path: redcell.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane1/reg_tif/file000_chan0.tif.dvc b/data/test_data/2plane2chan1500/suite2p/plane1/reg_tif/file000_chan0.tif.dvc
deleted file mode 100644
index 49461c6f..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane1/reg_tif/file000_chan0.tif.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-outs:
-- md5: cf9361d936a5bad86b6a7bc9ab6a6423
-  path: file000_chan0.tif
-  cache: true
-  metric: false
-  persist: false
-md5: 92ba8e0962b5fdd4877513fff910d4e7
diff --git a/data/test_data/2plane2chan1500/suite2p/plane1/reg_tif_chan2/file000_chan1.tif.dvc b/data/test_data/2plane2chan1500/suite2p/plane1/reg_tif_chan2/file000_chan1.tif.dvc
deleted file mode 100644
index e1f627bb..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane1/reg_tif_chan2/file000_chan1.tif.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-outs:
-- md5: 5dfe9b849e29d0c364847d32679ac1fe
-  path: file000_chan1.tif
-  cache: true
-  metric: false
-  persist: false
-md5: d1f9e49243205610a753248b3f94a1b9
diff --git a/data/test_data/2plane2chan1500/suite2p/plane1/spks.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane1/spks.npy.dvc
deleted file mode 100644
index cd78fe45..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane1/spks.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 02706b2f68d7129d9ce3459dfadc44a6
-outs:
-- md5: 5839f24c3057f79b495dfe7be24ba644
-  path: spks.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/2plane2chan1500/suite2p/plane1/stat.npy.dvc b/data/test_data/2plane2chan1500/suite2p/plane1/stat.npy.dvc
deleted file mode 100644
index 479d0d04..00000000
--- a/data/test_data/2plane2chan1500/suite2p/plane1/stat.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: a79858a697bbfb23f75143373ad82778
-outs:
-- md5: c822049b6db7a2987ab919d392697698
-  path: stat.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/classification/pre_stat.npy.dvc b/data/test_data/classification/pre_stat.npy.dvc
deleted file mode 100644
index 03d7b54d..00000000
--- a/data/test_data/classification/pre_stat.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 222804786d99bbeef0d10a4c1c7c21e2
-outs:
-- md5: 144484cd1e07eff62abee5f683847558
-  path: pre_stat.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/detection/detect_output_1p1c0.npy.dvc b/data/test_data/detection/detect_output_1p1c0.npy.dvc
deleted file mode 100644
index 864ff7c8..00000000
--- a/data/test_data/detection/detect_output_1p1c0.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 0cb8789ec5068a987cb27d8cff2b1515
-outs:
-- md5: 58d29362cf4ab7ef3450dbe70f68385b
-  path: detect_output_1p1c0.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/detection/detect_output_2p2c0.npy.dvc b/data/test_data/detection/detect_output_2p2c0.npy.dvc
deleted file mode 100644
index 45755bb4..00000000
--- a/data/test_data/detection/detect_output_2p2c0.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 29a50cca9549f174e60e6b7e7d9f5407
-outs:
-- md5: d6f0f1bb1f9abd8191543a4e74246c62
-  path: detect_output_2p2c0.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/detection/detect_output_2p2c1.npy.dvc b/data/test_data/detection/detect_output_2p2c1.npy.dvc
deleted file mode 100644
index 4aff2ec2..00000000
--- a/data/test_data/detection/detect_output_2p2c1.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 203801255c0a2f6eebf0307e48aaf9cc
-outs:
-- md5: 81416ecadd0c0c29191a6f172355cd4d
-  path: detect_output_2p2c1.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/detection/meanImg_chan2p0.npy.dvc b/data/test_data/detection/meanImg_chan2p0.npy.dvc
deleted file mode 100644
index 606a0572..00000000
--- a/data/test_data/detection/meanImg_chan2p0.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 5b9422aef421f9d4c80962df49852160
-outs:
-- md5: 4715f1d85a2834e85fa4f3619588ef8a
-  path: meanImg_chan2p0.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/detection/meanImg_chan2p1.npy.dvc b/data/test_data/detection/meanImg_chan2p1.npy.dvc
deleted file mode 100644
index f8725c92..00000000
--- a/data/test_data/detection/meanImg_chan2p1.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 6b6c9ea51effd7491654afa411cfa072
-outs:
-- md5: 3b4f25de658ee8b0e7073a562b3ac04c
-  path: meanImg_chan2p1.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/detection/pre_registered.npy.dvc b/data/test_data/detection/pre_registered.npy.dvc
deleted file mode 100644
index e8a6318e..00000000
--- a/data/test_data/detection/pre_registered.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 99ba2587d90a374ebf9797ca78a083f7
-outs:
-- md5: 721039b2608ae537da91e9577633d96c
-  path: pre_registered.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/detection/pre_registered01.npy.dvc b/data/test_data/detection/pre_registered01.npy.dvc
deleted file mode 100644
index 17002ce4..00000000
--- a/data/test_data/detection/pre_registered01.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 9440c5f295a4bf4cad4c3f8b6d568856
-outs:
-- md5: 1bc65d48d14cf70d611ba56e7619f638
-  path: pre_registered01.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/detection/pre_registered02.npy.dvc b/data/test_data/detection/pre_registered02.npy.dvc
deleted file mode 100644
index 6cf0faed..00000000
--- a/data/test_data/detection/pre_registered02.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: a72a05da232bb5b83cc03e5366d3ec63
-outs:
-- md5: 9e938c10bfe7b4e5e686df5f1be4d023
-  path: pre_registered02.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/detection/pre_registered11.npy.dvc b/data/test_data/detection/pre_registered11.npy.dvc
deleted file mode 100644
index 41d968c3..00000000
--- a/data/test_data/detection/pre_registered11.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 76390e0b782976e5aa48b6db5ae39a49
-outs:
-- md5: 972a12cb1f7f9a879e03df7cab086fb5
-  path: pre_registered11.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/detection/pre_registered12.npy.dvc b/data/test_data/detection/pre_registered12.npy.dvc
deleted file mode 100644
index 538ccf29..00000000
--- a/data/test_data/detection/pre_registered12.npy.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 266854da281be5f3f81babae0fc573a8
-outs:
-- md5: 2c4f7401bbcf8855d1571d67cf75b704
-  path: pre_registered12.npy
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/input.h5.dvc b/data/test_data/input.h5.dvc
deleted file mode 100644
index 883c0724..00000000
--- a/data/test_data/input.h5.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 1a4e4d880bceca6f1b33c5b0f70f4160
-outs:
-- md5: bb3c51ad5a65a0be4ced317a509b0c55
-  path: input.h5
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/input.tif.dvc b/data/test_data/input.tif.dvc
deleted file mode 100644
index d6813aad..00000000
--- a/data/test_data/input.tif.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: e4bebea55507ed038517140fe9390bf0
-outs:
-- md5: ee1aeb487577308db3a5798face370d0
-  path: input.tif
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/input_1500.tif.dvc b/data/test_data/input_1500.tif.dvc
deleted file mode 100644
index 7a7488b4..00000000
--- a/data/test_data/input_1500.tif.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 25e913578ffc0366999ed343a497e5e7
-outs:
-- md5: 9f9f809a9ebe27bcd98e65c0c999329b
-  path: input_1500.tif
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/registration/bidi_shift_input.tif.dvc b/data/test_data/registration/bidi_shift_input.tif.dvc
deleted file mode 100644
index d98e8506..00000000
--- a/data/test_data/registration/bidi_shift_input.tif.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: c8725cd4c8c6dea5f540c764cfabb09a
-outs:
-- md5: 1a92a7768555f4c8b1b832de226d6cbf
-  path: bidi_shift_input.tif
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/registration/regression_bidi_output.tif.dvc b/data/test_data/registration/regression_bidi_output.tif.dvc
deleted file mode 100644
index e5a2dd0d..00000000
--- a/data/test_data/registration/regression_bidi_output.tif.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: 9b710594dcb279c458a9a71aabb9ba13
-outs:
-- md5: 4d5af1e59955f607a88ba07b9a7a549a
-  path: regression_bidi_output.tif
-  cache: true
-  metric: false
-  persist: false
diff --git a/data/test_data/registration/rigid_registration_test_data.tif.dvc b/data/test_data/registration/rigid_registration_test_data.tif.dvc
deleted file mode 100644
index 73f90653..00000000
--- a/data/test_data/registration/rigid_registration_test_data.tif.dvc
+++ /dev/null
@@ -1,7 +0,0 @@
-md5: ff32a38b0c31b1fa7a9a7b05db1c233c
-outs:
-- md5: 447efca40ad7aa1f343a30ca037b7167
-  path: rigid_registration_test_data.tif
-  cache: true
-  metric: false
-  persist: false
diff --git a/setup.py b/setup.py
index 2f1dbc2b..03fecc3e 100644
--- a/setup.py
+++ b/setup.py
@@ -54,7 +54,7 @@
         "mkl>=2019.3",
       ],
       "data": [
-        "dvc",
+        "dvc>=1.1",
         "pydrive2",
       ],
     },
diff --git a/tests/utils.py b/tests/utils.py
index 54d3e497..b11f8401 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -1,4 +1,4 @@
-"""Utility functions that can be accessed in tests via the utils fixture below."""
+"""Utility functions that can be accessed in tests via the utils fixture below. """
 
 from pathlib import Path
 from tifffile import imread