Move tests into an "ops" subdir (#935)

* Create __init__.py * move all of the test files down one dir into `ops` * update test paths * update paths where needed * update the changelog
ethyca · Jul 27, 2022 · 031e2b8 · 031e2b8
1 parent 12d5eb7
commit 031e2b8
Show file tree

Hide file tree

Showing 179 changed files with 53 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ The types of changes are:
 ## [Unreleased](https://github.com/ethyca/fidesops/compare/1.6.3...main)
 
 ### Added
+
 * Erasure support for Salesforce [#888](https://github.com/ethyca/fidesops/pull/888)
 * Access and erasure support for Sendgrid contacts endpoint [#883](https://github.com/ethyca/fidesops/pull/883)
 * Added saas config base info to connection config responses [#904](https://github.com/ethyca/fidesops/pull/904)
@@ -33,6 +34,7 @@ The types of changes are:
 * Updated the python docker base image from slim-buster to slim-bullseye [928](https://github.com/ethyca/fidesops/pull/928)
 * Removed ipython from the docker install [928](https://github.com/ethyca/fidesops/pull/928)
 * Serve admin UI by default [#906](https://github.com/ethyca/fidesops/pull/936)
+* Move tests into an `ops` subdir [#935](https://github.com/ethyca/fidesops/pull/935)
 * Updated the docs docker base image to be consistent with the fidesops image [949](https://github.com/ethyca/fidesops/pull/949)
 
 ### Breaking Changes

diff --git a/docs/fidesops/docs/development/testing.md b/docs/fidesops/docs/development/testing.md
@@ -58,7 +58,7 @@ cd fidesops
 pytest
 ```
 
-2. From regular command-line: 
+2. From regular command-line:
 
 ```bash
 make pytest
@@ -69,11 +69,11 @@ make pytest
 To run a subset of tests, provide a filename or directory; to match a specific test name, use the `-k` flag:
 
 ```bash
-# run all tests in the tests/integration directory that contain the word "api" in their title
-pytest tests/integration/ -k api
+# run all tests in the tests/ops/integration directory that contain the word "api" in their title
+pytest tests/ops/integration/ -k api
 ```
 
-Other commands you may need are listed below. The full documentation can be found at: https://docs.pytest.org/en/6.2.x/.
+Other commands you may need are listed below. The full documentation can be found at: <https://docs.pytest.org/en/6.2.x/>.
 
 - Run all tests in a directory: `make pytestpath=path/to/dir/ pytest`
 - Run all tests in a file: `make pytestpath=path/to/file.py pytest`

diff --git a/scripts/run_infrastructure.py b/scripts/run_infrastructure.py
@@ -114,7 +114,9 @@ def seed_initial_data(
     _run_cmd_or_err('echo "Seeding initial data for all datastores..."')
     for datastore in datastores:
         if datastore in DOCKERFILE_DATASTORES:
-            setup_path = f"tests/integration_tests/setup_scripts/{datastore}_setup.py"
+            setup_path = (
+                f"tests/ops/integration_tests/setup_scripts/{datastore}_setup.py"
+            )
             _run_cmd_or_err(
                 f'echo "Attempting to create schema and seed initial data for {datastore} from {setup_path}..."'
             )

diff --git a/tests/.gitignore → tests/ops/.gitignore b/tests/.gitignore → tests/ops/.gitignore
diff --git a/tests/ops/__init__.py b/tests/ops/__init__.py
@@ -0,0 +1 @@
+
diff --git a/tests/api/__init__.py → tests/ops/api/__init__.py b/tests/api/__init__.py → tests/ops/api/__init__.py
diff --git a/tests/api/test_deps.py → tests/ops/api/test_deps.py b/tests/api/test_deps.py → tests/ops/api/test_deps.py
diff --git a/tests/api/v1/__init__.py → tests/ops/api/v1/__init__.py b/tests/api/v1/__init__.py → tests/ops/api/v1/__init__.py
diff --git a/tests/api/v1/endpoints/__init__.py → tests/ops/api/v1/endpoints/__init__.py b/tests/api/v1/endpoints/__init__.py → tests/ops/api/v1/endpoints/__init__.py
diff --git a/...api/v1/endpoints/test_config_endpoints.py → ...api/v1/endpoints/test_config_endpoints.py b/...api/v1/endpoints/test_config_endpoints.py → ...api/v1/endpoints/test_config_endpoints.py
diff --git a/...oints/test_connection_config_endpoints.py → ...oints/test_connection_config_endpoints.py b/...oints/test_connection_config_endpoints.py → ...oints/test_connection_config_endpoints.py
diff --git a/...nts/test_connection_template_endpoints.py → ...nts/test_connection_template_endpoints.py b/...nts/test_connection_template_endpoints.py → ...nts/test_connection_template_endpoints.py
diff --git a/...pi/v1/endpoints/test_dataset_endpoints.py → ...pi/v1/endpoints/test_dataset_endpoints.py b/...pi/v1/endpoints/test_dataset_endpoints.py → ...pi/v1/endpoints/test_dataset_endpoints.py
diff --git a/tests/api/v1/endpoints/test_drp_endpoints.py → ...ps/api/v1/endpoints/test_drp_endpoints.py b/tests/api/v1/endpoints/test_drp_endpoints.py → ...ps/api/v1/endpoints/test_drp_endpoints.py
diff --git a/...v1/endpoints/test_encryption_endpoints.py → ...v1/endpoints/test_encryption_endpoints.py b/...v1/endpoints/test_encryption_endpoints.py → ...v1/endpoints/test_encryption_endpoints.py
diff --git a/...api/v1/endpoints/test_health_endpoints.py → ...api/v1/endpoints/test_health_endpoints.py b/...api/v1/endpoints/test_health_endpoints.py → ...api/v1/endpoints/test_health_endpoints.py
diff --git a/...pi/v1/endpoints/test_masking_endpoints.py → ...pi/v1/endpoints/test_masking_endpoints.py b/...pi/v1/endpoints/test_masking_endpoints.py → ...pi/v1/endpoints/test_masking_endpoints.py
diff --git a/.../api/v1/endpoints/test_oauth_endpoints.py → .../api/v1/endpoints/test_oauth_endpoints.py b/.../api/v1/endpoints/test_oauth_endpoints.py → .../api/v1/endpoints/test_oauth_endpoints.py
diff --git a/...api/v1/endpoints/test_policy_endpoints.py → ...api/v1/endpoints/test_policy_endpoints.py b/...api/v1/endpoints/test_policy_endpoints.py → ...api/v1/endpoints/test_policy_endpoints.py
diff --git a/...ndpoints/test_policy_webhook_endpoints.py → ...ndpoints/test_policy_webhook_endpoints.py b/...ndpoints/test_policy_webhook_endpoints.py → ...ndpoints/test_policy_webhook_endpoints.py
@@ -18,7 +18,7 @@
 )
 from fidesops.models.connectionconfig import ConnectionConfig
 from fidesops.models.policy import PolicyPostWebhook, PolicyPreWebhook
-from tests.api.v1.endpoints.test_privacy_request_endpoints import stringify_date
+from tests.ops.api.v1.endpoints.test_privacy_request_endpoints import stringify_date
 
 
 def embedded_http_connection_config(connection_config: ConnectionConfig) -> Dict:

diff --git a/...dpoints/test_privacy_request_endpoints.py → ...dpoints/test_privacy_request_endpoints.py b/...dpoints/test_privacy_request_endpoints.py → ...dpoints/test_privacy_request_endpoints.py
diff --git a/...1/endpoints/test_saas_config_endpoints.py → ...1/endpoints/test_saas_config_endpoints.py b/...1/endpoints/test_saas_config_endpoints.py → ...1/endpoints/test_saas_config_endpoints.py
@@ -25,7 +25,7 @@
     ConnectionConfig,
     ConnectionType,
 )
-from tests.api.v1.endpoints.test_dataset_endpoints import _reject_key
+from tests.ops.api.v1.endpoints.test_dataset_endpoints import _reject_key
 
 
 @pytest.mark.unit_saas

diff --git a/...pi/v1/endpoints/test_storage_endpoints.py → ...pi/v1/endpoints/test_storage_endpoints.py b/...pi/v1/endpoints/test_storage_endpoints.py → ...pi/v1/endpoints/test_storage_endpoints.py
diff --git a/...s/api/v1/endpoints/test_user_endpoints.py → ...s/api/v1/endpoints/test_user_endpoints.py b/...s/api/v1/endpoints/test_user_endpoints.py → ...s/api/v1/endpoints/test_user_endpoints.py
@@ -44,7 +44,7 @@
     V1_URL_PREFIX,
 )
 from fidesops.core.config import config
-from tests.conftest import generate_auth_header_for_user
+from tests.ops.conftest import generate_auth_header_for_user
 
 page_size = Params().size
 

diff --git a/...dpoints/test_user_permission_endpoints.py → ...dpoints/test_user_permission_endpoints.py b/...dpoints/test_user_permission_endpoints.py → ...dpoints/test_user_permission_endpoints.py
diff --git a/tests/api/v1/test_exception_handlers.py → tests/ops/api/v1/test_exception_handlers.py b/tests/api/v1/test_exception_handlers.py → tests/ops/api/v1/test_exception_handlers.py
diff --git a/tests/api/v1/test_main.py → tests/ops/api/v1/test_main.py b/tests/api/v1/test_main.py → tests/ops/api/v1/test_main.py
diff --git a/tests/conftest.py → tests/ops/conftest.py b/tests/conftest.py → tests/ops/conftest.py
diff --git a/tests/core/__init__.py → tests/ops/core/__init__.py b/tests/core/__init__.py → tests/ops/core/__init__.py
diff --git a/tests/core/test_config.py → tests/ops/core/test_config.py b/tests/core/test_config.py → tests/ops/core/test_config.py
diff --git a/tests/fixtures/__init__.py → tests/ops/fixtures/__init__.py b/tests/fixtures/__init__.py → tests/ops/fixtures/__init__.py
diff --git a/tests/fixtures/application_fixtures.py → tests/ops/fixtures/application_fixtures.py b/tests/fixtures/application_fixtures.py → tests/ops/fixtures/application_fixtures.py
diff --git a/tests/fixtures/bigquery_fixtures.py → tests/ops/fixtures/bigquery_fixtures.py b/tests/fixtures/bigquery_fixtures.py → tests/ops/fixtures/bigquery_fixtures.py
diff --git a/tests/fixtures/integration_fixtures.py → tests/ops/fixtures/integration_fixtures.py b/tests/fixtures/integration_fixtures.py → tests/ops/fixtures/integration_fixtures.py
diff --git a/tests/fixtures/manual_fixtures.py → tests/ops/fixtures/manual_fixtures.py b/tests/fixtures/manual_fixtures.py → tests/ops/fixtures/manual_fixtures.py
diff --git a/tests/fixtures/mariadb_fixtures.py → tests/ops/fixtures/mariadb_fixtures.py b/tests/fixtures/mariadb_fixtures.py → tests/ops/fixtures/mariadb_fixtures.py
diff --git a/tests/fixtures/mongodb_fixtures.py → tests/ops/fixtures/mongodb_fixtures.py b/tests/fixtures/mongodb_fixtures.py → tests/ops/fixtures/mongodb_fixtures.py
diff --git a/tests/fixtures/mssql_fixtures.py → tests/ops/fixtures/mssql_fixtures.py b/tests/fixtures/mssql_fixtures.py → tests/ops/fixtures/mssql_fixtures.py
diff --git a/tests/fixtures/mysql_fixtures.py → tests/ops/fixtures/mysql_fixtures.py b/tests/fixtures/mysql_fixtures.py → tests/ops/fixtures/mysql_fixtures.py
diff --git a/tests/fixtures/postgres_fixtures.py → tests/ops/fixtures/postgres_fixtures.py b/tests/fixtures/postgres_fixtures.py → tests/ops/fixtures/postgres_fixtures.py
diff --git a/tests/fixtures/redshift_fixtures.py → tests/ops/fixtures/redshift_fixtures.py b/tests/fixtures/redshift_fixtures.py → tests/ops/fixtures/redshift_fixtures.py
diff --git a/tests/fixtures/saas/__init__.py → tests/ops/fixtures/saas/__init__.py b/tests/fixtures/saas/__init__.py → tests/ops/fixtures/saas/__init__.py
diff --git a/.../fixtures/saas/adobe_campaign_fixtures.py → .../fixtures/saas/adobe_campaign_fixtures.py b/.../fixtures/saas/adobe_campaign_fixtures.py → .../fixtures/saas/adobe_campaign_fixtures.py
@@ -14,8 +14,8 @@
 )
 from fidesops.models.datasetconfig import DatasetConfig
 from fidesops.util.saas_util import load_config
-from tests.fixtures.application_fixtures import load_dataset
-from tests.test_helpers.vault_client import get_secrets
+from tests.ops.fixtures.application_fixtures import load_dataset
+from tests.ops.test_helpers.vault_client import get_secrets
 
 saas_config = load_toml(["saas_config.toml"])
 secrets = get_secrets("adobe_campaign")

diff --git a/tests/fixtures/saas/hubspot_fixtures.py → tests/ops/fixtures/saas/hubspot_fixtures.py b/tests/fixtures/saas/hubspot_fixtures.py → tests/ops/fixtures/saas/hubspot_fixtures.py
@@ -16,9 +16,9 @@
 from fidesops.schemas.saas.shared_schemas import HTTPMethod, SaaSRequestParams
 from fidesops.service.connectors import SaaSConnector
 from fidesops.util.saas_util import format_body, load_config
-from tests.fixtures.application_fixtures import load_dataset
-from tests.test_helpers.saas_test_utils import poll_for_existence
-from tests.test_helpers.vault_client import get_secrets
+from tests.ops.fixtures.application_fixtures import load_dataset
+from tests.ops.test_helpers.saas_test_utils import poll_for_existence
+from tests.ops.test_helpers.vault_client import get_secrets
 
 saas_config = load_toml(["saas_config.toml"])
 secrets = get_secrets("hubspot")

diff --git a/tests/fixtures/saas/mailchimp_fixtures.py → ...s/ops/fixtures/saas/mailchimp_fixtures.py b/tests/fixtures/saas/mailchimp_fixtures.py → ...s/ops/fixtures/saas/mailchimp_fixtures.py
@@ -16,8 +16,8 @@
 from fidesops.schemas.saas.shared_schemas import HTTPMethod, SaaSRequestParams
 from fidesops.service.connectors.saas_connector import SaaSConnector
 from fidesops.util.saas_util import load_config
-from tests.fixtures.application_fixtures import load_dataset
-from tests.test_helpers.vault_client import get_secrets
+from tests.ops.fixtures.application_fixtures import load_dataset
+from tests.ops.test_helpers.vault_client import get_secrets
 
 saas_config = load_toml(["saas_config.toml"])
 secrets = get_secrets("mailchimp")

diff --git a/tests/fixtures/saas/outreach_fixtures.py → tests/ops/fixtures/saas/outreach_fixtures.py b/tests/fixtures/saas/outreach_fixtures.py → tests/ops/fixtures/saas/outreach_fixtures.py
@@ -15,8 +15,8 @@
 )
 from fidesops.models.datasetconfig import DatasetConfig
 from fidesops.util.saas_util import load_config
-from tests.fixtures.application_fixtures import load_dataset
-from tests.test_helpers.vault_client import get_secrets
+from tests.ops.fixtures.application_fixtures import load_dataset
+from tests.ops.test_helpers.vault_client import get_secrets
 
 saas_config = load_toml(["saas_config.toml"])
 secrets = get_secrets("outreach")

diff --git a/tests/fixtures/saas/salesforce_fixtures.py → .../ops/fixtures/saas/salesforce_fixtures.py b/tests/fixtures/saas/salesforce_fixtures.py → .../ops/fixtures/saas/salesforce_fixtures.py
@@ -16,8 +16,8 @@
 )
 from fidesops.models.datasetconfig import DatasetConfig
 from fidesops.util.saas_util import load_config
-from tests.fixtures.application_fixtures import load_dataset
-from tests.test_helpers.vault_client import get_secrets
+from tests.ops.fixtures.application_fixtures import load_dataset
+from tests.ops.test_helpers.vault_client import get_secrets
 
 saas_config = load_toml(["saas_config.toml"])
 secrets = get_secrets("salesforce")

diff --git a/tests/fixtures/saas/segment_fixtures.py → tests/ops/fixtures/saas/segment_fixtures.py b/tests/fixtures/saas/segment_fixtures.py → tests/ops/fixtures/saas/segment_fixtures.py
@@ -17,9 +17,9 @@
 )
 from fidesops.models.datasetconfig import DatasetConfig
 from fidesops.util.saas_util import load_config
-from tests.fixtures.application_fixtures import load_dataset
-from tests.test_helpers.saas_test_utils import poll_for_existence
-from tests.test_helpers.vault_client import get_secrets
+from tests.ops.fixtures.application_fixtures import load_dataset
+from tests.ops.test_helpers.saas_test_utils import poll_for_existence
+from tests.ops.test_helpers.vault_client import get_secrets
 
 saas_config = load_toml(["saas_config.toml"])
 secrets = get_secrets("segment")

diff --git a/tests/fixtures/saas/sendgrid_fixtures.py → tests/ops/fixtures/saas/sendgrid_fixtures.py b/tests/fixtures/saas/sendgrid_fixtures.py → tests/ops/fixtures/saas/sendgrid_fixtures.py
@@ -15,10 +15,10 @@
     ConnectionType,
 )
 from fidesops.models.datasetconfig import DatasetConfig
-from tests.fixtures.application_fixtures import load_dataset
-from tests.fixtures.saas_example_fixtures import load_config
-from tests.test_helpers.saas_test_utils import poll_for_existence
-from tests.test_helpers.vault_client import get_secrets
+from tests.ops.fixtures.application_fixtures import load_dataset
+from tests.ops.fixtures.saas_example_fixtures import load_config
+from tests.ops.test_helpers.saas_test_utils import poll_for_existence
+from tests.ops.test_helpers.vault_client import get_secrets
 
 saas_config = load_toml(["saas_config.toml"])
 secrets = get_secrets("sendgrid")

diff --git a/tests/fixtures/saas/sentry_fixtures.py → tests/ops/fixtures/saas/sentry_fixtures.py b/tests/fixtures/saas/sentry_fixtures.py → tests/ops/fixtures/saas/sentry_fixtures.py
@@ -13,8 +13,8 @@
 )
 from fidesops.models.datasetconfig import DatasetConfig
 from fidesops.util.saas_util import load_config
-from tests.fixtures.application_fixtures import load_dataset
-from tests.test_helpers.vault_client import get_secrets
+from tests.ops.fixtures.application_fixtures import load_dataset
+from tests.ops.test_helpers.vault_client import get_secrets
 
 saas_config = load_toml(["saas_config.toml"])
 secrets = get_secrets("sentry")

diff --git a/tests/fixtures/saas/stripe_fixtures.py → tests/ops/fixtures/saas/stripe_fixtures.py b/tests/fixtures/saas/stripe_fixtures.py → tests/ops/fixtures/saas/stripe_fixtures.py
@@ -15,8 +15,8 @@
 )
 from fidesops.models.datasetconfig import DatasetConfig
 from fidesops.util.saas_util import load_config
