diff --git a/app/settings/tests/functional/app_settings/conftest.py b/app/settings/tests/functional/app_settings/conftest.py
new file mode 100644
index 00000000..da24c1a4
--- /dev/null
+++ b/app/settings/tests/functional/app_settings/conftest.py
@@ -0,0 +1,25 @@
+import pytest
+
+
+
+@pytest.fixture( scope = 'class')
+def model(model_appsettings):
+
+    yield model_appsettings
+
+
+@pytest.fixture( scope = 'class', autouse = True)
+def model_kwargs(request, kwargs_appsettings):
+
+    request.cls.kwargs_create_item = kwargs_appsettings.copy()
+
+    yield kwargs_appsettings.copy()
+
+    if hasattr(request.cls, 'kwargs_create_item'):
+        del request.cls.kwargs_create_item
+
+
+@pytest.fixture( scope = 'class')
+def model_serializer(serializer_appsettings):
+
+    yield serializer_appsettings
diff --git a/app/settings/tests/functional/app_settings/test_app_settings_viewset.py b/app/settings/tests/functional/app_settings/test_functional_app_settings_metadata.py
similarity index 92%
rename from app/settings/tests/functional/app_settings/test_app_settings_viewset.py
rename to app/settings/tests/functional/app_settings/test_functional_app_settings_metadata.py
index 1fc1c5a5..963f2acb 100644
--- a/app/settings/tests/functional/app_settings/test_app_settings_viewset.py
+++ b/app/settings/tests/functional/app_settings/test_functional_app_settings_metadata.py
@@ -3,22 +3,12 @@ import pytest
 
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
-from django.shortcuts import reverse
-from django.test import Client, TestCase
-from django import urls
+from django.test import TestCase
 
 from access.models.tenant import Tenant as Organization
 from access.models.team import Team
 from access.models.team_user import TeamUsers
 
-from api.tests.abstract.api_permissions_viewset import (
-    APIPermissionChange,
-    APIPermissionView
-)
-from api.tests.abstract.api_serializer_viewset import (
-    SerializerChange,
-    SerializerView,
-)
 from api.tests.abstract.test_metadata_functional import (
     MetadataAttributesFunctionalBase,
     MetadataAttributesFunctionalEndpoint
@@ -30,6 +20,7 @@ User = django.contrib.auth.get_user_model()
 
 
 
+@pytest.mark.model_appsettings
 class ViewSetBase:
 
     model = AppSettings
@@ -193,17 +184,8 @@ class ViewSetBase:
         )
 
 
-class AppSettingsViewSet(
-    ViewSetBase,
-    SerializerChange,
-    SerializerView,
-    TestCase,
-):
-
-    pass
-
-
 
+@pytest.mark.module_settings
 class AppSettingsMetadata(
     ViewSetBase,
     MetadataAttributesFunctionalEndpoint,