diff --git a/packages/test.sh b/packages/test.sh
index 30bcb3d0033..c256e568ede 100755
--- a/packages/test.sh
+++ b/packages/test.sh
@@ -32,8 +32,6 @@ PACKAGE_DIRS=(
     app
     webapps
 )
-# tool_util not yet working 100%,
-# data has many problems quota, tool shed install database, etc..
 RUN_TESTS=(1 1 1 1 1 1 1 1 1 1 1 0)
 RUN_MYPY=(1 1 1 1 1 1 1 1 1 1 1 1)
 for ((i=0; i<${#PACKAGE_DIRS[@]}; i++)); do
diff --git a/test/unit/dataset_collections/__init__.py b/test/unit/data/dataset_collections/__init__.py
similarity index 100%
rename from test/unit/dataset_collections/__init__.py
rename to test/unit/data/dataset_collections/__init__.py
diff --git a/test/unit/dataset_collections/test_matching.py b/test/unit/data/dataset_collections/test_matching.py
similarity index 100%
rename from test/unit/dataset_collections/test_matching.py
rename to test/unit/data/dataset_collections/test_matching.py
diff --git a/test/unit/model/__init__.py b/test/unit/data/model/__init__.py
similarity index 100%
rename from test/unit/model/__init__.py
rename to test/unit/data/model/__init__.py
diff --git a/test/unit/model/common.py b/test/unit/data/model/common.py
similarity index 100%
rename from test/unit/model/common.py
rename to test/unit/data/model/common.py
diff --git a/test/unit/model/conftest.py b/test/unit/data/model/conftest.py
similarity index 100%
rename from test/unit/model/conftest.py
rename to test/unit/data/model/conftest.py
diff --git a/test/unit/model/test_database_utils.py b/test/unit/data/model/test_database_utils.py
similarity index 100%
rename from test/unit/model/test_database_utils.py
rename to test/unit/data/model/test_database_utils.py
diff --git a/test/unit/model/test_mapping.py b/test/unit/data/model/test_mapping.py
similarity index 100%
rename from test/unit/model/test_mapping.py
rename to test/unit/data/model/test_mapping.py
diff --git a/test/unit/model/test_model.py b/test/unit/data/model/test_model.py
similarity index 100%
rename from test/unit/model/test_model.py
rename to test/unit/data/model/test_model.py
diff --git a/test/unit/model/test_model_discovery.py b/test/unit/data/model/test_model_discovery.py
similarity index 100%
rename from test/unit/model/test_model_discovery.py
rename to test/unit/data/model/test_model_discovery.py
diff --git a/test/unit/test_model_store.py b/test/unit/data/model/test_model_store.py
similarity index 100%
rename from test/unit/test_model_store.py
rename to test/unit/data/model/test_model_store.py
diff --git a/test/unit/model/test_test_mapping.py b/test/unit/data/model/test_test_mapping.py
similarity index 100%
rename from test/unit/model/test_test_mapping.py
rename to test/unit/data/model/test_test_mapping.py
diff --git a/test/unit/model/test_views.py b/test/unit/data/model/test_views.py
similarity index 100%
rename from test/unit/model/test_views.py
rename to test/unit/data/model/test_views.py