-from tests.fixtures.application_fixtures import load_dataset
-from tests.test_helpers.vault_client import get_secrets
+from tests.ops.fixtures.application_fixtures import load_dataset
+from tests.ops.test_helpers.vault_client import get_secrets
 
 saas_config = load_toml(["saas_config.toml"])
 secrets = get_secrets("stripe")

diff --git a/tests/fixtures/saas/zendesk_fixtures.py → tests/ops/fixtures/saas/zendesk_fixtures.py b/tests/fixtures/saas/zendesk_fixtures.py → tests/ops/fixtures/saas/zendesk_fixtures.py
@@ -14,8 +14,8 @@
 )
 from fidesops.models.datasetconfig import DatasetConfig
 from fidesops.util.saas_util import load_config
-from tests.fixtures.application_fixtures import load_dataset
-from tests.test_helpers.vault_client import get_secrets
+from tests.ops.fixtures.application_fixtures import load_dataset
+from tests.ops.test_helpers.vault_client import get_secrets
 
 saas_config = load_toml(["saas_config.toml"])
 secrets = get_secrets("zendesk")

diff --git a/tests/fixtures/saas_example_fixtures.py → tests/ops/fixtures/saas_example_fixtures.py b/tests/fixtures/saas_example_fixtures.py → tests/ops/fixtures/saas_example_fixtures.py
@@ -15,7 +15,7 @@
     OAuth2AuthenticationConfiguration,
 )
 from fidesops.util.saas_util import load_config
