diff --git a/tests/test_datastack_modules/archive_extraction.py b/tests/test_datastack_modules/archive_extraction.py
index 36a95a5f2..e69594e09 100644
--- a/tests/test_datastack_modules/archive_extraction.py
+++ b/tests/test_datastack_modules/archive_extraction.py
@@ -1,4 +1,5 @@
 MODEL_SPEC = {
+    'model_id': 'mymodel',
     'args': {
         'blank': {'type': 'freestyle_string'},
         'a': {'type': 'integer'},
@@ -6,7 +7,7 @@ MODEL_SPEC = {
         'c': {'type': 'freestyle_string'},
         'foo': {'type': 'file'},
         'bar': {'type': 'file'},
-        'data_dir': {'type': 'directory'},
+        'data_dir': {'type': 'directory', 'contents': {}},
         'raster': {'type': 'raster'},
         'vector': {'type': 'vector'},
         'simple_table': {'type': 'csv'},
diff --git a/tests/test_datastack_modules/duplicate_filepaths.py b/tests/test_datastack_modules/duplicate_filepaths.py
index 67ae110e0..9338a8f90 100644
--- a/tests/test_datastack_modules/duplicate_filepaths.py
+++ b/tests/test_datastack_modules/duplicate_filepaths.py
@@ -1,4 +1,5 @@
 MODEL_SPEC = {
+    'model_id': 'mymodel',
     'args': {
         'foo': {'type': 'file'},
         'bar': {'type': 'file'},
diff --git a/tests/test_datastack_modules/nonspatial_files.py b/tests/test_datastack_modules/nonspatial_files.py
index 02bba2176..1ffebf1d5 100644
--- a/tests/test_datastack_modules/nonspatial_files.py
+++ b/tests/test_datastack_modules/nonspatial_files.py
@@ -1,6 +1,7 @@
 MODEL_SPEC = {
+    'model_id': 'mymodel',
     'args': {
         'some_file': {'type': 'file'},
-        'data_dir': {'type': 'directory'},
+        'data_dir': {'type': 'directory', 'contents': {}},
     }
 }
diff --git a/tests/test_datastack_modules/raster.py b/tests/test_datastack_modules/raster.py
index 6e1d80447..ea4e76cc2 100644
--- a/tests/test_datastack_modules/raster.py
+++ b/tests/test_datastack_modules/raster.py
@@ -1,4 +1,5 @@
 MODEL_SPEC = {
+    'model_id': 'raster_model',
     'args': {
         'raster': {'type': 'raster'},
     }
diff --git a/tests/test_datastack_modules/simple_parameters.py b/tests/test_datastack_modules/simple_parameters.py
index bf7c84489..96182fa36 100644
--- a/tests/test_datastack_modules/simple_parameters.py
+++ b/tests/test_datastack_modules/simple_parameters.py
@@ -1,9 +1,10 @@
 MODEL_SPEC = {
+    'model_id': 'mymodel',
     'args': {
         'a': {'type': 'integer'},
         'b': {'type': 'freestyle_string'},
         'c': {'type': 'freestyle_string'},
         'd': {'type': 'freestyle_string'},
-        'workspace_dir': {'type': 'directory'},
+        'workspace_dir': {'type': 'directory', 'contents': {}},
     }
 }
diff --git a/tests/test_datastack_modules/ui_parameter_archive.py b/tests/test_datastack_modules/ui_parameter_archive.py
index 7a0d86903..5d9f1cfcf 100644
--- a/tests/test_datastack_modules/ui_parameter_archive.py
+++ b/tests/test_datastack_modules/ui_parameter_archive.py
@@ -1,4 +1,5 @@
 MODEL_SPEC = {
+    'model_id': 'mymodel',
     'args': {
         'foo': {'type': 'freestyle_string'},
         'bar': {'type': 'freestyle_string'},
diff --git a/tests/test_datastack_modules/vector.py b/tests/test_datastack_modules/vector.py
index 4c0defb15..023ab2ed5 100644
--- a/tests/test_datastack_modules/vector.py
+++ b/tests/test_datastack_modules/vector.py
@@ -1,4 +1,5 @@
 MODEL_SPEC = {
+    'model_id': 'vec_model',
     'args': {
         'vector': {'type': 'vector'},
     }