diff --git a/README.md b/README.md
index 886ad03b0..12a06974b 100644
--- a/README.md
+++ b/README.md
@@ -27,9 +27,9 @@ All code must be written in python 3 and conform to PEP 8 style guide. The test
 
 ## Proposed Directory Structure
 ```bash
-├── tests
+├── old_pytest
 ├── libs
-│   ├── cloudsdk_tests
+│   ├── cloud_controller_tests
 │   ├── apnos
 │   ├── lanforge
 │   ├── perfecto
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/_e2e_setup/__init__.py b/tests/_e2e_setup/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/_e2e_setup/setup__e2e_resources.py b/tests/_e2e_setup/setup__e2e_resources.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/_e2e_setup/setup_e2e_bridge.py b/tests/_e2e_setup/setup_e2e_bridge.py
new file mode 100644
index 000000000..9fe9dafd9
--- /dev/null
+++ b/tests/_e2e_setup/setup_e2e_bridge.py
@@ -0,0 +1,101 @@
+import pytest
+
+
+@pytest.mark.sanity
+@pytest.mark.bridge
+class TestSetupRF:
+
+    @pytest.mark.wifi5
+    def test_setup_rf_profile_wifi5(self, get_markers):
+        assert True
+
+    @pytest.mark.wifi6
+    def test_setup_rf_profile_wifi6(self):
+        pytest.skip("hello")
+        assert True
+
+
+@pytest.mark.sanity
+@pytest.mark.bridge
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestSetupRadius:
+
+    @pytest.mark.radius
+    def test_setup_radius_profile(self):
+        assert True
+
+
+@pytest.mark.sanity
+@pytest.mark.bridge
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestSetupSSIDProfiles:
+
+    @pytest.mark.open
+    @pytest.mark.twog
+    def test_setup_open_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.open
+    @pytest.mark.fiveg
+    def test_setup_open_5g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa
+    @pytest.mark.twog
+    def test_setup_wpa_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa
+    @pytest.mark.fiveg
+    def test_setup_wpa_5g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    def test_setup_wpa2_personal_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    def test_setup_wpa2_personal_5g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.twog
+    @pytest.mark.radius
+    def test_setup_wpa2_enterprise_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.fiveg
+    @pytest.mark.radius
+    def test_setup_wpa2_enterprise_5g_ssid_profile(self):
+        assert True
+
+
+@pytest.mark.sanity
+@pytest.mark.bridge
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestEquipmentAPProfileBridge:
+
+    def test_setup_equipment_ap_profile(self):
+        assert True
+
+
+@pytest.mark.sanity
+@pytest.mark.bridge
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestProfilePush:
+
+    def test_push_profile(self):
+        assert True
+
+    def test_verify_vif_config(self):
+        assert True
+
+    def test_verify_vif_state(self):
+        assert True
diff --git a/tests/_e2e_setup/setup_e2e_nat.py b/tests/_e2e_setup/setup_e2e_nat.py
new file mode 100644
index 000000000..d019e3d78
--- /dev/null
+++ b/tests/_e2e_setup/setup_e2e_nat.py
@@ -0,0 +1,107 @@
+import pytest
+
+
+@pytest.mark.sanity
+@pytest.mark.nat
+class TestSetupRF:
+
+    @pytest.mark.wifi5
+    def test_setup_rf_profile_wifi5(self, get_markers):
+        assert True
+
+    @pytest.mark.wifi6
+    def test_setup_rf_profile_wifi6(self):
+        assert True
+
+
+@pytest.mark.sanity
+@pytest.mark.nat
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestSetupRadius:
+
+    @pytest.mark.radius
+    def test_setup_radius_profile(self):
+        assert True
+
+
+@pytest.mark.sanity
+@pytest.mark.nat
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestSetupSSIDProfiles:
+
+    @pytest.mark.open
+    @pytest.mark.twog
+    def test_setup_open_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.open
+    @pytest.mark.fiveg
+    def test_setup_open_5g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa
+    @pytest.mark.twog
+    def test_setup_wpa_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa
+    @pytest.mark.fiveg
+    def test_setup_wpa_5g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    def test_setup_wpa2_personal_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    def test_setup_wpa2_personal_5g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.twog
+    @pytest.mark.radius
+    def test_setup_wpa2_enterprise_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.fiveg
+    @pytest.mark.radius
+    def test_setup_wpa2_enterprise_5g_ssid_profile(self):
+        assert True
+
+
+@pytest.mark.equipment_ap
+@pytest.mark.nat
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestEquipmentAPProfilenat:
+
+    @pytest.mark.fiveg
+    @pytest.mark.radius
+    @pytest.mark.twog
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.wpa2_personal
+    @pytest.mark.wpa
+    @pytest.mark.open
+    def test_setup_equipment_ap_profile(self):
+        assert True
+
+
+@pytest.mark.sanity
+@pytest.mark.nat
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestProfilePush:
+
+    def test_push_profile(self):
+        assert True
+
+    def test_verify_vif_config(self):
+        assert True
+
+    def test_verify_vif_state(self):
+        assert True
diff --git a/tests/_e2e_setup/setup_e2e_vlan.py b/tests/_e2e_setup/setup_e2e_vlan.py
new file mode 100644
index 000000000..2dc8349e2
--- /dev/null
+++ b/tests/_e2e_setup/setup_e2e_vlan.py
@@ -0,0 +1,107 @@
+import pytest
+
+
+@pytest.mark.sanity
+@pytest.mark.vlan
+class TestSetupRF:
+
+    @pytest.mark.wifi5
+    def test_setup_rf_profile_wifi5(self, get_markers):
+        assert True
+
+    @pytest.mark.wifi6
+    def test_setup_rf_profile_wifi6(self):
+        assert True
+
+
+@pytest.mark.sanity
+@pytest.mark.vlan
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestSetupRadius:
+
+    @pytest.mark.radius
+    def test_setup_radius_profile(self):
+        assert True
+
+
+@pytest.mark.sanity
+@pytest.mark.vlan
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestSetupSSIDProfiles:
+
+    @pytest.mark.open
+    @pytest.mark.twog
+    def test_setup_open_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.open
+    @pytest.mark.fiveg
+    def test_setup_open_5g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa
+    @pytest.mark.twog
+    def test_setup_wpa_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa
+    @pytest.mark.fiveg
+    def test_setup_wpa_5g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    def test_setup_wpa2_personal_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    def test_setup_wpa2_personal_5g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.twog
+    @pytest.mark.radius
+    def test_setup_wpa2_enterprise_2g_ssid_profile(self):
+        assert True
+
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.fiveg
+    @pytest.mark.radius
+    def test_setup_wpa2_enterprise_5g_ssid_profile(self):
+        assert True
+
+
+@pytest.mark.equipment_ap
+@pytest.mark.vlan
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestEquipmentAPProfilevlan:
+
+    @pytest.mark.fiveg
+    @pytest.mark.radius
+    @pytest.mark.twog
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.wpa2_personal
+    @pytest.mark.wpa
+    @pytest.mark.open
+    def test_setup_equipment_ap_profile(self):
+        assert True
+
+
+@pytest.mark.sanity
+@pytest.mark.vlan
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+class TestProfilePush:
+
+    def test_push_profile(self):
+        assert True
+
+    def test_verify_vif_config(self):
+        assert True
+
+    def test_verify_vif_state(self):
+        assert True
diff --git a/tests/configuration.py b/tests/configuration.py
index 4477ea738..5ae1f578d 100644
--- a/tests/configuration.py
+++ b/tests/configuration.py
@@ -1,5 +1,5 @@
 Controller = {
-    'url': "https://wlan-portal-svc-nola-ext-03.cicd.lab.wlan.tip.build",  # API base url for the controller
+    'url': "https://wlan-portal-svc-nola-ext-04.cicd.lab.wlan.tip.build",  # API base url for the controller
     'username': 'support@example.com',
     'password': 'support',
     'version': '1.0.0-SNAPSHOT',
@@ -24,7 +24,7 @@ AccessPoints = [
       'model': 'ecw5410',
       'serial number': 'serial-number',
       'jumphost': True,
-      'ip': "192.168.200.80",
+      'ip': "192.168.200.81",
       'username': "lanforge",
       'password': "lanforge",
       'port': 22,
@@ -35,7 +35,7 @@ AccessPoints = [
       'model': 'ecw5410',
       'serial number' : 'serial-number',
       'jumphost': True,
-      'ip': "192.168.200.80",
+      'ip': "192.168.200.81",
       'username': "lanforge",
       'password': "lanforge",
       'port': 22,
@@ -47,7 +47,7 @@ AccessPoints = [
 CLOUDSDK_VERSION = {}
 TrafficGenerator = {
     "lanforge": {
-        "ip": "192.168.200.80",
+        "ip": "192.168.200.81",
         "port": 8080,
         "2.4G-Radio": "wihpy0",
         "5G-Radio": "wiphy1",
@@ -71,7 +71,7 @@ RADIUS_SERVER_DATA = {
 
 LAB_INFO = {
     "ap_model": "ecw5410",
-    "cloudsdk_url": "https://wlan-portal-svc-nola-ext-03.cicd.lab.wlan.tip.build",
+    "cloudsdk_url": "https://wlan-portal-svc-nola-ext-04.cicd.lab.wlan.tip.build",
     "equipment_details": {
         "serial_number_1": {
             "ip": "",
@@ -91,7 +91,7 @@ LAB_INFO = {
 
 
 APNOS_CREDENTIAL_DATA = {
-    'ip': "192.168.200.80",
+    'ip': "192.168.200.81",
     'username': "lanforge",
     'password': "lanforge",
     'port': 22,
@@ -110,9 +110,9 @@ ssh tunnel --- localhost:8800
 NOLA = {
     # It is in NOLA-01 equipment 4 lab-ctlr minicom ap1
     "ecw5410": {
-        "cloudsdk_url": "https://wlan-portal-svc-nola-ext-03.cicd.lab.wlan.tip.build",
+        "cloudsdk_url": "https://wlan-portal-svc-nola-ext-04.cicd.lab.wlan.tip.build",
         "customer_id": 2,
-        "equipment_id": 24
+        "equipment_id": 21
     },
     "ecw5211": {
         "cloudsdk_url": "",
diff --git a/tests/conftest.py b/tests/conftest.py
index d36f25383..0ba37b120 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -155,7 +155,7 @@ def instantiate_cloudsdk(request, testrun_session):
     yield sdk_client
 
 
-@pytest.fixture(scope="class")
+@pytest.fixture(scope="module")
 def instantiate_profile(instantiate_cloudsdk):
     try:
         profile_object = ProfileUtility(sdk_client=instantiate_cloudsdk)
@@ -261,6 +261,7 @@ def get_markers(request, get_security_flags):
     security_dict = dict().fromkeys(security)
     for item in session.items:
         for j in item.iter_markers():
+            print(j)
             markers.append(j.name)
     print(set(markers))
     for i in security:
@@ -277,7 +278,7 @@ def get_equipment_id(testrun_session):
     yield NOLA[testrun_session]["equipment_id"]
 
 
-@pytest.fixture(scope="class")
+@pytest.fixture(scope="module")
 def get_current_profile_cloud(instantiate_profile):
     ssid_names = []
     print(instantiate_profile.profile_creation_ids["ssid"])
@@ -286,7 +287,7 @@ def get_current_profile_cloud(instantiate_profile):
     yield ssid_names
 
 
-@pytest.fixture(scope="class")
+@pytest.fixture(scope="module")
 def setup_profiles(create_profiles, instantiate_profile, get_equipment_id, get_current_profile_cloud):
     instantiate_profile.push_profile_old_method(equipment_id=get_equipment_id)
     print(create_profiles)
@@ -314,7 +315,7 @@ def setup_profiles(create_profiles, instantiate_profile, get_equipment_id, get_c
     yield "set(markers)"
 
 
-@pytest.fixture(scope="class")
+@pytest.fixture(scope="module")
 def create_profiles(request, get_security_flags, get_markers, instantiate_profile, setup_profile_data):
     profile_id = {"ssid": [], "rf": None, "radius": None, "equipment_ap": None}
     mode = str(request._parent_request.param)
diff --git a/tests/controller/test_cloud_profiles.py b/tests/controller/test_cloud_profiles.py
index e69de29bb..ca498f4a5 100644
--- a/tests/controller/test_cloud_profiles.py
+++ b/tests/controller/test_cloud_profiles.py
@@ -0,0 +1,75 @@
+import pytest
+
+
+@pytest.mark.rf
+class TestRFProfiles:
+
+    def test_rf_profile(self):
+        assert True
+
+
+@pytest.mark.radius
+class TestRadiusProfile:
+
+    def test_radius_profile(self):
+        assert True
+
+
+@pytest.mark.ssid
+class TestSSIDProfile:
+
+    @pytest.mark.open
+    @pytest.mark.twog
+    def test_open_ssid_2g(self):
+        assert True
+
+    @pytest.mark.open
+    @pytest.mark.fiveg
+    def test_open_ssid_5g(self):
+        assert True
+
+    @pytest.mark.wpa
+    @pytest.mark.twog
+    def test_wpa_ssid_2g(self):
+        assert True
+
+    @pytest.mark.wpa
+    @pytest.mark.fiveg
+    def test_wpa_ssid_5g(self):
+        assert True
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    def test_wpa2_personal_ssid_2g(self):
+        assert True
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    def test_wpa2_personal_ssid_5g(self):
+        assert True
+
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.twog
+    def test_wpa2_enterprise_ssid_2g(self):
+        assert True
+
+    @pytest.mark.wpa2_enterprise
+    @pytest.mark.fiveg
+    def test_wpa2_enterprise_ssid_5g(self):
+        assert True
+
+
+@pytest.mark.equipment_ap_profile
+class TestEquipmentAPProfile:
+
+    @pytest.mark.bridge
+    def test_equipment_ap_profile_bridge(self):
+        assert True
+
+    @pytest.mark.nat
+    def test_equipment_ap_profile_nat(self):
+        assert True
+
+    @pytest.mark.vlan
+    def test_equipment_ap_profile_vlan(self):
+        assert True
diff --git a/tests/e2e/basic/client_connectivity/test_bridge_mode.py b/tests/e2e/basic/client_connectivity/test_bridge_mode.py
index c56519852..9d590e9e3 100644
--- a/tests/e2e/basic/client_connectivity/test_bridge_mode.py
+++ b/tests/e2e/basic/client_connectivity/test_bridge_mode.py
@@ -25,7 +25,9 @@ import time
 
 
 @pytest.mark.sanity
-@pytest.mark.bridge
+@pytest.mark.client_connectivity
+@pytest.mark.wifi5
+@pytest.mark.wifi6
 @pytest.mark.parametrize(
         'setup_profiles',
         (["BRIDGE"]),
@@ -36,6 +38,7 @@ class TestBridgeModeClientConnectivity(object):
 
     @pytest.mark.wpa
     @pytest.mark.twog
+    @pytest.mark.test_client_wpa_2g
     def test_client_wpa_2g(self, request, get_lanforge_data, setup_profile_data, instantiate_testrail,
                            instantiate_project):
         profile_data = setup_profile_data["BRIDGE"]["WPA"]["2G"]
diff --git a/tests/e2e/basic/client_connectivity/test_nat_mode.py b/tests/e2e/basic/client_connectivity/test_nat_mode.py
index f04a55e1e..acec230dd 100644
--- a/tests/e2e/basic/client_connectivity/test_nat_mode.py
+++ b/tests/e2e/basic/client_connectivity/test_nat_mode.py
@@ -21,14 +21,18 @@ from sta_connect2 import StaConnect2
 import eap_connect
 from eap_connect import EAPConnect
 import time
+
+
 #
 
 @pytest.mark.sanity
 @pytest.mark.nat
+@pytest.mark.wifi5
+@pytest.mark.wifi6
 @pytest.mark.parametrize(
-        'setup_profiles',
-        (["NAT"]),
-        indirect=True
+    'setup_profiles',
+    (["NAT"]),
+    indirect=True
 )
 @pytest.mark.usefixtures("setup_profiles")
 class TestNatModeClientConnectivity(object):
diff --git a/tests/e2e/basic/client_connectivity/test_vlan_mode.py b/tests/e2e/basic/client_connectivity/test_vlan_mode.py
index 7599150b8..30cd765f5 100644
--- a/tests/e2e/basic/client_connectivity/test_vlan_mode.py
+++ b/tests/e2e/basic/client_connectivity/test_vlan_mode.py
@@ -24,6 +24,8 @@ import time
 
 @pytest.mark.sanity
 @pytest.mark.vlan
+@pytest.mark.wifi5
+@pytest.mark.wifi6
 @pytest.mark.parametrize(
         'setup_profiles',
         (["VLAN"]),
diff --git a/tests/e2e/basic/wifi_capacity_test/test_bridge_mode.py b/tests/e2e/basic/wifi_capacity_test/test_bridge_mode.py
new file mode 100644
index 000000000..b5665dcd2
--- /dev/null
+++ b/tests/e2e/basic/wifi_capacity_test/test_bridge_mode.py
@@ -0,0 +1,19 @@
+import pytest
+
+
+@pytest.mark.sanity
+@pytest.mark.wifi_capacity_test
+@pytest.mark.wifi5
+@pytest.mark.wifi6
+@pytest.mark.parametrize(
+    'setup_profiles',
+    (["BRIDGE"]),
+    indirect=True
+)
+@pytest.mark.usefixtures("setup_profiles")
+class TestBridgeModeClientConnectivity(object):
+
+    @pytest.mark.wpa
+    @pytest.mark.twog
+    def test_client_wpa_2g(self, request, get_lanforge_data, setup_profile_data):
+        assert True
diff --git a/tests/e2e/basic/wifi_capacity_test/test_nat_mode.py b/tests/e2e/basic/wifi_capacity_test/test_nat_mode.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/basic/wifi_capacity_test/test_vlan_mode.py b/tests/e2e/basic/wifi_capacity_test/test_vlan_mode.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/setup_connectivity.py b/tests/setup_connectivity.py
index 14746bc49..b429ad17e 100644
--- a/tests/setup_connectivity.py
+++ b/tests/setup_connectivity.py
@@ -2,20 +2,21 @@ import pytest
 
 
 @pytest.mark.sanity
+@pytest.mark.bridge
+@pytest.mark.nat
+@pytest.mark.vlan
+@pytest.mark.wifi5
+@pytest.mark.wifi6
 class TestConnection:
 
-    @pytest.mark.test_cloud_connectivity
     def test_cloud_connectivity(self, instantiate_cloudsdk):
         assert instantiate_cloudsdk
 
-    @pytest.mark.test_access_points_connectivity
     def test_access_points_connectivity(self, instantiate_cloudsdk):
         assert instantiate_cloudsdk
 
-    @pytest.mark.test_lanforge_connectivity
     def test_lanforge_connectivity(self, setup_lanforge):
         assert "instantiate_cloudsdk"
 
-    @pytest.mark.test_perfecto_connectivity
     def test_perfecto_connectivity(self, setup_perfecto_devices):
         assert "instantiate_cloudsdk"
diff --git a/tests/setup_e2e_tests.py b/tests/setup_e2e_tests.py
deleted file mode 100644
index 60e5933d9..000000000
--- a/tests/setup_e2e_tests.py
+++ /dev/null
@@ -1,322 +0,0 @@
-# import pytest
-#
-#
-# @pytest.mark.sanity
-# @pytest.mark.bridge
-# class TestSetupBridge:
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_setup_rf_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_setup_radius_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.open
-#     @pytest.mark.twog
-#     def test_setup_open_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.open
-#     @pytest.mark.fiveg
-#     def test_setup_open_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa
-#     @pytest.mark.twog
-#     def test_setup_wpa_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa
-#     @pytest.mark.fiveg
-#     def test_setup_wpa_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.twog
-#     def test_setup_wpa2_personal_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     def test_setup_wpa2_personal_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.twog
-#     @pytest.mark.radius
-#     def test_setup_wpa2_enterprise_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     def test_setup_wpa2_enterprise_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_setup_equipment_ap_profile(self):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_push_profile(self):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_verify_vif_config(self):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_verify_vif_state(self):
-#         assert True
-#
-#
-# @pytest.mark.sanity
-# @pytest.mark.nat
-# class TestSetupNAT:
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_setup_rf_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_setup_radius_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.open
-#     @pytest.mark.twog
-#     def test_setup_open_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.open
-#     @pytest.mark.fiveg
-#     def test_setup_open_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa
-#     @pytest.mark.twog
-#     def test_setup_wpa_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa
-#     @pytest.mark.fiveg
-#     def test_setup_wpa_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.twog
-#     def test_setup_wpa2_personal_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     def test_setup_wpa2_personal_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.twog
-#     @pytest.mark.radius
-#     def test_setup_wpa2_enterprise_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     def test_setup_wpa2_enterprise_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_setup_equipment_ap_profile(self):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_push_profile(self):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_verify_vif_config(self):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_verify_vif_state(self):
-#         assert True
-#
-#
-# @pytest.mark.sanity
-# @pytest.mark.vlan
-# class TestSetupVLAN:
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_setup_rf_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_setup_radius_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.open
-#     @pytest.mark.twog
-#     def test_setup_open_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.open
-#     @pytest.mark.fiveg
-#     def test_setup_open_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa
-#     @pytest.mark.twog
-#     def test_setup_wpa_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa
-#     @pytest.mark.fiveg
-#     def test_setup_wpa_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.twog
-#     def test_setup_wpa2_personal_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.fiveg
-#     def test_setup_wpa2_personal_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.twog
-#     @pytest.mark.radius
-#     def test_setup_wpa2_enterprise_2g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     def test_setup_wpa2_enterprise_5g_ssid_profile(self, cleanup_profile):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_setup_equipment_ap_profile(self):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_push_profile(self):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_verify_vif_config(self):
-#         assert True
-#
-#     @pytest.mark.fiveg
-#     @pytest.mark.radius
-#     @pytest.mark.twog
-#     @pytest.mark.wpa2_enterprise
-#     @pytest.mark.wpa2_personal
-#     @pytest.mark.wpa
-#     @pytest.mark.open
-#     def test_verify_vif_state(self):
-#         assert True