-from tests.fixtures.application_fixtures import load_dataset
+from tests.ops.fixtures.application_fixtures import load_dataset
 
 saas_config = load_toml(["saas_config.toml"])
 

diff --git a/tests/fixtures/snowflake_fixtures.py → tests/ops/fixtures/snowflake_fixtures.py b/tests/fixtures/snowflake_fixtures.py → tests/ops/fixtures/snowflake_fixtures.py
diff --git a/tests/generator/__init__.py → tests/ops/generator/__init__.py b/tests/generator/__init__.py → tests/ops/generator/__init__.py
diff --git a/tests/generator/sql_data_generator.py → tests/ops/generator/sql_data_generator.py b/tests/generator/sql_data_generator.py → tests/ops/generator/sql_data_generator.py
diff --git a/tests/generator/test_data_generator.py → tests/ops/generator/test_data_generator.py b/tests/generator/test_data_generator.py → tests/ops/generator/test_data_generator.py
diff --git a/tests/graph/__init__.py → tests/ops/graph/__init__.py b/tests/graph/__init__.py → tests/ops/graph/__init__.py
diff --git a/tests/graph/graph_test_util.py → tests/ops/graph/graph_test_util.py b/tests/graph/graph_test_util.py → tests/ops/graph/graph_test_util.py
diff --git a/tests/graph/test_config.py → tests/ops/graph/test_config.py b/tests/graph/test_config.py → tests/ops/graph/test_config.py
diff --git a/tests/graph/test_data_types.py → tests/ops/graph/test_data_types.py b/tests/graph/test_data_types.py → tests/ops/graph/test_data_types.py
diff --git a/tests/graph/test_edge.py → tests/ops/graph/test_edge.py b/tests/graph/test_edge.py → tests/ops/graph/test_edge.py
diff --git a/tests/graph/test_graph.py → tests/ops/graph/test_graph.py b/tests/graph/test_graph.py → tests/ops/graph/test_graph.py
@@ -6,7 +6,7 @@
 from fidesops.models.policy import ActionType
 from fidesops.task.graph_task import retry
 from fidesops.task.task_resources import TaskResources
-from tests.task.traversal_data import integration_db_graph
+from tests.ops.task.traversal_data import integration_db_graph
 
 t1 = Collection(
     name="t1",

diff --git a/tests/graph/test_graph_traversal.py → tests/ops/graph/test_graph_traversal.py b/tests/graph/test_graph_traversal.py → tests/ops/graph/test_graph_traversal.py
diff --git a/tests/graph/test_traversal_node.py → tests/ops/graph/test_traversal_node.py b/tests/graph/test_traversal_node.py → tests/ops/graph/test_traversal_node.py
diff --git a/tests/integration_tests/__init__.py → tests/ops/integration_tests/__init__.py b/tests/integration_tests/__init__.py → tests/ops/integration_tests/__init__.py
diff --git a/tests/integration_tests/saas/__init__.py → tests/ops/integration_tests/saas/__init__.py b/tests/integration_tests/saas/__init__.py → tests/ops/integration_tests/saas/__init__.py
diff --git a/...on_tests/saas/test_adobe_campaign_task.py → ...on_tests/saas/test_adobe_campaign_task.py b/...on_tests/saas/test_adobe_campaign_task.py → ...on_tests/saas/test_adobe_campaign_task.py
@@ -9,7 +9,7 @@
 from fidesops.service.connectors import get_connector
 from fidesops.task import graph_task
 from fidesops.task.graph_task import get_cached_data_for_erasures
-from tests.graph.graph_test_util import assert_rows_match
+from tests.ops.graph.graph_test_util import assert_rows_match
 
 
 @pytest.mark.skip(reason="Only staging credentials available")

diff --git a/...tegration_tests/saas/test_hubspot_task.py → ...tegration_tests/saas/test_hubspot_task.py b/...tegration_tests/saas/test_hubspot_task.py → ...tegration_tests/saas/test_hubspot_task.py
@@ -12,7 +12,7 @@
 from fidesops.task.filter_results import filter_data_categories
 from fidesops.task.graph_task import get_cached_data_for_erasures
 from fidesops.util.saas_util import format_body
-from tests.graph.graph_test_util import assert_rows_match, records_matching_fields
+from tests.ops.graph.graph_test_util import assert_rows_match, records_matching_fields
 
 
 @pytest.mark.integration_saas

diff --git a/...gration_tests/saas/test_mailchimp_task.py → ...gration_tests/saas/test_mailchimp_task.py b/...gration_tests/saas/test_mailchimp_task.py → ...gration_tests/saas/test_mailchimp_task.py
@@ -7,7 +7,7 @@
 from fidesops.schemas.redis_cache import PrivacyRequestIdentity
 from fidesops.task import graph_task
 from fidesops.task.graph_task import get_cached_data_for_erasures
-from tests.graph.graph_test_util import assert_rows_match, records_matching_fields
+from tests.ops.graph.graph_test_util import assert_rows_match, records_matching_fields
 
 
 @pytest.mark.integration_saas

diff --git a/...egration_tests/saas/test_outreach_task.py → ...egration_tests/saas/test_outreach_task.py b/...egration_tests/saas/test_outreach_task.py → ...egration_tests/saas/test_outreach_task.py
@@ -9,7 +9,7 @@
 from fidesops.task import graph_task
 from fidesops.task.filter_results import filter_data_categories
 from fidesops.task.graph_task import get_cached_data_for_erasures
-from tests.graph.graph_test_util import assert_rows_match
+from tests.ops.graph.graph_test_util import assert_rows_match
 
 
 @pytest.mark.skip(reason="Currently unable to test OAuth2 connectors")

diff --git a/...ration_tests/saas/test_salesforce_task.py → ...ration_tests/saas/test_salesforce_task.py b/...ration_tests/saas/test_salesforce_task.py → ...ration_tests/saas/test_salesforce_task.py
@@ -10,7 +10,7 @@
 from fidesops.service.connectors import get_connector
 from fidesops.task import graph_task
 from fidesops.task.graph_task import get_cached_data_for_erasures
-from tests.graph.graph_test_util import assert_rows_match
+from tests.ops.graph.graph_test_util import assert_rows_match
 
 
 @pytest.mark.integration_saas

diff --git a/...tegration_tests/saas/test_segment_task.py → ...tegration_tests/saas/test_segment_task.py b/...tegration_tests/saas/test_segment_task.py → ...tegration_tests/saas/test_segment_task.py
@@ -9,7 +9,7 @@
 from fidesops.task import graph_task
 from fidesops.task.filter_results import filter_data_categories
 from fidesops.task.graph_task import get_cached_data_for_erasures
-from tests.graph.graph_test_util import assert_rows_match
+from tests.ops.graph.graph_test_util import assert_rows_match
 
 
 @pytest.mark.skip(reason="Pending account resolution")

diff --git a/...egration_tests/saas/test_sendgrid_task.py → ...egration_tests/saas/test_sendgrid_task.py b/...egration_tests/saas/test_sendgrid_task.py → ...egration_tests/saas/test_sendgrid_task.py
@@ -8,9 +8,9 @@
 from fidesops.schemas.redis_cache import PrivacyRequestIdentity
 from fidesops.task import graph_task
 from fidesops.task.graph_task import get_cached_data_for_erasures
-from tests.fixtures.saas.sendgrid_fixtures import contact_exists
-from tests.graph.graph_test_util import assert_rows_match
-from tests.test_helpers.saas_test_utils import poll_for_existence
+from tests.ops.fixtures.saas.sendgrid_fixtures import contact_exists
+from tests.ops.graph.graph_test_util import assert_rows_match
+from tests.ops.test_helpers.saas_test_utils import poll_for_existence
 
 
 @pytest.mark.integration_saas

diff --git a/...ntegration_tests/saas/test_sentry_task.py → ...ntegration_tests/saas/test_sentry_task.py b/...ntegration_tests/saas/test_sentry_task.py → ...ntegration_tests/saas/test_sentry_task.py
@@ -11,8 +11,8 @@
 from fidesops.task import graph_task
 from fidesops.task.filter_results import filter_data_categories
 from fidesops.task.graph_task import get_cached_data_for_erasures
-from tests.graph.graph_test_util import assert_rows_match
-from tests.test_helpers.saas_test_utils import poll_for_existence
+from tests.ops.graph.graph_test_util import assert_rows_match
+from tests.ops.test_helpers.saas_test_utils import poll_for_existence
 
 
 @pytest.mark.skip(reason="Pending account resolution")

diff --git a/...ntegration_tests/saas/test_stripe_task.py → ...ntegration_tests/saas/test_stripe_task.py b/...ntegration_tests/saas/test_stripe_task.py → ...ntegration_tests/saas/test_stripe_task.py
@@ -11,7 +11,7 @@
 from fidesops.task import graph_task
 from fidesops.task.filter_results import filter_data_categories
 from fidesops.task.graph_task import get_cached_data_for_erasures
-from tests.graph.graph_test_util import assert_rows_match
+from tests.ops.graph.graph_test_util import assert_rows_match
 
 
 @pytest.mark.integration_saas

diff --git a/...tegration_tests/saas/test_zendesk_task.py → ...tegration_tests/saas/test_zendesk_task.py b/...tegration_tests/saas/test_zendesk_task.py → ...tegration_tests/saas/test_zendesk_task.py
@@ -10,7 +10,7 @@
 from fidesops.schemas.redis_cache import PrivacyRequestIdentity
 from fidesops.task import graph_task
 from fidesops.task.graph_task import get_cached_data_for_erasures
-from tests.graph.graph_test_util import assert_rows_match
+from tests.ops.graph.graph_test_util import assert_rows_match
 
 
 @pytest.mark.integration_saas

diff --git a/...tegration_tests/setup_scripts/__init__.py → ...tegration_tests/setup_scripts/__init__.py b/...tegration_tests/setup_scripts/__init__.py → ...tegration_tests/setup_scripts/__init__.py
diff --git a/...tion_tests/setup_scripts/mariadb_setup.py → ...tion_tests/setup_scripts/mariadb_setup.py b/...tion_tests/setup_scripts/mariadb_setup.py → ...tion_tests/setup_scripts/mariadb_setup.py
diff --git a/...ration_tests/setup_scripts/mssql_setup.py → ...ration_tests/setup_scripts/mssql_setup.py b/...ration_tests/setup_scripts/mssql_setup.py → ...ration_tests/setup_scripts/mssql_setup.py
diff --git a/...ion_tests/setup_scripts/postgres_setup.py → ...ion_tests/setup_scripts/postgres_setup.py b/...ion_tests/setup_scripts/postgres_setup.py → ...ion_tests/setup_scripts/postgres_setup.py
diff --git a/...t_connection_configuration_integration.py → ...t_connection_configuration_integration.py b/...t_connection_configuration_integration.py → ...t_connection_configuration_integration.py
diff --git a/tests/integration_tests/test_execution.py → ...s/ops/integration_tests/test_execution.py b/tests/integration_tests/test_execution.py → ...s/ops/integration_tests/test_execution.py
diff --git a/...sts/test_external_database_connections.py → ...sts/test_external_database_connections.py b/...sts/test_external_database_connections.py → ...sts/test_external_database_connections.py
diff --git a/...tests/test_integration_mariadb_example.py → ...tests/test_integration_mariadb_example.py b/...tests/test_integration_mariadb_example.py → ...tests/test_integration_mariadb_example.py
diff --git a/...tests/test_integration_mongodb_example.py → ...tests/test_integration_mongodb_example.py b/...tests/test_integration_mongodb_example.py → ...tests/test_integration_mongodb_example.py
diff --git a/...n_tests/test_integration_mssql_example.py → ...n_tests/test_integration_mssql_example.py b/...n_tests/test_integration_mssql_example.py → ...n_tests/test_integration_mssql_example.py
diff --git a/...n_tests/test_integration_mysql_example.py → ...n_tests/test_integration_mysql_example.py b/...n_tests/test_integration_mysql_example.py → ...n_tests/test_integration_mysql_example.py
diff --git a/...ests/test_integration_postgres_example.py → ...ests/test_integration_postgres_example.py b/...ests/test_integration_postgres_example.py → ...ests/test_integration_postgres_example.py
diff --git a/tests/integration_tests/test_manual_task.py → ...ops/integration_tests/test_manual_task.py b/tests/integration_tests/test_manual_task.py → ...ops/integration_tests/test_manual_task.py
diff --git a/tests/integration_tests/test_mongo_task.py → .../ops/integration_tests/test_mongo_task.py b/tests/integration_tests/test_mongo_task.py → .../ops/integration_tests/test_mongo_task.py
diff --git a/tests/integration_tests/test_sql_task.py → tests/ops/integration_tests/test_sql_task.py b/tests/integration_tests/test_sql_task.py → tests/ops/integration_tests/test_sql_task.py
diff --git a/tests/models/__init__.py → tests/ops/models/__init__.py b/tests/models/__init__.py → tests/ops/models/__init__.py
diff --git a/tests/models/test_base.py → tests/ops/models/test_base.py b/tests/models/test_base.py → tests/ops/models/test_base.py
diff --git a/tests/models/test_client.py → tests/ops/models/test_client.py b/tests/models/test_client.py → tests/ops/models/test_client.py
diff --git a/tests/models/test_connectionconfig.py → tests/ops/models/test_connectionconfig.py b/tests/models/test_connectionconfig.py → tests/ops/models/test_connectionconfig.py
diff --git a/tests/models/test_datasetconfig.py → tests/ops/models/test_datasetconfig.py b/tests/models/test_datasetconfig.py → tests/ops/models/test_datasetconfig.py
diff --git a/tests/models/test_fidesopsuser.py → tests/ops/models/test_fidesopsuser.py b/tests/models/test_fidesopsuser.py → tests/ops/models/test_fidesopsuser.py
diff --git a/tests/models/test_fidesopsuserpermissions.py → ...ps/models/test_fidesopsuserpermissions.py b/tests/models/test_fidesopsuserpermissions.py → ...ps/models/test_fidesopsuserpermissions.py
diff --git a/tests/models/test_policy.py → tests/ops/models/test_policy.py b/tests/models/test_policy.py → tests/ops/models/test_policy.py
diff --git a/tests/models/test_policy_webhooks.py → tests/ops/models/test_policy_webhooks.py b/tests/models/test_policy_webhooks.py → tests/ops/models/test_policy_webhooks.py
diff --git a/tests/models/test_privacy_request.py → tests/ops/models/test_privacy_request.py b/tests/models/test_privacy_request.py → tests/ops/models/test_privacy_request.py
diff --git a/tests/models/test_saasconfig.py → tests/ops/models/test_saasconfig.py b/tests/models/test_saasconfig.py → tests/ops/models/test_saasconfig.py
diff --git a/tests/models/test_storage.py → tests/ops/models/test_storage.py b/tests/models/test_storage.py → tests/ops/models/test_storage.py
diff --git a/tests/resources/policy/masking_example.yaml → ...ops/resources/policy/masking_example.yaml b/tests/resources/policy/masking_example.yaml → ...ops/resources/policy/masking_example.yaml
diff --git a/tests/schemas/__init__.py → tests/ops/schemas/__init__.py b/tests/schemas/__init__.py → tests/ops/schemas/__init__.py
diff --git a/...emas/connection_configuration/__init__.py → ...emas/connection_configuration/__init__.py b/...emas/connection_configuration/__init__.py → ...emas/connection_configuration/__init__.py
diff --git a/...iguration/test_connection_secrets_saas.py → ...iguration/test_connection_secrets_saas.py b/...iguration/test_connection_secrets_saas.py → ...iguration/test_connection_secrets_saas.py
diff --git a/tests/schemas/test_user_permission.py → tests/ops/schemas/test_user_permission.py b/tests/schemas/test_user_permission.py → tests/ops/schemas/test_user_permission.py
diff --git a/tests/scripts/__init__.py → tests/ops/scripts/__init__.py b/tests/scripts/__init__.py → tests/ops/scripts/__init__.py
diff --git a/tests/scripts/test_create_superuser.py → tests/ops/scripts/test_create_superuser.py b/tests/scripts/test_create_superuser.py → tests/ops/scripts/test_create_superuser.py
diff --git a/tests/service/__init__.py → tests/ops/service/__init__.py b/tests/service/__init__.py → tests/ops/service/__init__.py
diff --git a/tests/service/authentication/__init__.py → tests/ops/service/authentication/__init__.py b/tests/service/authentication/__init__.py → tests/ops/service/authentication/__init__.py
diff --git a/...ion/test_authentication_strategy_basic.py → ...ion/test_authentication_strategy_basic.py b/...ion/test_authentication_strategy_basic.py → ...ion/test_authentication_strategy_basic.py
diff --git a/...on/test_authentication_strategy_bearer.py → ...on/test_authentication_strategy_bearer.py b/...on/test_authentication_strategy_bearer.py → ...on/test_authentication_strategy_bearer.py
diff --git a/...n/test_authentication_strategy_factory.py → ...n/test_authentication_strategy_factory.py b/...n/test_authentication_strategy_factory.py → ...n/test_authentication_strategy_factory.py
diff --git a/...on/test_authentication_strategy_oauth2.py → ...on/test_authentication_strategy_oauth2.py b/...on/test_authentication_strategy_oauth2.py → ...on/test_authentication_strategy_oauth2.py
diff --git a/...st_authentication_strategy_query_param.py → ...st_authentication_strategy_query_param.py b/...st_authentication_strategy_query_param.py → ...st_authentication_strategy_query_param.py
diff --git a/tests/service/connection_config/__init__.py → ...ops/service/connection_config/__init__.py b/tests/service/connection_config/__init__.py → ...ops/service/connection_config/__init__.py
diff --git a/.../connection_config/test_http_connector.py → .../connection_config/test_http_connector.py b/.../connection_config/test_http_connector.py → .../connection_config/test_http_connector.py
diff --git a/...nnection_config/test_mariadb_connector.py → ...nnection_config/test_mariadb_connector.py b/...nnection_config/test_mariadb_connector.py → ...nnection_config/test_mariadb_connector.py
diff --git a/...connection_config/test_mysql_connector.py → ...connection_config/test_mysql_connector.py b/...connection_config/test_mysql_connector.py → ...connection_config/test_mysql_connector.py
diff --git a/...nection_config/test_postgres_connector.py → ...nection_config/test_postgres_connector.py b/...nection_config/test_postgres_connector.py → ...nection_config/test_postgres_connector.py
diff --git a/tests/service/connectors/__init__.py → tests/ops/service/connectors/__init__.py b/tests/service/connectors/__init__.py → tests/ops/service/connectors/__init__.py
diff --git a/tests/service/connectors/test_queryconfig.py → ...ps/service/connectors/test_queryconfig.py b/tests/service/connectors/test_queryconfig.py → ...ps/service/connectors/test_queryconfig.py
diff --git a/...service/connectors/test_saas_connector.py → ...service/connectors/test_saas_connector.py b/...service/connectors/test_saas_connector.py → ...service/connectors/test_saas_connector.py
diff --git a/tests/service/masking/__init__.py → tests/ops/service/masking/__init__.py b/tests/service/masking/__init__.py → tests/ops/service/masking/__init__.py
diff --git a/tests/service/masking/strategy/__init__.py → .../ops/service/masking/strategy/__init__.py b/tests/service/masking/strategy/__init__.py → .../ops/service/masking/strategy/__init__.py
diff --git a/...tegy/test_masking_strategy_aes_encrypt.py → ...tegy/test_masking_strategy_aes_encrypt.py b/...tegy/test_masking_strategy_aes_encrypt.py → ...tegy/test_masking_strategy_aes_encrypt.py
diff --git a/...strategy/test_masking_strategy_factory.py → ...strategy/test_masking_strategy_factory.py b/...strategy/test_masking_strategy_factory.py → ...strategy/test_masking_strategy_factory.py
diff --git a/...ng/strategy/test_masking_strategy_hash.py → ...ng/strategy/test_masking_strategy_hash.py b/...ng/strategy/test_masking_strategy_hash.py → ...ng/strategy/test_masking_strategy_hash.py
diff --git a/...ng/strategy/test_masking_strategy_hmac.py → ...ng/strategy/test_masking_strategy_hmac.py b/...ng/strategy/test_masking_strategy_hmac.py → ...ng/strategy/test_masking_strategy_hmac.py
diff --git a/...ng/strategy/test_masking_strategy_null.py → ...ng/strategy/test_masking_strategy_null.py b/...ng/strategy/test_masking_strategy_null.py → ...ng/strategy/test_masking_strategy_null.py
diff --git a/...masking_strategy_random_string_rewrite.py → ...masking_strategy_random_string_rewrite.py b/...masking_strategy_random_string_rewrite.py → ...masking_strategy_random_string_rewrite.py
diff --git a/...y/test_masking_strategy_string_rewrite.py → ...y/test_masking_strategy_string_rewrite.py b/...y/test_masking_strategy_string_rewrite.py → ...y/test_masking_strategy_string_rewrite.py
diff --git a/tests/service/pagination/__init__.py → tests/ops/service/pagination/__init__.py b/tests/service/pagination/__init__.py → tests/ops/service/pagination/__init__.py
diff --git a/...nation/test_pagination_strategy_cursor.py → ...nation/test_pagination_strategy_cursor.py b/...nation/test_pagination_strategy_cursor.py → ...nation/test_pagination_strategy_cursor.py
diff --git a/...ation/test_pagination_strategy_factory.py → ...ation/test_pagination_strategy_factory.py b/...ation/test_pagination_strategy_factory.py → ...ation/test_pagination_strategy_factory.py
diff --git a/...gination/test_pagination_strategy_link.py → ...gination/test_pagination_strategy_link.py b/...gination/test_pagination_strategy_link.py → ...gination/test_pagination_strategy_link.py
diff --git a/...nation/test_pagination_strategy_offset.py → ...nation/test_pagination_strategy_offset.py b/...nation/test_pagination_strategy_offset.py → ...nation/test_pagination_strategy_offset.py
diff --git a/tests/service/privacy_request/__init__.py → ...s/ops/service/privacy_request/__init__.py b/tests/service/privacy_request/__init__.py → ...s/ops/service/privacy_request/__init__.py
diff --git a/.../service/privacy_request/onetrust_test.py → .../service/privacy_request/onetrust_test.py b/.../service/privacy_request/onetrust_test.py → .../service/privacy_request/onetrust_test.py
diff --git a/...cy_request/request_runner_service_test.py → ...cy_request/request_runner_service_test.py b/...cy_request/request_runner_service_test.py → ...cy_request/request_runner_service_test.py
diff --git a/tests/service/processors/__init__.py → tests/ops/service/processors/__init__.py b/tests/service/processors/__init__.py → tests/ops/service/processors/__init__.py
diff --git a/...ssors/post_processor_strategy/__init__.py → ...ssors/post_processor_strategy/__init__.py b/...ssors/post_processor_strategy/__init__.py → ...ssors/post_processor_strategy/__init__.py
diff --git a/...y/test_post_processor_strategy_factory.py → ...y/test_post_processor_strategy_factory.py b/...y/test_post_processor_strategy_factory.py → ...y/test_post_processor_strategy_factory.py
diff --git a/...gy/test_post_processor_strategy_filter.py → ...gy/test_post_processor_strategy_filter.py b/...gy/test_post_processor_strategy_filter.py → ...gy/test_post_processor_strategy_filter.py
diff --git a/...gy/test_post_processor_strategy_unwrap.py → ...gy/test_post_processor_strategy_unwrap.py b/...gy/test_post_processor_strategy_unwrap.py → ...gy/test_post_processor_strategy_unwrap.py
diff --git a/.../service/storage_uploader_service_test.py → .../service/storage_uploader_service_test.py b/.../service/storage_uploader_service_test.py → .../service/storage_uploader_service_test.py
diff --git a/tests/task/__init__.py → tests/ops/task/__init__.py b/tests/task/__init__.py → tests/ops/task/__init__.py
diff --git a/tests/task/test_consolidate_query_matches.py → ...ps/task/test_consolidate_query_matches.py b/tests/task/test_consolidate_query_matches.py → ...ps/task/test_consolidate_query_matches.py
diff --git a/tests/task/test_filter_element_match.py → tests/ops/task/test_filter_element_match.py b/tests/task/test_filter_element_match.py → tests/ops/task/test_filter_element_match.py
diff --git a/tests/task/test_filter_results.py → tests/ops/task/test_filter_results.py b/tests/task/test_filter_results.py → tests/ops/task/test_filter_results.py
diff --git a/tests/task/test_graph_task.py → tests/ops/task/test_graph_task.py b/tests/task/test_graph_task.py → tests/ops/task/test_graph_task.py
diff --git a/tests/task/test_refine_target_path.py → tests/ops/task/test_refine_target_path.py b/tests/task/test_refine_target_path.py → tests/ops/task/test_refine_target_path.py
diff --git a/tests/task/test_task_resources.py → tests/ops/task/test_task_resources.py b/tests/task/test_task_resources.py → tests/ops/task/test_task_resources.py
diff --git a/tests/task/traversal_data.py → tests/ops/task/traversal_data.py b/tests/task/traversal_data.py → tests/ops/task/traversal_data.py
diff --git a/tests/tasks/__init__.py → tests/ops/tasks/__init__.py b/tests/tasks/__init__.py → tests/ops/tasks/__init__.py
diff --git a/tests/tasks/test_celery.py → tests/ops/tasks/test_celery.py b/tests/tasks/test_celery.py → tests/ops/tasks/test_celery.py
diff --git a/tests/tasks/test_scheduled.py → tests/ops/tasks/test_scheduled.py b/tests/tasks/test_scheduled.py → tests/ops/tasks/test_scheduled.py
diff --git a/tests/test_helpers/__init__.py → tests/ops/test_helpers/__init__.py b/tests/test_helpers/__init__.py → tests/ops/test_helpers/__init__.py
diff --git a/tests/test_helpers/cache_secrets_helper.py → .../ops/test_helpers/cache_secrets_helper.py b/tests/test_helpers/cache_secrets_helper.py → .../ops/test_helpers/cache_secrets_helper.py
diff --git a/tests/test_helpers/dataset_utils.py → tests/ops/test_helpers/dataset_utils.py b/tests/test_helpers/dataset_utils.py → tests/ops/test_helpers/dataset_utils.py
diff --git a/tests/test_helpers/saas_test_utils.py → tests/ops/test_helpers/saas_test_utils.py b/tests/test_helpers/saas_test_utils.py → tests/ops/test_helpers/saas_test_utils.py
diff --git a/tests/test_helpers/test_dataset_utils.py → tests/ops/test_helpers/test_dataset_utils.py b/tests/test_helpers/test_dataset_utils.py → tests/ops/test_helpers/test_dataset_utils.py
@@ -1,4 +1,4 @@
-from tests.test_helpers.dataset_utils import generate_collections, generate_dataset
+from tests.ops.test_helpers.dataset_utils import generate_collections, generate_dataset
 
 
 class TestGenerateCollections:

diff --git a/tests/test_helpers/vault_client.py → tests/ops/test_helpers/vault_client.py b/tests/test_helpers/vault_client.py → tests/ops/test_helpers/vault_client.py
diff --git a/tests/util/__init__.py → tests/ops/util/__init__.py b/tests/util/__init__.py → tests/ops/util/__init__.py
diff --git a/tests/util/encryption/__init__.py → tests/ops/util/encryption/__init__.py b/tests/util/encryption/__init__.py → tests/ops/util/encryption/__init__.py
diff --git a/...ryption/test_aes_gcm_encryption_scheme.py → ...ryption/test_aes_gcm_encryption_scheme.py b/...ryption/test_aes_gcm_encryption_scheme.py → ...ryption/test_aes_gcm_encryption_scheme.py
diff --git a/...encryption/test_hmac_encryption_scheme.py → ...encryption/test_hmac_encryption_scheme.py b/...encryption/test_hmac_encryption_scheme.py → ...encryption/test_hmac_encryption_scheme.py
diff --git a/tests/util/encryption/test_secrets_util.py → .../ops/util/encryption/test_secrets_util.py b/tests/util/encryption/test_secrets_util.py → .../ops/util/encryption/test_secrets_util.py
diff --git a/tests/util/test_api_router.py → tests/ops/util/test_api_router.py b/tests/util/test_api_router.py → tests/ops/util/test_api_router.py
diff --git a/tests/util/test_cache.py → tests/ops/util/test_cache.py b/tests/util/test_cache.py → tests/ops/util/test_cache.py
diff --git a/tests/util/test_collection_util.py → tests/ops/util/test_collection_util.py b/tests/util/test_collection_util.py → tests/ops/util/test_collection_util.py
diff --git a/tests/util/test_dataset_yaml.py → tests/ops/util/test_dataset_yaml.py b/tests/util/test_dataset_yaml.py → tests/ops/util/test_dataset_yaml.py
diff --git a/tests/util/test_jwt_util.py → tests/ops/util/test_jwt_util.py b/tests/util/test_jwt_util.py → tests/ops/util/test_jwt_util.py
diff --git a/tests/util/test_logger.py → tests/ops/util/test_logger.py b/tests/util/test_logger.py → tests/ops/util/test_logger.py
diff --git a/tests/util/test_matching_queue.py → tests/ops/util/test_matching_queue.py b/tests/util/test_matching_queue.py → tests/ops/util/test_matching_queue.py
diff --git a/tests/util/test_saas_util.py → tests/ops/util/test_saas_util.py b/tests/util/test_saas_util.py → tests/ops/util/test_saas_util.py