diff --git a/libs/lanforge/lf_tests.py b/libs/lanforge/lf_tests.py
index ab0865d42..3440ffbac 100644
--- a/libs/lanforge/lf_tests.py
+++ b/libs/lanforge/lf_tests.py
@@ -7,6 +7,7 @@ import os
 
 import allure
 import pytest
+import importlib
 
 sys.path.append(
     os.path.dirname(
@@ -29,6 +30,8 @@ import time
 import string
 import random
 from scp_util import SCP_File
+
+
 S = 12
 # from eap_connect import EAPConnect
 from test_ipv4_ttls import TTLSTest
@@ -40,19 +43,20 @@ from lf_dataplane_test import DataplaneTest
 from lf_rx_sensitivity_test import RxSensitivityTest
 from lf_ap_auto_test import ApAutoTest
 from csv_to_influx import CSVtoInflux
-from influx2 import RecordInflux
+# from influx import RecordInflux
 from lf_multipsk import MultiPsk
 from lf_rvr_test import RvrTest
 from attenuator_serial import AttenuatorSerial
 from lf_atten_mod_test import CreateAttenuator
 from lf_mesh_test import MeshTest
-
+from LANforge.lfcli_base import LFCliBase
+realm = importlib.import_module("py-json.realm")
+Realm = realm.Realm
 
 class RunTest:
 
-    def __init__(self, lanforge_data=None, local_report_path="../reports/", influx_params=None, debug=False):
-        print("lanforge data", lanforge_data)
-        if "type" in lanforge_data.keys():
+    def __init__(self, configuration_data=None, local_report_path="../reports/", influx_params=None, run_lf=False, debug=False):
+        if "type" in configuration_data['traffic_generator'].keys():
             if lanforge_data["type"] == "mesh":
                 self.lanforge_ip = lanforge_data["ip"]
                 self.lanforge_port = lanforge_data["port"]
@@ -79,18 +83,21 @@ class RunTest:
                 self.local_report_path = local_report_path
 
         else:
-            self.lanforge_ip = lanforge_data["ip"]
-            self.lanforge_port = lanforge_data["port"]
-            self.lanforge_ssh_port = lanforge_data["ssh_port"]
-            self.twog_radios = lanforge_data["2.4G-Radio"]
-            self.fiveg_radios = lanforge_data["5G-Radio"]
-            self.ax_radios = lanforge_data["AX-Radio"]
-            self.upstream_port = lanforge_data["upstream"].split(".")[2]
-            self.twog_prefix = lanforge_data["2.4G-Station-Name"]
-            self.fiveg_prefix = lanforge_data["5G-Station-Name"]
-            self.ax_prefix = lanforge_data["AX-Station-Name"]
+            self.lanforge_ip = configuration_data['traffic_generator']['details']["ip"]
+            self.lanforge_port = configuration_data['traffic_generator']['details']["port"]
+            self.lanforge_ssh_port = configuration_data['traffic_generator']['details']["ssh_port"]
+            self.twog_radios = configuration_data['traffic_generator']['details']["2.4G-Radio"]
+            self.fiveg_radios = configuration_data['traffic_generator']['details']["5G-Radio"]
+            self.ax_radios = configuration_data['traffic_generator']['details']["AX-Radio"]
+            self.upstream_port = configuration_data['traffic_generator']['details']["upstream"].split(".")[2]
+            self.twog_prefix = configuration_data['traffic_generator']['details']["2.4G-Station-Name"]
+            self.fiveg_prefix = configuration_data['traffic_generator']['details']["5G-Station-Name"]
+            self.ax_prefix = configuration_data['traffic_generator']['details']["AX-Station-Name"]
             self.debug = debug
-            self.lf_ssh_port = lanforge_data["ssh_port"]
+            self.run_lf = run_lf
+            if self.run_lf:
+                self.ssid_data = configuration_data['access_point'][0]['ssid']
+            self.lf_ssh_port = configuration_data['traffic_generator']['details']["ssh_port"]
             self.staConnect = None
             self.dataplane_obj = None
             self.rx_sensitivity_obj = None
@@ -102,12 +109,10 @@ class RunTest:
             #                              _influx_org=influx_params["influx_org"],
             #                              _influx_token=influx_params["influx_token"],
             #                              _influx_bucket=influx_params["influx_bucket"])
-        self.local_report_path = local_report_path
-        if not os.path.exists(self.local_report_path):
-            os.mkdir(self.local_report_path)
-        # self.staConnect = StaConnect2(self.lanforge_ip, self.lanforge_port, debug_=self.debug)
-        # self.eap_connect = TTLSTest(host=self.lanforge_ip, port=self.lanforge_port,
-        #                             sta_list="station_name", vap=False, _debug_on=self.debug)
+            self.local_report_path = local_report_path
+            if not os.path.exists(self.local_report_path):
+                os.mkdir(self.local_report_path)
+
 
     def Client_Connectivity(self, ssid="[BLANK]", passkey="[BLANK]", security="open", extra_securities=[],
                             station_name=[], mode="BRIDGE", vlan_id=1, band="twog"):
@@ -123,11 +128,20 @@ class RunTest:
         else:
             self.staConnect.upstream_port = self.upstream_port + "." + str(vlan_id)
         if band == "twog":
+            if self.run_lf:
+                ssid = self.ssid_data["2g-ssid"]
+                passkey = self.ssid_data["2g-password"]
+                security = self.ssid_data["2g-encryption"].lower()
+                print(ssid)
             self.staConnect.radio = self.twog_radios[0]
             self.staConnect.admin_down(self.staConnect.radio)
             self.staConnect.admin_up(self.staConnect.radio)
             self.staConnect.sta_prefix = self.twog_prefix
         if band == "fiveg":
+            if self.run_lf:
+                ssid = self.ssid_data["5g-ssid"]
+                passkey = self.ssid_data["5g-password"]
+                security = self.ssid_data["5g-encryption"].lower()
             self.staConnect.radio = self.fiveg_radios[0]
             self.staConnect.reset_port(self.staConnect.radio)
             self.staConnect.sta_prefix = self.fiveg_prefix
@@ -139,7 +153,7 @@ class RunTest:
         self.staConnect.runtime_secs = 40
         self.staConnect.bringup_time_sec = 80
         self.staConnect.cleanup_on_exit = True
-        # self.staConnect.cleanup()
+        print("gopi: ", self.staConnect.dut_ssid, self.staConnect.dut_passwd)
         self.staConnect.setup(extra_securities=extra_securities)
         self.staConnect.start()
         print("napping %f sec" % self.staConnect.runtime_secs)
@@ -218,11 +232,19 @@ class RunTest:
             self.eap_connect.l3_cx_obj_udp.upstream = self.upstream_port + "." + str(vlan_id)
             self.eap_connect.l3_cx_obj_tcp.upstream = self.upstream_port + "." + str(vlan_id)
         if band == "twog":
+            if self.run_lf:
+                ssid = self.ssid_data["2g-ssid"]
+                passkey = self.ssid_data["2g-password"]
+                security = self.ssid_data["2g-encryption"]
             self.eap_connect.radio = self.twog_radios[0]
             self.eap_connect.admin_down(self.eap_connect.radio)
             self.eap_connect.admin_up(self.eap_connect.radio)
             # self.eap_connect.sta_prefix = self.twog_prefix
         if band == "fiveg":
+            if self.run_lf:
+                ssid = self.ssid_data["5g-ssid"]
+                passkey = self.ssid_data["5g-password"]
+                security = self.ssid_data["5g-encryption"]
             self.eap_connect.radio = self.fiveg_radios[0]
             self.eap_connect.admin_down(self.eap_connect.radio)
             self.eap_connect.admin_up(self.eap_connect.radio)
@@ -355,14 +377,21 @@ class RunTest:
         influx.glob()
         return wificapacity_obj
 
-
     def Client_Connect(self, ssid="[BLANK]", passkey="[BLANK]", security="wpa2", mode="BRIDGE", band="twog",
                        vlan_id=100,
                        station_name=[]):
-
+        if band == "twog":
+            if self.run_lf:
+                ssid = self.ssid_data["2g-ssid"]
+                passkey = self.ssid_data["2g-password"]
+                security = self.ssid_data["2g-encryption"].lower()
+        if band == "fiveg":
+            if self.run_lf:
+                ssid = self.ssid_data["5g-ssid"]
+                passkey = self.ssid_data["5g-password"]
+                security = self.ssid_data["5g-encryption"].lower()
         self.client_connect = CreateStation(_host=self.lanforge_ip, _port=self.lanforge_port,
                                             _sta_list=station_name, _password=passkey, _ssid=ssid, _security=security)
-
         self.client_connect.station_profile.sta_mode = 0
         self.client_connect.upstream_resource = 1
         if mode == "BRIDGE":
@@ -387,6 +416,34 @@ class RunTest:
         else:
             return False
 
+    def attach_stationdata_to_allure(self, station_name=[], name=""):
+        self.sta_url_map = None
+        for sta_name_ in station_name:
+            if sta_name_ is None:
+                raise ValueError("get_station_url wants a station name")
+            if self.sta_url_map is None:
+                self.sta_url_map = {}
+                for sta_name in station_name:
+                    self.sta_url_map[sta_name] = "port/1/%s/%s" % (str(1), sta_name)
+                    print(self.sta_url_map)
+
+        for sta_name in station_name:
+            try:
+                station_data_str = ""
+                # sta_url = self.staConnect.get_station_url(sta_name)
+                cli_base = LFCliBase(_lfjson_host=self.lanforge_ip, _lfjson_port=self.lanforge_port, )
+                station_info = cli_base.json_get(_req_url=self.sta_url_map[sta_name])
+                print("station info", station_info)
+                for i in station_info["interface"]:
+                    try:
+                        station_data_str = station_data_str + i + "  :  " + str(station_info["interface"][i]) + "\n"
+                    except Exception as e:
+                        print(e)
+                print("sta name", sta_name)
+                allure.attach(name=name, body=str(station_data_str))
+            except Exception as e:
+                print(e)
+
     def Client_Connect_Using_Radio(self, ssid="[BLANK]", passkey="[BLANK]", security="wpa2", mode="BRIDGE",
                                    vlan_id=100, radio=None, sta_mode=0,
                                    station_name=[]):
@@ -412,6 +469,15 @@ class RunTest:
         else:
             return False
 
+    def wait_for_ip(self, station=[]):
+        self.local_realm = realm.Realm(lfclient_host=self.lanforge_ip, lfclient_port=self.lanforge_port)
+        print(station)
+        if self.local_realm.wait_for_ip(station_list=station):
+            self.local_realm._pass("ALL Stations got IP's", print_=True)
+            return True
+        else:
+            return False
+
     def Client_disconnect(self, station_name=[]):
         self.client_dis = CreateStation(_host=self.lanforge_ip, _port=self.lanforge_port,
                                         _sta_list=station_name, _password="passkey", _ssid="ssid", _security="security")
@@ -466,11 +532,11 @@ class RunTest:
         report_name = self.dataplane_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
 
         influx = CSVtoInflux(influx_host=self.influx_params["influx_host"],
-                                     influx_port=self.influx_params["influx_port"],
-                                     influx_org=self.influx_params["influx_org"],
-                                     influx_token=self.influx_params["influx_token"],
-                                     influx_bucket=self.influx_params["influx_bucket"],
-                                     path=report_name)
+                             influx_port=self.influx_params["influx_port"],
+                             influx_org=self.influx_params["influx_org"],
+                             influx_token=self.influx_params["influx_token"],
+                             influx_bucket=self.influx_params["influx_bucket"],
+                             path=report_name)
 
         influx.glob()
 
@@ -559,7 +625,7 @@ class RunTest:
                                            ['Stability', '1'],
                                            ['Band-Steering', '0'], ['Multi-Station Throughput vs Pkt Size', '0'],
                                            ['Long-Term', '0']],
-                                     raw_lines=[['reset_dur:300'],['reset_batch_size:2']]
+                                     raw_lines=[['reset_dur:300'], ['reset_batch_size:2']]
                                      )
         self.apstab_obj.setup()
         self.apstab_obj.run()
@@ -574,7 +640,6 @@ class RunTest:
         influx.glob()
         return self.apstab_obj
 
-
     def ratevsrange(self, station_name=None, mode="BRIDGE", vlan_id=100, download_rate="85%", dut_name="TIP",
                     upload_rate="0", duration="1m", instance_name="test_demo", raw_lines=None):
         if mode == "BRIDGE":
@@ -711,13 +776,13 @@ class RunTest:
                     "radio": str(radio)
                 },
             ]
-        print("station name",station_name)
+        print("station name", station_name)
 
         self.multi_obj = MultiPsk(host=self.lanforge_ip,
                                   port=self.lanforge_port,
                                   ssid=ssid,
                                   input=input_data,
-                                  security=security,)
+                                  security=security, )
         self.sta_url_map = None
         self.multi_obj.build()
         self.multi_obj.start()
@@ -860,7 +925,6 @@ class RunTest:
         atten_obj = CreateAttenuator(self.lanforge_ip, self.lanforge_port, serno, idx, val)
         atten_obj.build()
 
-
     def mesh_test(self, instance_name=None, raw_lines=None, duration="60s"):
         self.mesh_obj = MeshTest(
                        lf_host=self.lanforge_ip,
@@ -944,19 +1008,19 @@ if __name__ == '__main__':
         "influx_tag": ["basic-03", "ec420"],
     }
     lanforge_data = {
-                "ip": "10.28.3.6",
-                "port": 8080,
-                "ssh_port": 22,
-                "2.4G-Radio": ["1.1.wiphy4"],
-                "5G-Radio": ["1.1.wiphy5"],
-                "AX-Radio": ["1.1.wiphy0", "1.1.wiphy1", "1.1.wiphy2", "1.1.wiphy3"],
-                "upstream": "1.1.eth2",
-                "upstream_subnet": "10.28.2.1/24",
-                "uplink": "1.1.eth3",
-                "2.4G-Station-Name": "wlan0",
-                "5G-Station-Name": "wlan1",
-                "AX-Station-Name": "ax"
-            }
+        "ip": "192.168.200.10",
+        "port": 8080,
+        "ssh_port": 22,
+        "2.4G-Radio": ["wiphy0"],
+        "5G-Radio": ["wiphy1"],
+        "AX-Radio": [],
+        "upstream": "1.1.eth1",
+        "upstream_subnet": "192.168.200.1/24",
+        "uplink": "1.1.eth2",
+        "2.4G-Station-Name": "wlan0",
+        "5G-Station-Name": "wlan0",
+        "AX-Station-Name": "ax"
+    }
     obj = RunTest(lanforge_data=lanforge_data, debug=False, influx_params=influx_params)
     upstream = lanforge_data['upstream']
     # data = obj.staConnect.json_get("/port/all")
diff --git a/libs/lanforge/lf_tools.py b/libs/lanforge/lf_tools.py
index 7092fdea3..0fa2f3f08 100644
--- a/libs/lanforge/lf_tools.py
+++ b/libs/lanforge/lf_tools.py
@@ -1,6 +1,7 @@
 import re
 import sys
 import os
+import  importlib
 
 import pytest
 
@@ -21,6 +22,7 @@ sys.path.append(f'../libs')
 sys.path.append(f'../libs/lanforge/')
 import allure
 from sta_connect2 import StaConnect2
+
 from create_chamberview import CreateChamberview
 from create_chamberview_dut import DUT
 import time
@@ -28,16 +30,106 @@ from LANforge.lfcli_base import LFCliBase
 import json
 import os
 import pandas as pd
+realm = importlib.import_module("py-json.realm")
+Realm = realm.Realm
 
 
 class ChamberView:
 
-    def __init__(self, lanforge_data=None, access_point_data=None, debug=True, testbed=None):
+    def __init__(self, lanforge_data=None, access_point_data=None, run_lf=False, debug=True, testbed=None):
         print("lanforge data", lanforge_data)
         print("access point data", access_point_data)
         self.access_point_data = access_point_data
+        self.access_point_data = access_point_data
+        self.run_lf = run_lf
         print("testbed", testbed)
         if "type" in lanforge_data.keys():
+            if lanforge_data["type"] == "Non-mesh":
+                self.lanforge_ip = lanforge_data["ip"]
+                self.lanforge_port = lanforge_data["port"]
+                self.ssh_port = lanforge_data["ssh_port"]
+                self.twog_radios = lanforge_data["2.4G-Radio"]
+                self.fiveg_radios = lanforge_data["5G-Radio"]
+                self.ax_radios = lanforge_data["AX-Radio"]
+                self.upstream_port = lanforge_data["upstream"]
+                self.uplink_port = lanforge_data["uplink"]
+                self.upstream_subnet = lanforge_data["upstream_subnet"]
+                self.upstream_resources = self.upstream_port.split(".")[0] + "." + self.upstream_port.split(".")[1]
+                self.uplink_resources = self.uplink_port.split(".")[0] + "." + self.uplink_port.split(".")[1]
+                self.scenario_name = testbed
+                self.debug = debug
+                self.exit_on_error = False
+                self.dut_idx_mapping = {}
+                self.ssid_list = []
+                self.staConnect = StaConnect2(self.lanforge_ip, self.lanforge_port, debug_=self.debug)
+                self.local_realm = realm.Realm(lfclient_host=self.lanforge_ip, lfclient_port=self.lanforge_port)
+                self.raw_line = [
+                    ["profile_link " + self.upstream_resources + " upstream-dhcp 1 NA NA " +
+                     self.upstream_port.split(".")
+                     [2] + ",AUTO -1 NA"],
+                    [
+                        "profile_link " + self.uplink_resources + " uplink-nat 1 'DUT: upstream LAN " + self.upstream_subnet
+                        + "' NA " + self.uplink_port.split(".")[2] + "," + self.upstream_port.split(".")[2] + " -1 NA"]
+                ]
+                self.CreateChamberview = CreateChamberview(self.lanforge_ip, self.lanforge_port)
+
+                self.delete_old_scenario = True
+                if access_point_data:
+                    print(len(access_point_data))
+                    for ap in range(len(access_point_data)):
+                        print(access_point_data[ap])
+                        self.dut_name = access_point_data[ap]["model"]
+                        print(self.dut_name)
+                        self.ap_model = access_point_data[ap]["model"]
+                        self.version = access_point_data[ap]["version"].split("/")[-1]
+                        self.serial = access_point_data[ap]["serial"]
+                        self.ssid_data = None
+                        if self.run_lf:
+                            self.ssid_data = access_point_data[ap]['ssid']
+                            print(self.ssid_data)
+
+                        self.CreateDut = DUT(lfmgr=self.lanforge_ip,
+                                             port=self.lanforge_port,
+                                             dut_name=self.dut_name,
+                                             sw_version=self.version,
+                                             hw_version=self.ap_model,
+                                             model_num=self.ap_model,
+                                             serial_num=self.serial
+                                             )
+                        self.CreateDut.ssid = []
+                        if self.ssid_data is not None:
+                            self.twog_ssid = ["ssid_idx=0"
+                                              " ssid=" + self.ssid_data["2g-ssid"] +
+                                              " security=" + self.ssid_data["2g-encryption"].upper() +
+                                              " password=" + self.ssid_data["2g-password"] +
+                                              " bssid=" + self.ssid_data["2g-bssid"].lower().replace(" ", "")
+                                              ]
+
+                            self.fiveg_ssid = ["ssid_idx=1 ssid=" +
+                                               self.ssid_data["5g-ssid"] +
+                                               " security=" +
+                                               self.ssid_data["5g-encryption"].upper() +
+                                               " password=" +
+                                               self.ssid_data["5g-password"] +
+                                               " bssid=" +
+                                               self.ssid_data["5g-bssid"].lower().replace(" ", "")]
+                            if "6g-ssid" in self.ssid_data.keys():
+                                print("yes")
+                                self.sixg_ssid = ["ssid_idx=2 ssid=" +
+                                                   self.ssid_data["6g-ssid"] +
+                                                   " security=" +
+                                                   self.ssid_data["6g-encryption"].upper() +
+                                                   " password=" +
+                                                   self.ssid_data["6g-password"] +
+                                                   " bssid=" +
+                                                   self.ssid_data["6g-bssid"].lower().replace(" ", "")]
+                                ssid_var = [self.twog_ssid, self.fiveg_ssid, self.sixg_ssid]
+                            else :
+                                ssid_var = [self.twog_ssid, self.fiveg_ssid]
+                            self.CreateDut.ssid = ssid_var
+                            # print(self.CreateDut.ssid)
+                            self.Create_Dut()
+
             if lanforge_data["type"] == "mesh":
                 self.lanforge_ip = lanforge_data["ip"]
                 self.lanforge_port = lanforge_data["port"]
@@ -111,7 +203,9 @@ class ChamberView:
                 self.ap_model = access_point_data[0]["model"]
                 self.version = access_point_data[0]["version"].split("/")[-1]
                 self.serial = access_point_data[0]["serial"]
-
+                self.ssid_data = None
+                if self.run_lf:
+                    self.ssid_data = access_point_data[0]['ssid']
                 self.CreateDut = DUT(lfmgr=self.lanforge_ip,
                                      port=self.lanforge_port,
                                      dut_name=self.testbed,
@@ -121,15 +215,45 @@ class ChamberView:
                                      serial_num=self.serial
                                      )
                 self.CreateDut.ssid = []
+                if self.ssid_data is not None:
+                    # ssid = ['ssid_idx=0 ssid=Default-SSID-2g security=WPA|WEP| password=12345678 bssid=90:3c:b3:94:48:58']
+                    # ssid = ["ssid_idx=" + str(interface) +
+                    #         " ssid=" + ssid_info_sdk[interface][0] +
+                    #         " security=" + ssid_info_sdk[interface][1].upper() +
+                    #         " password=" + ssid_info_sdk[interface][2] +
+                    #         " bssid=" + ssid_info_sdk[interface][4].lower()
+                    #         ]
+                    self.twog_ssid = ["ssid_idx=0"
+                                      " ssid=" + self.ssid_data["2g-ssid"] +
+                                      " security=" + self.ssid_data["2g-encryption"].upper() +
+                                      " password=" + self.ssid_data["2g-password"] +
+                                      " bssid=" + self.ssid_data["2g-bssid"].lower().replace(" ", "")
+                                      ]
+
+                    self.fiveg_ssid = ["ssid_idx=1 ssid=" +
+                                       self.ssid_data["5g-ssid"] +
+                                       " security=" +
+                                       self.ssid_data["5g-encryption"].upper() +
+                                       " password=" +
+                                       self.ssid_data["5g-password"] +
+                                       " bssid=" +
+                                       self.ssid_data["5g-bssid"].lower().replace(" ", "")]
+                    self.CreateDut.ssid = [self.twog_ssid, self.fiveg_ssid]
+                    # print(self.CreateDut.ssid)
+                    self.Create_Dut()
+
 
     def reset_scenario(self):
-        self.raw_line = [
-            ["profile_link " + self.upstream_resources + " upstream-dhcp 1 NA NA " + self.upstream_port.split(".")
-            [2] + ",AUTO -1 NA"],
-            ["profile_link " + self.uplink_resources + " uplink-nat 1 'DUT: upstream LAN " + self.upstream_subnet
-             + "' NA " + self.uplink_port.split(".")[2] + "," + self.upstream_port.split(".")[2] + " -1 NA"]
-        ]
-        print(self.raw_line)
+        # self.layer3_cleanup()
+        # self.Create_Dut()
+        if not self.run_lf:
+            self.raw_line = [
+                ["profile_link " + self.upstream_resources + " upstream-dhcp 1 NA NA " + self.upstream_port.split(".")
+                [2] + ",AUTO -1 NA"],
+                ["profile_link " + self.uplink_resources + " uplink-nat 1 'DUT: upstream LAN " + self.upstream_subnet
+                 + "' NA " + self.uplink_port.split(".")[2] + "," + self.upstream_port.split(".")[2] + " -1 NA"]
+            ]
+            print(self.raw_line)
         self.Chamber_View()
 
     def reset_dut(self):
@@ -149,6 +273,7 @@ class ChamberView:
                 sta_list.append(j)
         return sta_list
 
+
     def admin_up_down(self, sta_list=[], option="up"):
         #realm_obj = self.staConnect.localrealm
         if option == "up":
@@ -187,8 +312,13 @@ class ChamberView:
                                       + " NA " + self.upstream_port.split(".")[2] + ",AUTO -1 " + str(vlans)])
             self.Chamber_View()
 
-    def add_stations(self, band="2G", num_stations="max", dut="NA", ssid_name=[]):
-        idx = 0
+    def add_stations(self, band="2G", num_stations="max", dut="NA", ssid_name=[], idx=0):
+        idx = idx
+        if self.run_lf:
+            if band == "2G":
+                idx = 0
+            if band == "5G":
+                idx = 1
         print(self.dut_idx_mapping)
         for i in self.dut_idx_mapping:
             if self.dut_idx_mapping[i][0] == ssid_name and self.dut_idx_mapping[i][3] == band:
@@ -313,8 +443,8 @@ class ChamberView:
 
     def station_data_query(self, station_name="wlan0", query="channel"):
         x = self.upstream_port.split(".")
-        print(x)
         url = f"/port/{x[0]}/{x[1]}/{station_name}?fields={query}"
+        # print("url//////", url)
         response = self.json_get(_req_url=url)
         print("response: ", response)
         if (response is None) or ("interface" not in response):
@@ -343,7 +473,7 @@ class ChamberView:
     def read_csv_individual_station_throughput(self, dir_name, option):
         try:
             df = pd.read_csv(
-                "../reports/" + str(dir_name) + "/csv-data/data-Combined_bps__60_second_running_average-1.csv",
+                "../reports/" + str(dir_name) + "/csv-data/data-Combined_Mbps__60_second_running_average-1.csv",
                 sep=r'\t', engine='python')
             print("csv file opened")
         except FileNotFoundError:
diff --git a/tests/configuration.py b/tests/configuration.py
index 53cd07ebe..38a399365 100644
--- a/tests/configuration.py
+++ b/tests/configuration.py
@@ -40,7 +40,6 @@ CONFIGURATION = data["CONFIGURATION"]
 
 RADIUS_SERVER_DATA = data["RADIUS_SERVER_DATA"]
 
-
 RADIUS_ACCOUNTING_DATA = data["RADIUS_ACCOUNTING_DATA"]
 
 RATE_LIMITING_RADIUS_SERVER_DATA = data["RATE_LIMITING_RADIUS_SERVER_DATA"]
diff --git a/tests/conftest.py b/tests/conftest.py
index 8b5e917ac..f25c925e0 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -148,6 +148,12 @@ def pytest_addoption(parser):
         default=True,
         help="Stop using Testrails"
     )
+    parser.addoption(
+        "--run-lf",
+        action="store_true",
+        default=False,
+        help="skip cloud controller and AP, run only lanforge tests on a ssid preconfigured"
+    )
 
     # Perfecto Parameters
     parser.addini("perfectoURL", "Cloud URL")
@@ -204,6 +210,13 @@ def should_upload_firmware(request):
     yield request.config.getoption("--force-upload")
 
 
+@pytest.fixture(scope="session")
+def run_lf(request):
+    """yields the --run-lf option for skipping configuration on AP and using Cloud controller"""
+    var = request.config.getoption("--run-lf")
+    yield var
+
+
 @pytest.fixture(scope="session")
 def should_upgrade_firmware(request):
     """yields the --force-upgrade option  for firmware upgrade selection"""
@@ -277,8 +290,10 @@ def get_equipment_ref(request, setup_controller, testbed, get_configuration):
 
 
 @pytest.fixture(scope="session")
-def get_sdk_version(fixtures_ver):
-    version = fixtures_ver.get_sdk_version()
+def get_sdk_version(fixtures_ver, run_lf):
+    version = ""
+    if not run_lf:
+        version = fixtures_ver.get_sdk_version()
     yield version
 
 
@@ -587,33 +602,34 @@ def traffic_generator_connectivity(testbed, get_configuration):
 
 
 @pytest.fixture(scope="session")
-def create_lanforge_chamberview_dut(lf_tools, skip_lf):
+def create_lanforge_chamberview_dut(lf_tools, skip_lf, run_lf):
     dut_name = ""
-    if not skip_lf:
+    if (not run_lf ) and (not skip_lf):
         dut_object, dut_name = lf_tools.Create_Dut()
     return dut_name
 
 
 @pytest.fixture(scope="session")
-def lf_tools(get_configuration, testbed, skip_lf):
+def lf_tools(get_configuration, testbed, skip_lf, run_lf):
     """ Create a DUT on LANforge"""
     if not skip_lf:
         obj = ChamberView(lanforge_data=get_configuration["traffic_generator"]["details"],
-                          testbed=testbed, access_point_data=get_configuration["access_point"])
+                          testbed=testbed, run_lf=run_lf,
+                          access_point_data=get_configuration["access_point"])
     else:
         obj = False
     yield obj
 
 
 @pytest.fixture(scope="session")
-def lf_test(get_configuration, setup_influx, request, skip_lf):
+def lf_test(get_configuration, setup_influx, request, skip_lf, run_lf):
     if not skip_lf:
         if request.config.getoption("--exit-on-fail"):
-            obj = RunTest(lanforge_data=get_configuration['traffic_generator']['details'], influx_params=setup_influx,
-                          debug=True)
+            obj = RunTest(configuration_data=get_configuration, influx_params=setup_influx,
+                          debug=True, run_lf=run_lf)
         if request.config.getoption("--exit-on-fail") is False:
-            obj = RunTest(lanforge_data=get_configuration['traffic_generator']['details'], influx_params=setup_influx,
-                          debug=False)
+            obj = RunTest(configuration_data=get_configuration, influx_params=setup_influx,
+                          debug=False, run_lf=run_lf)
     yield obj
 
 
@@ -684,10 +700,10 @@ def add_firmware_property_after_upgrade(add_allure_environment_property, fixture
 
 
 @pytest.fixture(scope="session")
-def fixtures_ver(request, get_configuration):
+def fixtures_ver(request, get_configuration, run_lf):
     if request.config.getoption("1.x") is False:
         print("2.x")
-        obj = Fixtures_2x(configuration=get_configuration)
+        obj = Fixtures_2x(configuration=get_configuration, run_lf=run_lf)
     if request.config.getoption("1.x"):
         print("1.x")
         obj = Fixtures_1x(configuration=get_configuration)
@@ -706,23 +722,24 @@ Logs related Fixtures
 
 
 @pytest.fixture(scope="function")
-def get_ap_logs(request, get_apnos, get_configuration):
-    S = 9
-    instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S))
-    for ap in get_configuration['access_point']:
-        ap_ssh = get_apnos(ap, pwd="../libs/apnos/", sdk="2.x")
-        ap_ssh.run_generic_command(cmd="logger start testcase: " + instance_name)
-
-    def collect_logs():
+def get_ap_logs(request, get_apnos, get_configuration, run_lf):
+    if not run_lf:
+        S = 9
+        instance_name = ''.join(random.choices(string.ascii_uppercase + string.digits, k=S))
         for ap in get_configuration['access_point']:
             ap_ssh = get_apnos(ap, pwd="../libs/apnos/", sdk="2.x")
-            ap_ssh.run_generic_command(cmd="logger stop testcase: " + instance_name)
-            ap_logs = ap_ssh.get_logread(start_ref="start testcase: " + instance_name,
-                                         stop_ref="stop testcase: " + instance_name)
-            allure.attach(name='logread', body=str(ap_logs))
-        pass
+            ap_ssh.run_generic_command(cmd="logger start testcase: " + instance_name)
 
-    request.addfinalizer(collect_logs)
+        def collect_logs():
+            for ap in get_configuration['access_point']:
+                ap_ssh = get_apnos(ap, pwd="../libs/apnos/", sdk="2.x")
+                ap_ssh.run_generic_command(cmd="logger stop testcase: " + instance_name)
+                ap_logs = ap_ssh.get_logread(start_ref="start testcase: " + instance_name,
+                                             stop_ref="stop testcase: " + instance_name)
+                allure.attach(name='logread', body=str(ap_logs))
+            pass
+
+        request.addfinalizer(collect_logs)
 
 
 @pytest.fixture(scope="function")
diff --git a/tests/e2e/advanced/conftest.py b/tests/e2e/advanced/conftest.py
index 691a6d86e..12935d065 100644
--- a/tests/e2e/advanced/conftest.py
+++ b/tests/e2e/advanced/conftest.py
@@ -27,12 +27,6 @@ def instantiate_profile(request):
 
 
 
-@pytest.fixture(scope="session")
-def lf_tools(get_configuration, testbed):
-    lf_tools_obj = ChamberView(lanforge_data=get_configuration['traffic_generator']['details'],
-                               access_point_data=get_configuration['access_point'],
-                               testbed=testbed)
-    yield lf_tools_obj
 
 
 @pytest.fixture(scope="session")
@@ -41,12 +35,6 @@ def create_lanforge_chamberview(lf_tools):
     return scenario_name
 
 
-@pytest.fixture(scope="session")
-def create_lanforge_chamberview_dut(lf_tools):
-    dut_object, dut_name = lf_tools.Create_Dut()
-    return dut_name
-
-
 @pytest.fixture(scope="session")
 def setup_vlan():
     vlan_id = [100]
@@ -58,7 +46,7 @@ def setup_vlan():
 @pytest.fixture(scope="class")
 def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtures_ver,
                    instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools,
-                   get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info):
+                   get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info, run_lf):
     lf_tools.reset_scenario()
     param = dict(request.param)
 
@@ -88,19 +76,11 @@ def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtur
                                              instantiate_profile,
                                              get_markers, create_lanforge_chamberview_dut, lf_tools,
                                              get_security_flags, get_configuration, radius_info, get_apnos,
-                                             radius_accounting_info)
+                                             radius_accounting_info, run_lf=run_lf)
 
     yield return_var
 
 
-@pytest.fixture(scope="session")
-def lf_test(get_configuration, setup_influx):
-    # print(get_configuration)
-    obj = RunTest(lanforge_data=get_configuration['traffic_generator']['details'], influx_params=setup_influx)
-    # pytest.exit("")
-    yield obj
-
-
 @pytest.fixture(scope="session")
 def station_names_twog(request, get_configuration):
     station_names = []
diff --git a/tests/e2e/advanced/multi_association_disassociation/wpa2_personal/test_bridge_association_disassociation.py b/tests/e2e/advanced/multi_association_disassociation/wpa2_personal/test_bridge_association_disassociation.py
index 357c48c14..e74bcfcd8 100644
--- a/tests/e2e/advanced/multi_association_disassociation/wpa2_personal/test_bridge_association_disassociation.py
+++ b/tests/e2e/advanced/multi_association_disassociation/wpa2_personal/test_bridge_association_disassociation.py
@@ -31,7 +31,16 @@ class TestMultiAssoDisassoBridge(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
     @pytest.mark.udp_upload_2g
-    def test_multi_station_udp_upload_2g(self, lf_test, lf_tools, create_lanforge_chamberview_dut):
+    def test_multi_station_udp_upload_2g(self, lf_test, lf_tools):
+        allure.attach(name="Definition",
+                      body="Multiple association/disassociation stability test intends to measure stability of Wi-Fi device " \
+                           "under a dynamic environment with frequent change of connection status.")
+        allure.attach(name="Procedure",
+                      body="This test case definition states that we Create 16 stations on 2.4Ghz radio and all of these 16 stations should be on same radio." \
+                           " Run Wifi-capacity test for first 8 stations. " \
+                           "8 stations are picked for sending/receiving packets while the other 8 STAs are picked to do a dis-association/re-association process during the test" \
+                           " Enable uplink 4 Mbps UDP flow from DUT to each of the 8 traffic stations" \
+                           "Disassociate the other 8 stations. Wait for 30 seconds, after that Re-associate the 8 stations.")
         # run wifi capacity test here
         def thread_fun(station_list):
             print(station_list)
@@ -53,6 +62,7 @@ class TestMultiAssoDisassoBridge(object):
         sta_list = lf_tools.get_station_list()
         print(sta_list)
         lf_tools.admin_up_down(sta_list=sta_list, option="up")
+
         sel_stations = ",".join(sta_list[0:8])
         val = [['ul_rate_sel: Per-Station Upload Rate:']]
         thr1 = threading.Thread(target=thread_fun, args=(sta_list[8:16],))
@@ -71,6 +81,9 @@ class TestMultiAssoDisassoBridge(object):
         pass_value = 4 * 0.99
         print("pass value ", pass_value)
         pass_fail = []
+        allure.attach(name="Pass Fail Criteria",
+                      body="UDP traffic rate is at least 99% of the configured rate for each station. Here configured " \
+                           "traffic rate is 4 Mbps so traffic for each station should be 3.96 Mbps ")
         if not csv_val:
             print("csv file does not exist, station did not got ip, Test failed")
             allure.attach(name="Csv Data", body="station did not got ip Test failed.")
@@ -95,7 +108,16 @@ class TestMultiAssoDisassoBridge(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
     @pytest.mark.udp_download_2g
-    def test_multi_station_udp_download_2g(self, lf_test, lf_tools, create_lanforge_chamberview_dut):
+    def test_multi_station_udp_download_2g(self, lf_test, lf_tools):
+        allure.attach(name="Definition",
+                      body="Multiple association/disassociation stability test intends to measure stability of Wi-Fi device " \
+                           "under a dynamic environment with frequent change of connection status.")
+        allure.attach(name="Procedure",
+                      body="This test case definition states that we Create 16 stations on 2.4Ghz radio and all of these 16 stations should be on same radio." \
+                           " Run Wifi-capacity test for first 8 stations. " \
+                           "8 stations are picked for sending/receiving packets while the other 8 STAs are picked to do a dis-association/re-association process during the test" \
+                           " Enable downlink 4 Mbps UDP flow from DUT to each of the 8 traffic stations" \
+                           "Disassociate the other 8 stations. Wait for 30 seconds, after that Re-associate the 8 stations.")
         # run wifi capacity test here
         def thread_fun(station_list):
             print(station_list)
@@ -114,8 +136,8 @@ class TestMultiAssoDisassoBridge(object):
         vlan = 1
         lf_tools.add_stations(band="2G", num_stations=16, dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
+        time.sleep(10)
         sta_list = lf_tools.get_station_list()
-        print(sta_list)
         lf_tools.admin_up_down(sta_list=sta_list, option="up")
         sel_stations = ",".join(sta_list[0:8])
         val = [['dl_rate_sel: Per-Station Download Rate:']]
@@ -136,6 +158,9 @@ class TestMultiAssoDisassoBridge(object):
         pass_value = 4 * 0.99
         print("pass value ", pass_value)
         pass_fail = []
+        allure.attach(name="Pass Fail Criteria",
+                      body="UDP traffic rate is at least 99% of the configured rate for each station. Here configured " \
+                           "traffic rate is 4 Mbps so traffic for each station should be 3.96 Mbps ")
         if not csv_val:
             print("csv file does not exist, station did not got ip, Test failed")
             allure.attach(name="Csv Data", body="station did not got ip Test failed.")
@@ -160,7 +185,16 @@ class TestMultiAssoDisassoBridge(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.udp_upload_5g
-    def test_multi_station_udp_upload_5g(self, lf_test, lf_tools, create_lanforge_chamberview_dut):
+    def test_multi_station_udp_upload_5g(self, lf_test, lf_tools):
+        allure.attach(name="Definition",
+                      body="Multiple association/disassociation stability test intends to measure stability of Wi-Fi device " \
+                           "under a dynamic environment with frequent change of connection status.")
+        allure.attach(name="Procedure",
+                      body="This test case definition states that we Create 16 stations on 5Ghz radio and all of these 16 stations should be on same radio." \
+                           " Run Wifi-capacity test for first 8 stations. " \
+                           "8 stations are picked for sending/receiving packets while the other 8 STAs are picked to do a dis-association/re-association process during the test" \
+                           " Enable uplink 8 Mbps UDP flow from DUT to each of the 8 traffic stations" \
+                           "Disassociate the other 8 stations. Wait for 30 seconds, after that Re-associate the 8 stations.")
         # run wifi capacity test here
         def thread_fun(station_list):
             print(station_list)
@@ -201,6 +235,9 @@ class TestMultiAssoDisassoBridge(object):
         pass_value = 8 * 0.99
         print("pass value ", pass_value)
         pass_fail = []
+        allure.attach(name="Pass Fail Criteria",
+                      body="UDP traffic rate is at least 99% of the configured rate for each station. Here configured " \
+                           "traffic rate is 8 Mbps so traffic for each station should be 7.92 Mbps ")
         if not csv_val:
             print("csv file does not exist, station did not got ip, Test failed")
             allure.attach(name="Csv Data", body="station did not got ip Test failed.")
@@ -225,15 +262,16 @@ class TestMultiAssoDisassoBridge(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.udp_download_5g
-    def test_multi_station_udp_download_5g(self, lf_test, lf_tools, create_lanforge_chamberview_dut):
-        allure.attach(name="Definition", body="Multiple association/disassociation stability test intends to measure stability of Wi-Fi device " \
-                                              "under a dynamic environment with frequent change of connection status.")
-        allure.attach(name="Procedure", body="This test case definition states that we Create 16 stations on 5Ghz radio and all of these 16 stations should be on same radio." \
-                                              " Run Wifi-capacity test for first 8 stations. " \
-                                              "8 stations are picked for sending/receiving packets while the other 8 STAs are picked to do a dis-association/re-association process during the test" \
-                                              " Enable downlink 8 Mbps UDP flow from DUT to each of the 8 traffic stations" \
-                                              "Disassociate the other 8 stations. Wait for 30 seconds, after that Re-associate the 8 stations.")
-
+    def test_multi_station_udp_download_5g(self, lf_test, lf_tools):
+        allure.attach(name="Definition",
+                      body="Multiple association/disassociation stability test intends to measure stability of Wi-Fi device " \
+                           "under a dynamic environment with frequent change of connection status.")
+        allure.attach(name="Procedure",
+                      body="This test case definition states that we Create 16 stations on 5Ghz radio and all of these 16 stations should be on same radio." \
+                           " Run Wifi-capacity test for first 8 stations. " \
+                           "8 stations are picked for sending/receiving packets while the other 8 STAs are picked to do a dis-association/re-association process during the test" \
+                           " Enable downlink 8 Mbps UDP flow from DUT to each of the 8 traffic stations" \
+                           "Disassociate the other 8 stations. Wait for 30 seconds, after that Re-associate the 8 stations.")
         # run wifi capacity test here
         def thread_fun(station_list):
             print(station_list)
@@ -274,8 +312,9 @@ class TestMultiAssoDisassoBridge(object):
         pass_value = 8 * 0.99
         print("pass value ", pass_value)
         pass_fail = []
-        allure.attach(name="Pass Fail Criteria", body="UDP traffic rate is at least 99% of the configured rate for each station. Here configured " \
-                                                      "traffic rate is 8 Mbps so traffic for each station should be 7.92 Mbps ")
+        allure.attach(name="Pass Fail Criteria",
+                      body="UDP traffic rate is at least 99% of the configured rate for each station. Here configured " \
+                           "traffic rate is 8 Mbps so traffic for each station should be 7.92 Mbps ")
         if not csv_val:
             print("csv file does not exist, station did not got ip, Test failed")
             allure.attach(name="Csv Data", body="station did not got ip Test failed.")
diff --git a/tests/e2e/advanced/roam_test/__init__.py b/tests/e2e/advanced/roam_test/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/advanced/roam_test/roam_by_attenuation/__init__.py b/tests/e2e/advanced/roam_test/roam_by_attenuation/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/e2e/advanced/roam_test/roam_by_attenuation/test_bridge _roam.py b/tests/e2e/advanced/roam_test/roam_by_attenuation/test_bridge _roam.py
new file mode 100644
index 000000000..dd2e52f90
--- /dev/null
+++ b/tests/e2e/advanced/roam_test/roam_by_attenuation/test_bridge _roam.py	
@@ -0,0 +1,232 @@
+import time
+
+import pytest
+import allure
+from configuration import CONFIGURATION
+
+pytestmark = [pytest.mark.roam_test, pytest.mark.bridge]
+
+setup_params_general = {
+    "mode": "BRIDGE",
+    "ssid_modes": {
+        "wpa2_personal": [
+            {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"},
+            {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"], "security_key": "something"}]},
+    "rf": {},
+    "radius": False
+}
+
+class TestRateLimitingWithRadiusBridge(object):
+
+    @pytest.mark.roam_2g
+    def test_basic_roam_2g(self, get_configuration, lf_test, station_names_twog, lf_tools, run_lf, add_env_properties):
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "BRIDGE"
+        band = "twog"
+        vlan = 1
+        c1_2g_bssid = ""
+        c2_2g_bssid = ""
+        if run_lf:
+            c1_2g_bssid = get_configuration["access_point"][0]["ssid"]["2g-bssid"]
+            allure.attach(name="bssid of ap1", body=c1_2g_bssid)
+            c2_2g_bssid = get_configuration["access_point"][1]["ssid"]["2g-bssid"]
+            allure.attach(name="bssid of ap2", body=c2_2g_bssid)
+
+        ser_no = lf_test.attenuator_serial()
+        print(ser_no[0])
+        ser_1 = ser_no[0].split(".")[2]
+        ser_2 = ser_no[1].split(".")[2]
+        # put attenuation to zero in all attenuator's
+        # for i in range(4):
+        #     lf_test.attenuator_modify(ser_1, i, 0)
+        #     lf_test.attenuator_modify(ser_2, i, 0)
+
+        # # create station
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+        if station :
+            lf_test.attach_stationdata_to_allure(name="staion info before roam", station_name=station_names_twog)
+            bssid = lf_tools.station_data_query(station_name=str(station_names_twog[0]), query="ap")
+            formated_bssid = bssid.lower()
+            station_before = ""
+            if formated_bssid == c1_2g_bssid:
+                print("station connected to chamber1 ap")
+                station_before = formated_bssid
+            elif formated_bssid == c2_2g_bssid:
+                print("station connected to chamber 2 ap")
+                station_before = formated_bssid
+            # logic to decrease c1 attenuation and increase c2 attenuation
+            for atten_val1, atten_val2 in zip([0, 100, 300, 500, 750, 950],[950, 750, 500,300, 100, 0]):
+                print(atten_val1)
+                print(atten_val2)
+                for i in range(4):
+                    lf_test.attenuator_modify(int(ser_1), i, atten_val1)
+                    lf_test.attenuator_modify(int(ser_2), i, atten_val2)
+                time.sleep(10)
+                lf_tools.admin_up_down(sta_list=station_names_twog, option="down")
+                time.sleep(15)
+                lf_tools.admin_up_down(sta_list=station_names_twog,option="up")
+                time.sleep(15)
+                bssid = lf_tools.station_data_query(station_name=str(station_names_twog[0]), query="ap")
+                station_after = bssid.lower()
+                if station_after == station_before:
+                    continue
+                elif station_after != station_before:
+                    print("client performed roam")
+                    lf_test.attach_stationdata_to_allure(name="staion info after roam",
+                                                         station_name=station_names_twog)
+                    allure.attach(name="attenuation_data", body="ap1 was at attenuation value " + str(
+                        atten_val2) + "ddbm and ap2 was at attenuation value " + str(atten_val1) + "ddbm")
+                    break
+            lf_test.Client_disconnect(station_name=station_names_twog)
+        else:
+            allure.attach(name="FAIL", body="station failed to get ip")
+            assert False
+
+    @pytest.mark.roam_5g
+    def test_basic_roam_5g(self, get_configuration, lf_test, station_names_fiveg, lf_tools, run_lf, add_env_properties):
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "BRIDGE"
+        band = "fiveg"
+        vlan = 1
+        c1_5g_bssid = ""
+        c2_5g_bssid = ""
+        if run_lf:
+            c1_5g_bssid = get_configuration["access_point"][0]["ssid"]["5g-bssid"]
+            allure.attach(name="bssid of ap1", body=c1_5g_bssid)
+            c2_5g_bssid = get_configuration["access_point"][1]["ssid"]["5g-bssid"]
+            allure.attach(name="bssid of ap2", body=c2_5g_bssid)
+
+        ser_no = lf_test.attenuator_serial()
+        print(ser_no[0])
+        ser_1 = ser_no[0].split(".")[2]
+        ser_2 = ser_no[1].split(".")[2]
+        # put attenuation to zero in all attenuator's
+        # for i in range(4):
+        #     lf_test.attenuator_modify(ser_1, i, 0)
+        #     lf_test.attenuator_modify(ser_2, i, 0)
+
+        # # create station
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        if station:
+            lf_test.attach_stationdata_to_allure(name="staion info before roam", station_name=station_names_fiveg)
+            bssid = lf_tools.station_data_query(station_name=str(station_names_fiveg[0]), query="ap")
+            formated_bssid = bssid.lower()
+            station_before = ""
+            if formated_bssid == c1_5g_bssid:
+                print("station connected to chamber1 ap")
+                station_before = formated_bssid
+            elif formated_bssid == c2_5g_bssid:
+                print("station connected to chamber 2 ap")
+                station_before = formated_bssid
+            # logic to decrease c1 attenuation and increase c2 attenuation
+            for atten_val1, atten_val2 in zip([0, 100, 300, 500, 750, 950], [950, 750, 500, 300, 100, 0]):
+                print(atten_val1)
+                print(atten_val2)
+                for i in range(4):
+                    lf_test.attenuator_modify(int(ser_1), i, atten_val1)
+                    lf_test.attenuator_modify(int(ser_2), i, atten_val2)
+                time.sleep(10)
+                lf_tools.admin_up_down(sta_list=station_names_fiveg, option="down")
+                time.sleep(15)
+                lf_tools.admin_up_down(sta_list=station_names_fiveg, option="up")
+                time.sleep(15)
+                bssid = lf_tools.station_data_query(station_name=str(station_names_fiveg[0]), query="ap")
+                station_after = bssid.lower()
+                if station_after == station_before:
+                    continue
+                elif station_after != station_before:
+                    print("client performed roam")
+                    lf_test.attach_stationdata_to_allure(name="staion info after roam",
+                                                         station_name=station_names_fiveg)
+                    allure.attach(name="attenuation_data", body="ap1 was at attenuation value " + str(
+                        atten_val2) + "ddbm and ap2 was at attenuation value " + str(atten_val1) + "ddbm")
+                    break
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+        else:
+            allure.attach(name="FAIL", body="station failed to get ip")
+            assert False
+
+
+    @pytest.mark.multi_roam
+    def test_multiple_roam_2g(self, get_configuration, lf_test, station_names_twog, lf_tools, run_lf, add_env_properties):
+        c1_2g_bssid = ""
+        c2_2g_bssid = ""
+        if run_lf:
+            c1_2g_bssid = get_configuration["access_point"][0]["ssid"]["2g-bssid"]
+            allure.attach(name="bssid of ap1", body=c1_2g_bssid)
+            c2_2g_bssid = get_configuration["access_point"][1]["ssid"]["2g-bssid"]
+            allure.attach(name="bssid of ap2", body=c2_2g_bssid)
+            ssid_name = get_configuration["access_point"][0]["ssid"]["2g-ssid"]
+
+        ser_no = lf_test.attenuator_serial()
+        print(ser_no[0])
+        ser_1 = ser_no[0].split(".")[2]
+        ser_2 = ser_no[1].split(".")[2]
+        lf_tools.add_stations(band="2G", num_stations=3, dut=lf_tools.dut_name, ssid_name=ssid_name)
+        lf_tools.Chamber_View()
+        sta_list = lf_tools.get_station_list()
+        print("sta_list", sta_list)
+        lf_tools.admin_up_down(sta_list=sta_list, option="up")
+        station = lf_test.wait_for_ip(station=sta_list)
+        station_before = ""
+        station_list = []
+        for i in range(len(sta_list)):
+            station_list.append(sta_list[i].split(".")[2])
+            print(station_list)
+        if station:
+            lf_test.attach_stationdata_to_allure(name="staion info before roam", station_name=sta_list)
+            for i in station_list:
+                bssid = lf_tools.station_data_query(station_name=str(i), query="ap")
+                formated_bssid = bssid.lower()
+                if formated_bssid == c1_2g_bssid:
+                    print("station connected to chamber1 ap")
+                    station_before = formated_bssid
+                elif formated_bssid == c2_2g_bssid:
+                    print("station connected to chamber 2 ap")
+                    station_before = formated_bssid
+                # logic to decrease c1 attenuation and increase c2 attenuation
+            for atten_val1, atten_val2 in zip([0, 100, 300, 500, 750, 950], [950, 750, 500, 300, 100, 0]):
+                print(atten_val1)
+                print(atten_val2)
+                for i in range(4):
+                    lf_test.attenuator_modify(int(ser_1), i, atten_val1)
+                    lf_test.attenuator_modify(int(ser_2), i, atten_val2)
+                time.sleep(10)
+                lf_tools.admin_up_down(sta_list=station_list, option="down")
+                time.sleep(15)
+                lf_tools.admin_up_down(sta_list=station_list, option="up")
+                time.sleep(15)
+                for i in station_list:
+                    bssid = lf_tools.station_data_query(station_name=str(i), query="ap")
+                    station_after = bssid.lower()
+                    if station_after == station_before:
+                        continue
+                    elif station_after != station_before:
+                        print("client performed roam")
+                        lf_test.attach_stationdata_to_allure(name="staion info after roam", station_name=i)
+                        allure.attach(name="attenuation_data", body="ap1 was at attenuation value " + str(atten_val2) + "ddbm and ap2 was at attenuation value " + str(atten_val1) + "ddbm")
+                        break
+
+        else:
+            allure.attach(name="FAIL", body="stations failed to get ip")
+            assert False
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/e2e/basic/conftest.py b/tests/e2e/basic/conftest.py
index 143f5ea64..731761ea5 100644
--- a/tests/e2e/basic/conftest.py
+++ b/tests/e2e/basic/conftest.py
@@ -26,14 +26,6 @@ def instantiate_profile(request):
         yield UProfileUtility
 
 
-@pytest.fixture(scope="session")
-def lf_tools(get_configuration, testbed):
-    lf_tools_obj = ChamberView(lanforge_data=get_configuration['traffic_generator']['details'],
-                               access_point_data=get_configuration['access_point'],
-                               testbed=testbed)
-    yield lf_tools_obj
-
-
 @pytest.fixture(scope="session")
 def create_lanforge_chamberview(lf_tools):
     scenario_object, scenario_name = lf_tools.Chamber_View()
@@ -41,14 +33,16 @@ def create_lanforge_chamberview(lf_tools):
 
 
 @pytest.fixture(scope="session")
-def create_lanforge_chamberview_dut(lf_tools):
-    dut_object, dut_name = lf_tools.Create_Dut()
-    return dut_name
+def create_lanforge_chamberview_dut(lf_tools, run_lf):
+    if not run_lf:
+        dut_object, dut_name = lf_tools.Create_Dut()
+        return dut_name
+    return ""
 
 
 @pytest.fixture(scope="class")
 def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtures_ver, reset_scenario_lf,
-                   instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools,
+                   instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools, run_lf,
                    get_security_flags, get_configuration, radius_info, get_apnos, radius_accounting_info):
     param = dict(request.param)
 
@@ -79,7 +73,7 @@ def setup_profiles(request, setup_controller, testbed, get_equipment_ref, fixtur
                                              instantiate_profile,
                                              get_markers, create_lanforge_chamberview_dut, lf_tools,
                                              get_security_flags, get_configuration, radius_info, get_apnos,
-                                             radius_accounting_info)
+                                             radius_accounting_info, run_lf=run_lf)
 
     yield return_var
 
@@ -115,7 +109,7 @@ def num_stations(request):
 
 
 @pytest.fixture(scope="class")
-def get_vif_state(get_apnos, get_configuration, request, lf_tools):
+def get_vif_state(get_apnos, get_configuration, request, lf_tools, run_lf):
     if request.config.getoption("1.x"):
         ap_ssh = get_apnos(get_configuration['access_point'][0], pwd="../libs/apnos/", sdk="1.x")
         vif_state = list(ap_ssh.get_vif_state_ssids())
@@ -140,15 +134,12 @@ def get_vlan_list(get_apnos, get_configuration):
 
 
 @pytest.fixture(scope="session")
-def reset_scenario_lf(request, lf_tools):
-    lf_tools.reset_scenario()
-
-    def teardown_session():
-        if request.config.getoption("--exit-on-fail"):
-            pass
-        else:
+def reset_scenario_lf(request, lf_tools, run_lf):
+    if not run_lf:
+        lf_tools.reset_scenario()
+        def teardown_session():
             lf_tools.reset_scenario()
 
-    request.addfinalizer(teardown_session)
+        request.addfinalizer(teardown_session)
     yield ""
 
diff --git a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py
index 3ace2a857..85d6573e0 100644
--- a/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/dataplane_throughput_test/wpa2_security/test_bridge_mode.py
@@ -39,6 +39,7 @@ class TestDataplaneThroughputBRIDGE(object):
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3913", name="WIFI-3913")
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
+    @pytest.mark.twow
     def test_tcp_upd_wpa2_personal_bridge_2g_band_ac_station(self, get_vif_state, lf_tools,
                                                              lf_test, station_names_twog,
                                                              create_lanforge_chamberview_dut,
diff --git a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py
index 4ea17a191..ce1a10bc0 100644
--- a/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/dual_band_performance_test/wpa2_personal/test_bridge_mode.py
@@ -39,7 +39,7 @@ class TestDualbandPerformanceBRIDGE(object):
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3918", name="WIFI-3918")
     @pytest.mark.wpa2_personal
-    @pytest.mark.twog
+    @pytest.mark.twogp
     @pytest.mark.fiveg
     def test_client_wpa2_personal_bridge(self, get_vif_state, lf_tools,
                                   create_lanforge_chamberview_dut, lf_test, get_configuration):
@@ -59,9 +59,6 @@ class TestDualbandPerformanceBRIDGE(object):
             if lf_tools.dut_idx_mapping[i][3] == "2G":
                 dut_2g = dut_name + ' ' + lf_tools.dut_idx_mapping[i][0] + ' ' + lf_tools.dut_idx_mapping[i][4]
                 print(dut_2g)
-        if ssid_2G and ssid_5G not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID's NOT AVAILABLE IN VIF STATE")
 
         dbpt_obj = lf_test.dualbandperformancetest(mode=mode, ssid_2G=ssid_2G, ssid_5G=ssid_5G,
                                                    instance_name="dbp_instance_wpa2p_BRIDGE_p",
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_bridge_mode.py
index 206fa4c3e..de2db96fc 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_bridge_mode.py
@@ -11,20 +11,18 @@ import time
 import pytest
 import allure
 
-pytestmark = [pytest.mark.performance, pytest.mark.throughput_benchmark_test, pytest.mark.bridge] # pytest.mark.usefixtures("setup_test_run")]
 
+pytestmark = [pytest.mark.performance, pytest.mark.throughput_benchmark_test, pytest.mark.bridge] # pytest.mark.usefixtures("setup_test_run")]
 
 setup_params_general = {
     "mode": "BRIDGE",
     "ssid_modes": {
-        "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]},
-                 {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}],
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}],
         "wpa2_personal": [
-            {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"},
-            {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
+            {"ssid_name": "ssid_wpa2_2g",
+             "appliedRadios": ["2G"],
+             "security_key": "something"},
+            {"ssid_name": "ssid_wpa2_5g",
+             "appliedRadios": ["5G"],
              "security_key": "something"}]},
     "rf": {
         "is5GHz": {"channelBandwidth": "is20MHz"},
@@ -34,6 +32,7 @@ setup_params_general = {
     "radius": False
 }
 
+
 @allure.feature("BRIDGE MODE CLIENT CONNECTIVITY")
 @pytest.mark.parametrize(
     'setup_profiles',
@@ -50,9 +49,9 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_2g_up_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_up_nss2_udp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput Bridge Mode
            pytest -m "throughput_benchmark_test and bridge and wpa2_personal and twog and upstream "
         """
@@ -64,17 +63,15 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],['bandw_options: 20'], ['spatial_streams: 2']]
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
                                        instance_name="TIP1_PERF_DPT_WPA2_2G_bridge",
-                                       vlan_id=vlan, dut_name=dut_name,raw_lines=val)
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
             pdf = False
@@ -90,14 +87,14 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         else:
             assert False
 
-
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -107,28 +104,28 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
         print("station", station)
 
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'], ['bandw_options: 20'], ['spatial_streams: 2']]
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 20'], ['spatial_streams: 2']]
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_bridge",
-                              vlan_id=vlan, dut_name=dut_name,raw_lines=val)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_bridge",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/"+report_name + '/')
+            entries = os.listdir("../reports/" + report_name + '/')
             pdf = False
             for i in entries:
                 if ".pdf" in i:
                     pdf = i
             if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf, name=get_configuration["access_point"][0]["model"] + "_dataplane")
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
             print("Test Completed... Cleaning up Stations")
             lf_test.Client_disconnect(station_name=station_names_fiveg)
             assert station
@@ -140,9 +137,9 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_2g_down_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_down_nss2_udp(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput Bridge Mode
            pytest -m "throughput_benchmark_test and bridge and wpa2_personal and twog and downstream "
         """
@@ -154,9 +151,6 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -186,8 +180,9 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss2_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -197,9 +192,6 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -210,7 +202,8 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G__down_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__down_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -232,9 +225,9 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_2g_bi_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_bi_nss2_udp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput Bridge Mode
            pytest -m "throughput_benchmark_test and bridge and wpa2_personal and twog and bidirectional "
         """
@@ -246,9 +239,6 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -278,8 +268,9 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -289,9 +280,6 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -302,7 +290,8 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_bi_nss2_udp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_bi_nss2_udp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -324,9 +313,9 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_up_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_up_nss2_tcp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput Bridge Mode
            pytest -m "throughput_benchmark_test and bridge and wpa2_personal and twog and upstream and tcp "
         """
@@ -338,9 +327,6 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -370,8 +356,9 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -381,9 +368,6 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -394,7 +378,8 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G__up_nss2_tcp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__up_nss2_tcp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -416,9 +401,9 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_down_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_down_nss2_tcp(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput Bridge Mode
            pytest -m "throughput_benchmark_test and bridge and wpa2_personal and twog and downstream and tcp"
            jira-WIFI-2564
@@ -431,9 +416,6 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -463,8 +445,9 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss2_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -474,9 +457,6 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -487,7 +467,8 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G__down_nss2_tcp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__down_nss2_tcp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -509,9 +490,9 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput Bridge Mode
            pytest -m "throughput_benchmark_test and bridge and wpa2_personal and twog and bidirectional "
         """
@@ -523,9 +504,6 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -555,8 +533,9 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_bi_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -566,9 +545,6 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -579,7 +555,8 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G__bi_nss2_tcp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__bi_nss2_tcp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -596,17 +573,16 @@ class TestThroughputUnderCombinationsBridge20MHz(object):
         else:
             assert False
 
+
 setup_params_general = {
     "mode": "BRIDGE",
     "ssid_modes": {
-        "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]},
-                 {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}],
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}],
         "wpa2_personal": [
-            {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"},
-            {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
+            {"ssid_name": "ssid_wpa2_2g",
+             "appliedRadios": ["2G"],
+             "security_key": "something"},
+            {"ssid_name": "ssid_wpa2_5g",
+             "appliedRadios": ["5G"],
              "security_key": "something"}]},
     "rf": {
         "is5GHz": {"channelBandwidth": "is80MHz"},
@@ -616,6 +592,7 @@ setup_params_general = {
     "radius": False
 }
 
+
 @allure.feature("BRIDGE MODE CLIENT CONNECTIVITY")
 @pytest.mark.parametrize(
     'setup_profiles',
@@ -627,14 +604,14 @@ setup_params_general = {
 @pytest.mark.Mhz80
 class TestThroughputUnderCombinationsBridge80MHz(object):
 
-
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput Bridge Mode
                    pytest -m "throughput_benchmark_test and bridge and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp "
                    jira-wifi-2566
@@ -647,9 +624,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -660,7 +634,8 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__up_nss2_udp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__up_nss2_udp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -682,8 +657,9 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss2_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput Bridge Mode
                            pytest -m "throughput_benchmark_test and bridge and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
                            jira-wifi-2567
@@ -696,9 +672,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -709,7 +682,8 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__down_nss2_udp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__down_nss2_udp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -731,8 +705,9 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -742,9 +717,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -755,7 +727,8 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__bi_nss2_udp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__bi_nss2_udp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -777,8 +750,9 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -788,9 +762,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -801,7 +772,8 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80_up_nss2_tcp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_up_nss2_tcp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -823,8 +795,9 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss2_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -834,9 +807,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -847,7 +817,8 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80_down_nss2_tcp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_down_nss2_tcp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -869,9 +840,9 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput Bridge Mode
            pytest -m "throughput_benchmark_test and bridge and wpa2_personal and twog and bidirectional "
         """
@@ -883,9 +854,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -915,8 +883,9 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss3_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput Bridge Mode
                    pytest -m "throughput_benchmark_test and bridge and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp and nss3"
                    jira-wifi-2572
@@ -929,9 +898,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -942,7 +908,8 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__up_nss3_udp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__up_nss3_udp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -964,8 +931,9 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss3_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput Bridge Mode
                            pytest -m "throughput_benchmark_test and bridge and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp and nss3 "
                            jira-wifi-2573
@@ -978,9 +946,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -991,7 +956,8 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__down_nss3_udp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__down_nss3_udp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1013,8 +979,9 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss3_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1024,9 +991,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1037,7 +1001,8 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__bi_nss3_udp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__bi_nss3_udp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1059,8 +1024,9 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss3
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss3_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss3_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1070,9 +1036,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1083,7 +1046,8 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__up_nss3_tcp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__up_nss3_tcp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1105,8 +1069,9 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss3
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss3_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss3_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1116,9 +1081,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1129,7 +1091,8 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80_down_nss3_tcp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_down_nss3_tcp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1151,7 +1114,7 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss3
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_bi_nss3_tcp(self, get_vif_state,
+    def test_client_wpa2_personal_5g_bi_nss3_tcp(self, 
                                                  lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                  get_configuration):
 
@@ -1163,9 +1126,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1176,7 +1136,8 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80_bi_nss3_tcp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_bi_nss3_tcp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1197,11 +1158,6 @@ class TestThroughputUnderCombinationsBridge80MHz(object):
 setup_params_general = {
     "mode": "BRIDGE",
     "ssid_modes": {
-        "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]},
-                 {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}],
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}],
         "wpa2_personal": [
             {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"},
             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
@@ -1214,6 +1170,7 @@ setup_params_general = {
     "radius": False
 }
 
+
 @allure.feature("BRIDGE MODE CLIENT CONNECTIVITY")
 @pytest.mark.parametrize(
     'setup_profiles',
@@ -1225,14 +1182,14 @@ setup_params_general = {
 @pytest.mark.Mhz160
 class TestThroughputUnderCombinationsBridge160MHz(object):
 
-
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.upstream
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss3_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput Bridge Mode
                    pytest -m "throughput_benchmark_test and bridge and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp "
                    jira-wifi-2578
@@ -1245,9 +1202,6 @@ class TestThroughputUnderCombinationsBridge160MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1258,7 +1212,8 @@ class TestThroughputUnderCombinationsBridge160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_up_nss3_udp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss3_udp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1280,8 +1235,9 @@ class TestThroughputUnderCombinationsBridge160MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss3_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput Bridge Mode
                            pytest -m "throughput_benchmark_test and bridge and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
                            jira-wifi-2567
@@ -1294,9 +1250,6 @@ class TestThroughputUnderCombinationsBridge160MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1307,7 +1260,8 @@ class TestThroughputUnderCombinationsBridge160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_down_nss3_udp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_down_nss3_udp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1329,332 +1283,7 @@ class TestThroughputUnderCombinationsBridge160MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "BRIDGE"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
-               ['bandw_options: 160'], ['spatial_streams: 3']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_bi_nss3_udp_bridge",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.upstream
-    @pytest.mark.nss3
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss3_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "BRIDGE"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
-               ['bandw_options: 160'], ['spatial_streams: 3']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_up_nss3_tcp_bridge",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.upstream
-    @pytest.mark.nss4
-    @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss4_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "BRIDGE"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_up_nss4_udp_bridge",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.downstream
-    @pytest.mark.nss4
-    @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss4_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Dataplane THroughput Bridge Mode
-                           pytest -m "throughput_benchmark_test and bridge and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
-                           jira-wifi-2567
-                """
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "BRIDGE"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: UDP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_down_nss4_udp_bridge",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.bidirectional
-    @pytest.mark.nss4
-    @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss4_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "BRIDGE"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_bi_nss4_udp_bridge",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.upstream
-    @pytest.mark.nss4
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss4_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "BRIDGE"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_up_nss4_tcp_bridge",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.downstream
-    @pytest.mark.nss4
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss4_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "BRIDGE"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: TCP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_down_nss4_tcp_bridge",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.bidirectional
-    @pytest.mark.nss4
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_bi_nss4_tcp(self, get_vif_state,
+    def test_client_wpa2_personal_5g_bi_nss3_udp(self, 
                                                  lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                  get_configuration):
 
@@ -1666,20 +1295,336 @@ class TestThroughputUnderCombinationsBridge160MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
         print("station", station)
 
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: TCP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 160'], ['spatial_streams: 3']]
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_bi_nss4_tcp_bridge",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_bi_nss3_udp_bridge",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.upstream
+    @pytest.mark.nss3
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_up_nss3_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "BRIDGE"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
+               ['bandw_options: 160'], ['spatial_streams: 3']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss3_tcp_bridge",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.upstream
+    @pytest.mark.nss4
+    @pytest.mark.udp
+    def test_client_wpa2_personal_5g_up_nss4_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "BRIDGE"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss4_udp_bridge",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.downstream
+    @pytest.mark.nss4
+    @pytest.mark.udp
+    def test_client_wpa2_personal_5g_down_nss4_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Dataplane THroughput Bridge Mode
+                           pytest -m "throughput_benchmark_test and bridge and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
+                           jira-wifi-2567
+                """
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "BRIDGE"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: UDP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_down_nss4_udp_bridge",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.bidirectional
+    @pytest.mark.nss4
+    @pytest.mark.udp
+    def test_client_wpa2_personal_5g_bi_nss4_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "BRIDGE"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_bi_nss4_udp_bridge",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.upstream
+    @pytest.mark.nss4
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_up_nss4_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "BRIDGE"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss4_tcp_bridge",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.downstream
+    @pytest.mark.nss4
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_down_nss4_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "BRIDGE"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: TCP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_down_nss4_tcp_bridge",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.bidirectional
+    @pytest.mark.nss4
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_bi_nss4_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "BRIDGE"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: TCP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_bi_nss4_tcp_bridge",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_nat_mode.py
index 0d7e67c4e..d3f6b6047 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_nat_mode.py
@@ -1,7 +1,7 @@
 """
 
-    Performance Test: throughput test under various combinations: nat Mode
-    pytest -m "throughput_benchmark_test and nat" -s -vvv --skip-testrail --testbed=basic-01
+    Performance Test: throughput test under various combinations: NAT Mode
+    pytest -m "throughput_benchmark_test and NAT" -s -vvv --skip-testrail --testbed=basic-01
 
 
 """
@@ -11,17 +11,11 @@ import time
 import pytest
 import allure
 
-pytestmark = [pytest.mark.throughput_benchmark_test, pytest.mark.nat] # pytest.mark.usefixtures("setup_test_run")]
-
+pytestmark = [pytest.mark.throughput_benchmark_test, pytest.mark.nat]
 
 setup_params_general = {
     "mode": "NAT",
     "ssid_modes": {
-        "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]},
-                 {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}],
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}],
         "wpa2_personal": [
             {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"},
             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
@@ -34,6 +28,7 @@ setup_params_general = {
     "radius": False
 }
 
+
 @allure.feature("NAT MODE CLIENT CONNECTIVITY")
 @pytest.mark.parametrize(
     'setup_profiles',
@@ -43,18 +38,18 @@ setup_params_general = {
 )
 @pytest.mark.usefixtures("setup_profiles")
 @pytest.mark.Mhz20
-class TestThroughputUnderCombinationsnat20MHz(object):
+class TestThroughputUnderCombinationsNAT20MHz(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_2g_up_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
-        """Dataplane THroughput nat Mode
-           pytest -m "throughput_benchmark_test and nat and wpa2_personal and twog and upstream "
+    def test_client_wpa2_personal_2g_up_nss2_udp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+        """Dataplane THroughput NAT Mode
+           pytest -m "throughput_benchmark_test and NAT and wpa2_personal and twog and upstream "
         """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -64,17 +59,15 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],['bandw_options: 20'], ['spatial_streams: 2']]
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP1_PERF_DPT_WPA2_2G_nat",
-                                       vlan_id=vlan, dut_name=dut_name,raw_lines=val)
+                                       instance_name="TIP1_PERF_DPT_WPA2_2G_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
             pdf = False
@@ -90,14 +83,14 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         else:
             assert False
 
-
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -107,28 +100,28 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
         print("station", station)
 
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'], ['bandw_options: 20'], ['spatial_streams: 2']]
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 20'], ['spatial_streams: 2']]
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_nat",
-                              vlan_id=vlan, dut_name=dut_name,raw_lines=val)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/"+report_name + '/')
+            entries = os.listdir("../reports/" + report_name + '/')
             pdf = False
             for i in entries:
                 if ".pdf" in i:
                     pdf = i
             if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf, name=get_configuration["access_point"][0]["model"] + "_dataplane")
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
             print("Test Completed... Cleaning up Stations")
             lf_test.Client_disconnect(station_name=station_names_fiveg)
             assert station
@@ -140,11 +133,11 @@ class TestThroughputUnderCombinationsnat20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_2g_down_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
-        """Dataplane THroughput nat Mode
-           pytest -m "throughput_benchmark_test and nat and wpa2_personal and twog and downstream "
+    def test_client_wpa2_personal_2g_down_nss2_udp(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Dataplane THroughput NAT Mode
+           pytest -m "throughput_benchmark_test and NAT and wpa2_personal and twog and downstream "
         """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -154,9 +147,6 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -164,7 +154,7 @@ class TestThroughputUnderCombinationsnat20MHz(object):
                ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G_down_nat",
+                                       instance_name="TIP_PERF_DPT_WPA2_2G_down_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -186,8 +176,9 @@ class TestThroughputUnderCombinationsnat20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss2_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -197,9 +188,6 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -210,7 +198,8 @@ class TestThroughputUnderCombinationsnat20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G__down_nat",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__down_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -232,11 +221,11 @@ class TestThroughputUnderCombinationsnat20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_2g_bi_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
-        """Dataplane THroughput nat Mode
-           pytest -m "throughput_benchmark_test and nat and wpa2_personal and twog and bidirectional "
+    def test_client_wpa2_personal_2g_bi_nss2_udp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+        """Dataplane THroughput NAT Mode
+           pytest -m "throughput_benchmark_test and NAT and wpa2_personal and twog and bidirectional "
         """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -246,9 +235,6 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -256,7 +242,7 @@ class TestThroughputUnderCombinationsnat20MHz(object):
                ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G_bidirectional_nat",
+                                       instance_name="TIP_PERF_DPT_WPA2_2G_bidirectional_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -278,8 +264,9 @@ class TestThroughputUnderCombinationsnat20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -289,9 +276,6 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -302,7 +286,8 @@ class TestThroughputUnderCombinationsnat20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_bi_nss2_udp_nat",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_bi_nss2_udp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -324,11 +309,11 @@ class TestThroughputUnderCombinationsnat20MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_up_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
-        """Dataplane THroughput nat Mode
-           pytest -m "throughput_benchmark_test and nat and wpa2_personal and twog and upstream and tcp "
+    def test_client_wpa2_personal_2g_up_nss2_tcp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+        """Dataplane THroughput NAT Mode
+           pytest -m "throughput_benchmark_test and NAT and wpa2_personal and twog and upstream and tcp "
         """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -338,9 +323,6 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -348,7 +330,7 @@ class TestThroughputUnderCombinationsnat20MHz(object):
                ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G__up_nss2_tcp_nat",
+                                       instance_name="TIP_PERF_DPT_WPA2_2G__up_nss2_tcp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -370,8 +352,9 @@ class TestThroughputUnderCombinationsnat20MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -381,9 +364,6 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -394,7 +374,8 @@ class TestThroughputUnderCombinationsnat20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G__up_nss2_tcp_nat",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__up_nss2_tcp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -416,11 +397,11 @@ class TestThroughputUnderCombinationsnat20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_down_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
-        """Dataplane THroughput nat Mode
-           pytest -m "throughput_benchmark_test and nat and wpa2_personal and twog and downstream and tcp"
+    def test_client_wpa2_personal_2g_down_nss2_tcp(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Dataplane THroughput NAT Mode
+           pytest -m "throughput_benchmark_test and NAT and wpa2_personal and twog and downstream and tcp"
            jira-WIFI-2564
         """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
@@ -431,9 +412,6 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -441,7 +419,7 @@ class TestThroughputUnderCombinationsnat20MHz(object):
                ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G__down_nss2_tcp_nat",
+                                       instance_name="TIP_PERF_DPT_WPA2_2G__down_nss2_tcp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -463,8 +441,9 @@ class TestThroughputUnderCombinationsnat20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss2_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -474,9 +453,6 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -487,7 +463,8 @@ class TestThroughputUnderCombinationsnat20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G__down_nss2_tcp_nat",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__down_nss2_tcp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -509,11 +486,11 @@ class TestThroughputUnderCombinationsnat20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
-        """Dataplane THroughput nat Mode
-           pytest -m "throughput_benchmark_test and nat and wpa2_personal and twog and bidirectional "
+    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+        """Dataplane THroughput NAT Mode
+           pytest -m "throughput_benchmark_test and NAT and wpa2_personal and twog and bidirectional "
         """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -523,9 +500,6 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -533,7 +507,7 @@ class TestThroughputUnderCombinationsnat20MHz(object):
                ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G__bi_nss2_tcp_nat",
+                                       instance_name="TIP_PERF_DPT_WPA2_2G__bi_nss2_tcp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -555,8 +529,9 @@ class TestThroughputUnderCombinationsnat20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_bi_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -566,9 +541,6 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -579,7 +551,8 @@ class TestThroughputUnderCombinationsnat20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G__bi_nss2_tcp_nat",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__bi_nss2_tcp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -596,14 +569,10 @@ class TestThroughputUnderCombinationsnat20MHz(object):
         else:
             assert False
 
+
 setup_params_general = {
     "mode": "NAT",
     "ssid_modes": {
-        "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]},
-                 {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}],
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}],
         "wpa2_personal": [
             {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"},
             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
@@ -616,6 +585,7 @@ setup_params_general = {
     "radius": False
 }
 
+
 @allure.feature("NAT MODE CLIENT CONNECTIVITY")
 @pytest.mark.parametrize(
     'setup_profiles',
@@ -625,18 +595,18 @@ setup_params_general = {
 )
 @pytest.mark.usefixtures("setup_profiles")
 @pytest.mark.Mhz80
-class TestThroughputUnderCombinationsnat80MHz(object):
-
+class TestThroughputUnderCombinationsNAT80MHz(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Dataplane THroughput nat Mode
-                   pytest -m "throughput_benchmark_test and nat and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp "
+    def test_client_wpa2_personal_5g_up_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+        """Dataplane THroughput NAT Mode
+                   pytest -m "throughput_benchmark_test and NAT and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp "
                    jira-wifi-2566
         """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
@@ -647,9 +617,6 @@ class TestThroughputUnderCombinationsnat80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -660,7 +627,8 @@ class TestThroughputUnderCombinationsnat80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__up_nss2_udp_nat",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__up_nss2_udp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -682,23 +650,21 @@ class TestThroughputUnderCombinationsnat80MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss2_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput NAT Mode
-                           pytest -m "throughput_benchmark_test and nat and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
+                           pytest -m "throughput_benchmark_test and NAT and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
                            jira-wifi-2567
                 """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
         security = "wpa2"
-        mode = "nat"
+        mode = "NAT"
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -709,289 +675,8 @@ class TestThroughputUnderCombinationsnat80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__down_nss2_udp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.bidirectional
-    @pytest.mark.nss2
-    @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss2_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
-               ['bandw_options: 80'], ['spatial_streams: 2']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__bi_nss2_udp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.upstream
-    @pytest.mark.nss2
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
-               ['bandw_options: 80'], ['spatial_streams: 2']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80_up_nss2_tcp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.downstream
-    @pytest.mark.nss2
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: TCP'],
-               ['bandw_options: 80'], ['spatial_streams: 2']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80_down_nss2_tcp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.bidirectional
-    @pytest.mark.nss2
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                     get_configuration):
-        """Dataplane THroughput nat Mode
-           pytest -m "throughput_benchmark_test and nat and wpa2_personal and twog and bidirectional "
-        """
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: TCP'],
-               ['bandw_options: 80'], ['spatial_streams: 2']]
-        if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G_80_bi_nss2_tcp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.upstream
-    @pytest.mark.nss3
-    @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Dataplane THroughput nat Mode
-                   pytest -m "throughput_benchmark_test and nat and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp and nss3"
-                   jira-wifi-2572
-        """
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
-               ['bandw_options: 80'], ['spatial_streams: 3']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__up_nss3_udp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.downstream
-    @pytest.mark.nss3
-    @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Dataplane THroughput nat Mode
-                           pytest -m "throughput_benchmark_test and nat and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp and nss3 "
-                           jira-wifi-2573
-                """
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: UDP'],
-               ['bandw_options: 80'], ['spatial_streams: 3']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__down_nss3_udp_nat",
+                                       instance_name="TIP3_DPT_WPA2_5G_80__down_nss2_udp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1011,147 +696,418 @@ class TestThroughputUnderCombinationsnat80MHz(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.bidirectional
-    @pytest.mark.nss3
+    @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
-               ['bandw_options: 80'], ['spatial_streams: 3']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__bi_nss3_udp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.upstream
-    @pytest.mark.nss3
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss3_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
-               ['bandw_options: 80'], ['spatial_streams: 3']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80__up_nss3_tcp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.downstream
-    @pytest.mark.nss3
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss3_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: TCP'],
-               ['bandw_options: 80'], ['spatial_streams: 3']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80_down_nss3_tcp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.bidirectional
-    @pytest.mark.nss3
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_bi_nss3_tcp(self, get_vif_state,
+    def test_client_wpa2_personal_5g_bi_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 80'], ['spatial_streams: 2']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__bi_nss2_udp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.upstream
+    @pytest.mark.nss2
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_up_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
+               ['bandw_options: 80'], ['spatial_streams: 2']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_up_nss2_tcp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.downstream
+    @pytest.mark.nss2
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_down_nss2_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: TCP'],
+               ['bandw_options: 80'], ['spatial_streams: 2']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_down_nss2_tcp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.bidirectional
+    @pytest.mark.nss2
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+        """Dataplane THroughput NAT Mode
+           pytest -m "throughput_benchmark_test and NAT and wpa2_personal and twog and bidirectional "
+        """
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: TCP'],
+               ['bandw_options: 80'], ['spatial_streams: 2']]
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G_80_bi_nss2_tcp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.upstream
+    @pytest.mark.nss3
+    @pytest.mark.udp
+    def test_client_wpa2_personal_5g_up_nss3_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+        """Dataplane THroughput NAT Mode
+                   pytest -m "throughput_benchmark_test and NAT and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp and nss3"
+                   jira-wifi-2572
+        """
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 80'], ['spatial_streams: 3']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__up_nss3_udp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.downstream
+    @pytest.mark.nss3
+    @pytest.mark.udp
+    def test_client_wpa2_personal_5g_down_nss3_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Dataplane THroughput NAT Mode
+                           pytest -m "throughput_benchmark_test and NAT and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp and nss3 "
+                           jira-wifi-2573
+                """
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: UDP'],
+               ['bandw_options: 80'], ['spatial_streams: 3']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__down_nss3_udp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.bidirectional
+    @pytest.mark.nss3
+    @pytest.mark.udp
+    def test_client_wpa2_personal_5g_bi_nss3_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 80'], ['spatial_streams: 3']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__bi_nss3_udp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.upstream
+    @pytest.mark.nss3
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_up_nss3_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
+               ['bandw_options: 80'], ['spatial_streams: 3']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__up_nss3_tcp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.downstream
+    @pytest.mark.nss3
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_down_nss3_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: TCP'],
+               ['bandw_options: 80'], ['spatial_streams: 3']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_down_nss3_tcp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.bidirectional
+    @pytest.mark.nss3
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_bi_nss3_tcp(self, 
                                                  lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                  get_configuration):
 
@@ -1163,9 +1119,6 @@ class TestThroughputUnderCombinationsnat80MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1176,7 +1129,8 @@ class TestThroughputUnderCombinationsnat80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_80_bi_nss3_tcp_nat",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_bi_nss3_tcp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1197,11 +1151,6 @@ class TestThroughputUnderCombinationsnat80MHz(object):
 setup_params_general = {
     "mode": "NAT",
     "ssid_modes": {
-        "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]},
-                 {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}],
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}],
         "wpa2_personal": [
             {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"},
             {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
@@ -1214,6 +1163,7 @@ setup_params_general = {
     "radius": False
 }
 
+
 @allure.feature("NAT MODE CLIENT CONNECTIVITY")
 @pytest.mark.parametrize(
     'setup_profiles',
@@ -1223,18 +1173,18 @@ setup_params_general = {
 )
 @pytest.mark.usefixtures("setup_profiles")
 @pytest.mark.Mhz160
-class TestThroughputUnderCombinationsnat160MHz(object):
-
+class TestThroughputUnderCombinationsNAT160MHz(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.upstream
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Dataplane THroughput nat Mode
-                   pytest -m "throughput_benchmark_test and nat and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp "
+    def test_client_wpa2_personal_5g_up_nss3_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+        """Dataplane THroughput NAT Mode
+                   pytest -m "throughput_benchmark_test and NAT and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp "
                    jira-wifi-2578
         """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
@@ -1245,9 +1195,6 @@ class TestThroughputUnderCombinationsnat160MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1258,7 +1205,8 @@ class TestThroughputUnderCombinationsnat160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_up_nss3_udp_nat",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss3_udp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1280,10 +1228,11 @@ class TestThroughputUnderCombinationsnat160MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Dataplane THroughput nat Mode
-                           pytest -m "throughput_benchmark_test and nat and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
+    def test_client_wpa2_personal_5g_down_nss3_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Dataplane THroughput NAT Mode
+                           pytest -m "throughput_benchmark_test and NAT and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
                            jira-wifi-2567
                 """
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
@@ -1294,9 +1243,6 @@ class TestThroughputUnderCombinationsnat160MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1307,7 +1253,8 @@ class TestThroughputUnderCombinationsnat160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_down_nss3_udp_nat",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_down_nss3_udp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1329,332 +1276,7 @@ class TestThroughputUnderCombinationsnat160MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss3_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
-               ['bandw_options: 160'], ['spatial_streams: 3']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_bi_nss3_udp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.upstream
-    @pytest.mark.nss3
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss3_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
-               ['bandw_options: 160'], ['spatial_streams: 3']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_up_nss3_tcp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.upstream
-    @pytest.mark.nss4
-    @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss4_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_up_nss4_udp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.downstream
-    @pytest.mark.nss4
-    @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss4_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Dataplane THroughput nat Mode
-                           pytest -m "throughput_benchmark_test and nat and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
-                           jira-wifi-2567
-                """
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: UDP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_down_nss4_udp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.bidirectional
-    @pytest.mark.nss4
-    @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss4_udp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_bi_nss4_udp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.upstream
-    @pytest.mark.nss4
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss4_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_up_nss4_tcp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.downstream
-    @pytest.mark.nss4
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss4_tcp(self, get_vif_state,
-                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
-        ssid_name = profile_data["ssid_name"]
-        security_key = profile_data["security_key"]
-        security = "wpa2"
-        mode = "NAT"
-        band = "fiveg"
-        vlan = 1
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
-                                         passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_fiveg, vlan_id=vlan)
-        print("station", station)
-
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: TCP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
-
-        if station:
-            time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_down_nss4_tcp_nat",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
-            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fiveg)
-            assert station
-        else:
-            assert False
-
-    @pytest.mark.wpa2_personal
-    @pytest.mark.fiveg
-    @pytest.mark.bidirectional
-    @pytest.mark.nss4
-    @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_bi_nss4_tcp(self, get_vif_state,
+    def test_client_wpa2_personal_5g_bi_nss3_udp(self, 
                                                  lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                  get_configuration):
 
@@ -1666,20 +1288,336 @@ class TestThroughputUnderCombinationsnat160MHz(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
         print("station", station)
 
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: TCP'],
-               ['bandw_options: 160'], ['spatial_streams: 4']]
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 160'], ['spatial_streams: 3']]
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G_160_bi_nss4_tcp_nat",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_bi_nss3_udp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.upstream
+    @pytest.mark.nss3
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_up_nss3_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
+               ['bandw_options: 160'], ['spatial_streams: 3']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss3_tcp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.upstream
+    @pytest.mark.nss4
+    @pytest.mark.udp
+    def test_client_wpa2_personal_5g_up_nss4_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss4_udp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.downstream
+    @pytest.mark.nss4
+    @pytest.mark.udp
+    def test_client_wpa2_personal_5g_down_nss4_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Dataplane THroughput NAT Mode
+                           pytest -m "throughput_benchmark_test and NAT and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
+                           jira-wifi-2567
+                """
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: UDP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_down_nss4_udp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.bidirectional
+    @pytest.mark.nss4
+    @pytest.mark.udp
+    def test_client_wpa2_personal_5g_bi_nss4_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_bi_nss4_udp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.upstream
+    @pytest.mark.nss4
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_up_nss4_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: TCP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss4_tcp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.downstream
+    @pytest.mark.nss4
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_down_nss4_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit'], ['traffic_types: TCP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_down_nss4_tcp_NAT",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.bidirectional
+    @pytest.mark.nss4
+    @pytest.mark.tcp
+    def test_client_wpa2_personal_5g_bi_nss4_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
+
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+                                         passkey=security_key, mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+        print("station", station)
+
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: TCP'],
+               ['bandw_options: 160'], ['spatial_streams: 4']]
+
+        if station:
+            time.sleep(3)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_bi_nss4_tcp_NAT",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_vlan_mode.py
index 117339383..b70262181 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/tcp_udp_upstream_downstream_bidirection_throughput_test/wpa2_personal/test_vlan_mode.py
@@ -1,7 +1,7 @@
 """
 
     Performance Test: throughput test under various combinations: VLAN Mode
-    pytest -m "throughput_benchmark_test and vlan" -s -vvv --skip-testrail --testbed=basic-01
+    pytest -m "throughput_benchmark_test and VLAN" -s -vvv --skip-testrail --testbed=basic-01
 
 
 """
@@ -11,21 +11,20 @@ import time
 import pytest
 import allure
 
-pytestmark = [pytest.mark.throughput_benchmark_test, pytest.mark.vlan, pytest.mark.usefixtures("setup_test_run")]
-
+pytestmark = [pytest.mark.throughput_benchmark_test, pytest.mark.vlan]
 
 setup_params_general = {
     "mode": "VLAN",
     "ssid_modes": {
-        "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"],"vlan":100},
-                 {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}],
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something", "vlan": 125},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}],
         "wpa2_personal": [
-            {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something","vlan": 150},
-            {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
-             "security_key": "something"}]},
+            {"ssid_name": "ssid_wpa2_2g",
+             "appliedRadios": ["2G"],
+             "security_key": "something",
+             "vlan": 100},
+            {"ssid_name": "ssid_wpa2_5g",
+             "appliedRadios": ["5G"],
+             "security_key": "something",
+             "vlan": 100}]},
     "rf": {
         "is5GHz": {"channelBandwidth": "is20MHz"},
         "is5GHzL": {"channelBandwidth": "is20MHz"},
@@ -34,35 +33,26 @@ setup_params_general = {
     "radius": False
 }
 
+
 @allure.feature("VLAN MODE CLIENT CONNECTIVITY")
-@pytest.mark.vlan1
 @pytest.mark.parametrize(
     'setup_profiles',
     [setup_params_general],
     indirect=True,
     scope="class"
 )
-
-@pytest.mark.parametrize(
-    "create_vlan",
-    [setup_params_general],
-    indirect=True,
-    scope="class"
-)
-@pytest.mark.usefixtures("setup_profiles", "create_vlan")
-
-
+@pytest.mark.usefixtures("setup_profiles")
 @pytest.mark.Mhz20
-class TestThroughputUnderCombinationsVlan20MHz(object):
+class TestThroughputUnderCombinationsVLAN20MHz(object):
 
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_2g_up_nss2_udp(self, get_vif_state,
-                                     lf_test,  station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_up_nss2_udp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput VLAN Mode
            pytest -m "throughput_benchmark_test and VLAN and wpa2_personal and twog and upstream "
         """
@@ -72,19 +62,17 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "twog"
-        vlan = profile_data["vlan"]
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],['bandw_options: 20'], ['spatial_streams: 2']]
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
-                                       vlan_id=vlan, dut_name=dut_name,raw_lines=val)
+                                       instance_name="TIP1_PERF_DPT_WPA2_2G_VLAN",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
             pdf = False
@@ -100,14 +88,14 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         else:
             assert False
 
-
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss2_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -115,30 +103,30 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
         print("station", station)
 
-        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'], ['bandw_options: 20'], ['spatial_streams: 2']]
+        val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Receive'], ['traffic_types: UDP'],
+               ['bandw_options: 20'], ['spatial_streams: 2']]
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
-                              vlan_id=vlan, dut_name=dut_name,raw_lines=val)
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_VLAN",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/"+report_name + '/')
+            entries = os.listdir("../reports/" + report_name + '/')
             pdf = False
             for i in entries:
                 if ".pdf" in i:
                     pdf = i
             if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf, name=get_configuration["access_point"][0]["model"] + "_dataplane")
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
             print("Test Completed... Cleaning up Stations")
             lf_test.Client_disconnect(station_name=station_names_fiveg)
             assert station
@@ -150,9 +138,9 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_2g_down_nss2_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_down_nss2_udp(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput VLAN Mode
            pytest -m "throughput_benchmark_test and VLAN and wpa2_personal and twog and downstream "
         """
@@ -162,11 +150,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "twog"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -174,7 +159,7 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
                ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       instance_name="TIP_PERF_DPT_WPA2_2G_down_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -196,8 +181,9 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss2_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss2_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -205,11 +191,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -220,7 +203,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__down_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -242,9 +226,9 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_2g_bi_nss2_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_bi_nss2_udp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput VLAN Mode
            pytest -m "throughput_benchmark_test and VLAN and wpa2_personal and twog and bidirectional "
         """
@@ -254,11 +238,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "twog"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -266,7 +247,7 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
                ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       instance_name="TIP_PERF_DPT_WPA2_2G_bidirectional_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -288,8 +269,9 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss2_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -297,11 +279,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -312,7 +291,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_bi_nss2_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -334,9 +314,9 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_up_nss2_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_up_nss2_tcp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput VLAN Mode
            pytest -m "throughput_benchmark_test and VLAN and wpa2_personal and twog and upstream and tcp "
         """
@@ -346,11 +326,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "twog"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -358,7 +335,7 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
                ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       instance_name="TIP_PERF_DPT_WPA2_2G__up_nss2_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -380,8 +357,9 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss2_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -389,11 +367,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -404,7 +379,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__up_nss2_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -426,9 +402,9 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_down_nss2_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_down_nss2_tcp(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput VLAN Mode
            pytest -m "throughput_benchmark_test and VLAN and wpa2_personal and twog and downstream and tcp"
            jira-WIFI-2564
@@ -439,11 +415,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "twog"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -451,7 +424,7 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
                ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       instance_name="TIP_PERF_DPT_WPA2_2G__down_nss2_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -473,8 +446,9 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss2_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss2_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -482,11 +456,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -497,7 +468,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__down_nss2_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -519,9 +491,9 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, get_vif_state,
-                                     lf_test, create_vlan , station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, 
+                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput VLAN Mode
            pytest -m "throughput_benchmark_test and VLAN and wpa2_personal and twog and bidirectional "
         """
@@ -531,11 +503,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "twog"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -543,7 +512,7 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
                ['bandw_options: 20'], ['spatial_streams: 2']]
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       instance_name="TIP_PERF_DPT_WPA2_2G__bi_nss2_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -565,8 +534,9 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_bi_nss2_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -574,11 +544,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -589,7 +556,8 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G__bi_nss2_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -606,18 +574,19 @@ class TestThroughputUnderCombinationsVlan20MHz(object):
         else:
             assert False
 
+
 setup_params_general = {
     "mode": "VLAN",
     "ssid_modes": {
-        "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]},
-                 {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}],
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}],
         "wpa2_personal": [
-            {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something","vlan": 100},
-            {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
-             "security_key": "something","vlan": 100}]},
+            {"ssid_name": "ssid_wpa2_2g",
+             "appliedRadios": ["2G"],
+             "security_key": "something",
+             "vlan": 100},
+            {"ssid_name": "ssid_wpa2_5g",
+             "appliedRadios": ["5G"],
+             "security_key": "something",
+             "vlan": 100}]},
     "rf": {
         "is5GHz": {"channelBandwidth": "is80MHz"},
         "is5GHzL": {"channelBandwidth": "is80MHz"},
@@ -626,6 +595,7 @@ setup_params_general = {
     "radius": False
 }
 
+
 @allure.feature("VLAN MODE CLIENT CONNECTIVITY")
 @pytest.mark.parametrize(
     'setup_profiles',
@@ -634,25 +604,17 @@ setup_params_general = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-@pytest.mark.parametrize(
-    "create_vlan",
-    [setup_params_general],
-    indirect=True,
-    scope="class"
-)
-@pytest.mark.usefixtures("create_vlan")
-
 @pytest.mark.Mhz80
 class TestThroughputUnderCombinationsVLAN80MHz(object):
 
-
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss2_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput VLAN Mode
                    pytest -m "throughput_benchmark_test and VLAN and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp "
                    jira-wifi-2566
@@ -663,11 +625,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -678,7 +637,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__up_nss2_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -700,8 +660,9 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss2_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss2_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput VLAN Mode
                            pytest -m "throughput_benchmark_test and VLAN and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
                            jira-wifi-2567
@@ -712,11 +673,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -727,7 +685,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__down_nss2_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -749,8 +708,9 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss2_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss2_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -758,11 +718,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -773,7 +730,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__bi_nss2_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -795,8 +753,9 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss2_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -804,11 +763,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -819,7 +775,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_up_nss2_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -841,8 +798,9 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss2_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss2_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -850,11 +808,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -865,7 +820,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_down_nss2_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -883,35 +839,32 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
             assert False
 
     @pytest.mark.wpa2_personal
-    @pytest.mark.twog
+    @pytest.mark.fiveg
     @pytest.mark.bidirectional
     @pytest.mark.nss2
     @pytest.mark.tcp
-    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_twog, create_lanforge_chamberview_dut,
-                                     get_configuration):
+    def test_client_wpa2_personal_2g_bi_nss2_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput VLAN Mode
            pytest -m "throughput_benchmark_test and VLAN and wpa2_personal and twog and bidirectional "
         """
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
+        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
         security = "wpa2"
         mode = "VLAN"
-        band = "twog"
-        vlan =100
+        band = "fiveg"
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
-                                         station_name=station_names_twog, vlan_id=vlan)
+                                         station_name=station_names_fiveg, vlan_id=vlan)
         val = [['pkts: 60'], ['cust_pkt_sz: 88 '], ['directions: DUT Transmit;DUT Receive'], ['traffic_types: TCP'],
                ['bandw_options: 80'], ['spatial_streams: 2']]
         if station:
-            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G_80_bi_nss2_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -923,7 +876,7 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
                 allure.attach.file(source="../reports/" + report_name + "/" + pdf,
                                    name=get_configuration["access_point"][0]["model"] + "_dataplane")
             print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_twog)
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
             assert station
         else:
             assert False
@@ -933,8 +886,9 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss3_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss3_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput VLAN Mode
                    pytest -m "throughput_benchmark_test and VLAN and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp and nss3"
                    jira-wifi-2572
@@ -945,11 +899,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -960,7 +911,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__up_nss3_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -982,8 +934,9 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss3_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss3_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput VLAN Mode
                            pytest -m "throughput_benchmark_test and VLAN and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp and nss3 "
                            jira-wifi-2573
@@ -994,11 +947,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1009,7 +959,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__down_nss3_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1031,8 +982,9 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss3_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss3_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1040,11 +992,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1055,7 +1004,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__bi_nss3_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1077,8 +1027,9 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss3
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss3_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss3_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1086,11 +1037,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1101,7 +1049,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80__up_nss3_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1123,8 +1072,9 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss3
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss3_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss3_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1132,11 +1082,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1147,7 +1094,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_down_nss3_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1169,8 +1117,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss3
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_bi_nss3_tcp(self, get_vif_state,
-                                                 lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut,
+    def test_client_wpa2_personal_5g_bi_nss3_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                  get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
@@ -1179,11 +1127,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1194,7 +1139,8 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_80_bi_nss3_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1215,15 +1161,11 @@ class TestThroughputUnderCombinationsVLAN80MHz(object):
 setup_params_general = {
     "mode": "VLAN",
     "ssid_modes": {
-        "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]},
-                 {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}],
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}],
         "wpa2_personal": [
-            {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something","vlan": 100},
-            {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
-             "security_key": "something","vlan": 100}]},
+            {"ssid_name": "ssid_wpa2_5g",
+             "appliedRadios": ["5G"],
+             "security_key": "something",
+             "vlan": 100}]},
     "rf": {
         "is5GHz": {"channelBandwidth": "is160MHz"},
         "is5GHzL": {"channelBandwidth": "is160MHz"},
@@ -1232,6 +1174,7 @@ setup_params_general = {
     "radius": False
 }
 
+
 @allure.feature("VLAN MODE CLIENT CONNECTIVITY")
 @pytest.mark.parametrize(
     'setup_profiles',
@@ -1240,25 +1183,17 @@ setup_params_general = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-@pytest.mark.parametrize(
-    "create_vlan",
-    [setup_params_general],
-    indirect=True,
-    scope="class"
-)
-@pytest.mark.usefixtures("create_vlan")
-
 @pytest.mark.Mhz160
 class TestThroughputUnderCombinationsVLAN160MHz(object):
 
-
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.upstream
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss3_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss3_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
         """Dataplane THroughput VLAN Mode
                    pytest -m "throughput_benchmark_test and VLAN and Mhz80 and wpa2_personal and fiveg and upstream and nss2 and udp "
                    jira-wifi-2578
@@ -1269,11 +1204,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1284,7 +1216,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss3_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1306,8 +1239,9 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss3_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss3_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput VLAN Mode
                            pytest -m "throughput_benchmark_test and VLAN and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
                            jira-wifi-2567
@@ -1318,11 +1252,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1333,7 +1264,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_down_nss3_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1355,8 +1287,9 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss3
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss3_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss3_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1364,11 +1297,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1379,7 +1309,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_bi_nss3_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1401,8 +1332,9 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss3
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss3_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss3_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1410,11 +1342,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1425,7 +1354,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss3_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1447,8 +1377,9 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss4
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_up_nss4_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss4_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1456,11 +1387,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1471,7 +1399,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss4_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1493,8 +1422,9 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss4
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_down_nss4_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss4_udp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Dataplane THroughput VLAN Mode
                            pytest -m "throughput_benchmark_test and VLAN and Mhz80 and wpa2_personal and fiveg and downstream and nss2 and udp "
                            jira-wifi-2567
@@ -1505,11 +1435,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1520,7 +1447,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_down_nss4_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1542,8 +1470,9 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss4
     @pytest.mark.udp
-    def test_client_wpa2_personal_5g_bi_nss4_udp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_bi_nss4_udp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1551,11 +1480,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1566,7 +1492,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_bi_nss4_udp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1588,8 +1515,9 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
     @pytest.mark.upstream
     @pytest.mark.nss4
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_up_nss4_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_up_nss4_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                 get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1597,11 +1525,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1612,7 +1537,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_up_nss4_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1634,8 +1560,9 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
     @pytest.mark.downstream
     @pytest.mark.nss4
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_down_nss4_tcp(self, get_vif_state,
-                                     lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
+    def test_client_wpa2_personal_5g_down_nss4_tcp(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -1643,11 +1570,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1658,7 +1582,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_down_nss4_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -1680,8 +1605,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
     @pytest.mark.bidirectional
     @pytest.mark.nss4
     @pytest.mark.tcp
-    def test_client_wpa2_personal_5g_bi_nss4_tcp(self, get_vif_state,
-                                                 lf_test, create_vlan, station_names_fiveg, create_lanforge_chamberview_dut,
+    def test_client_wpa2_personal_5g_bi_nss4_tcp(self, 
+                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                  get_configuration):
 
         profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][1]
@@ -1690,11 +1615,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan =100
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -1705,7 +1627,8 @@ class TestThroughputUnderCombinationsVLAN160MHz(object):
 
         if station:
             time.sleep(3)
-            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode, instance_name="TIP3_DPT_WPA2_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP3_DPT_WPA2_5G_160_bi_nss4_tcp_VLAN",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=val)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_bridge_mode.py
index 700c5b154..002d99ea9 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_bridge_mode.py
@@ -8,8 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.throughput_across_bw_test, pytest.mark.Bridge,
-              pytest.mark.usefixtures("setup_test_run")]
+pytestmark = [pytest.mark.throughput_across_bw_test, pytest.mark.bridge]
 raw_lines = [['pkts: %s' % 1],
                          ['directions: DUT Transmit;DUT Receive'],
                          ['bandw_options: %s' % 1],
@@ -47,7 +46,7 @@ class TestThroughputAcrossBw20MhzBRIDGE(object):
     @pytest.mark.bw20Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
         """Throughput Across Bw Bridge Mode
@@ -61,9 +60,6 @@ class TestThroughputAcrossBw20MhzBRIDGE(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -91,7 +87,7 @@ class TestThroughputAcrossBw20MhzBRIDGE(object):
     @pytest.mark.bw20Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
         """Throughput Across Bw Bridge Mode
            pytest -m "throughput_across_bw_test and Bridge and wpa2_personal and fiveg"
@@ -104,9 +100,6 @@ class TestThroughputAcrossBw20MhzBRIDGE(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -162,7 +155,7 @@ class TestThroughputAcrossBw40MhzBRIDGE(object):
     @pytest.mark.bw40Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
         """Throughput Across Bw Bridge Mode
@@ -176,9 +169,6 @@ class TestThroughputAcrossBw40MhzBRIDGE(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -206,7 +196,7 @@ class TestThroughputAcrossBw40MhzBRIDGE(object):
     @pytest.mark.bw40Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
         """Throughput Across Bw Bridge Mode
            pytest -m "throughput_across_bw_test and Bridge and wpa2_personal and fiveg"
@@ -219,9 +209,6 @@ class TestThroughputAcrossBw40MhzBRIDGE(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -276,7 +263,7 @@ class TestThroughputAcrossBw80MhzBRIDGE(object):
     @pytest.mark.bw80Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
         """Throughput Across Bw Bridge Mode
@@ -290,9 +277,6 @@ class TestThroughputAcrossBw80MhzBRIDGE(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -320,7 +304,7 @@ class TestThroughputAcrossBw80MhzBRIDGE(object):
     @pytest.mark.bw80Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
         """Throughput Across Bw Bridge Mode
            pytest -m "throughput_across_bw_test and Bridge and wpa2_personal and fiveg"
@@ -333,9 +317,6 @@ class TestThroughputAcrossBw80MhzBRIDGE(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -391,7 +372,7 @@ class TestThroughputAcrossBw160MhzBRIDGE(object):
     @pytest.mark.bw160Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
         """Throughput Across Bw Bridge Mode
@@ -405,9 +386,6 @@ class TestThroughputAcrossBw160MhzBRIDGE(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -435,7 +413,7 @@ class TestThroughputAcrossBw160MhzBRIDGE(object):
     @pytest.mark.bw160Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
         """Throughput Across Bw Bridge Mode
            pytest -m "throughput_across_bw_test and Bridge and wpa2_personal and fiveg"
@@ -448,9 +426,6 @@ class TestThroughputAcrossBw160MhzBRIDGE(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_nat_mode.py
index 0e521a837..680a82458 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_nat_mode.py
@@ -1,15 +1,19 @@
 """
 
-    Performance Test: Throughput  Across Bandwidth Test: nat Mode
-    pytest -m "throughput_across_bw_test and nat"
+    Performance Test: Throughput  Across Bandwidth Test: NAT Mode
+    pytest -m "throughput_across_bw_test and NAT"
 
 """
 import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.throughput_across_bw_test, pytest.mark.nat,
-              pytest.mark.usefixtures("setup_test_run")]
+pytestmark = [pytest.mark.throughput_across_bw_test, pytest.mark.nat]
+raw_lines = [['pkts: %s' % 1],
+                         ['directions: DUT Transmit;DUT Receive'],
+                         ['bandw_options: %s' % 1],
+                         ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                         ["show_ll_graphs: 1"], ["show_log: 1"]]
 
 setup_params_general_20Mhz = {
     "mode": "NAT",
@@ -35,18 +39,18 @@ setup_params_general_20Mhz = {
 )
 @pytest.mark.usefixtures("setup_profiles")
 class TestThroughputAcrossBw20MhzNAT(object):
-    """Throughput Across Bw nat Mode
-       pytest -m "throughput_across_bw_test and nat"
+    """Throughput Across Bw NAT Mode
+       pytest -m "throughput_across_bw_test and NAT"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2556", name="WIFI-2556")
     @pytest.mark.bw20Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Across Bw nat Mode
-           pytest -m "throughput_across_bw_test and nat and wpa2_personal and twog"
+        """Throughput Across Bw NAT Mode
+           pytest -m "throughput_across_bw_test and NAT and wpa2_personal and twog"
         """
         profile_data = setup_params_general_20Mhz["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -56,9 +60,6 @@ class TestThroughputAcrossBw20MhzNAT(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -81,14 +82,15 @@ class TestThroughputAcrossBw20MhzNAT(object):
             assert station
         else:
             assert False
+
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2556", name="WIFI-2556")
     @pytest.mark.bw20Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Throughput Across Bw nat Mode
-           pytest -m "throughput_across_bw_test and nat and wpa2_personal and fiveg"
+        """Throughput Across Bw NAT Mode
+           pytest -m "throughput_across_bw_test and NAT and wpa2_personal and fiveg"
         """
         profile_data = setup_params_general_40Mhz["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -98,9 +100,6 @@ class TestThroughputAcrossBw20MhzNAT(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -149,18 +148,18 @@ setup_params_general_40Mhz = {
 )
 @pytest.mark.usefixtures("setup_profiles")
 class TestThroughputAcrossBw40MhzNAT(object):
-    """Throughput Across Bw nat Mode
-       pytest -m "throughput_across_bw_test and nat"
+    """Throughput Across Bw NAT Mode
+       pytest -m "throughput_across_bw_test and NAT"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2557", name="WIFI-2557")
     @pytest.mark.bw40Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Across Bw nat Mode
-           pytest -m "throughput_across_bw_test and nat and wpa2_personal and twog"
+        """Throughput Across Bw NAT Mode
+           pytest -m "throughput_across_bw_test and NAT and wpa2_personal and twog"
         """
         profile_data = setup_params_general_80Mhz["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -170,9 +169,6 @@ class TestThroughputAcrossBw40MhzNAT(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -200,10 +196,10 @@ class TestThroughputAcrossBw40MhzNAT(object):
     @pytest.mark.bw40Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Throughput Across Bw nat Mode
-           pytest -m "throughput_across_bw_test and nat and wpa2_personal and fiveg"
+        """Throughput Across Bw NAT Mode
+           pytest -m "throughput_across_bw_test and NAT and wpa2_personal and fiveg"
         """
         profile_data = setup_params_general_80Mhz["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -213,9 +209,6 @@ class TestThroughputAcrossBw40MhzNAT(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -263,18 +256,18 @@ setup_params_general_80Mhz = {
 )
 @pytest.mark.usefixtures("setup_profiles")
 class TestThroughputAcrossBw80MhzNAT(object):
-    """Throughput Across Bw nat Mode
-       pytest -m "throughput_across_bw_test and nat"
+    """Throughput Across Bw NAT Mode
+       pytest -m "throughput_across_bw_test and NAT"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2558", name="WIFI-2558")
     @pytest.mark.bw80Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Across Bw nat Mode
-           pytest -m "throughput_across_bw_test and nat and wpa2_personal and twog"
+        """Throughput Across Bw NAT Mode
+           pytest -m "throughput_across_bw_test and NAT and wpa2_personal and twog"
         """
         profile_data = setup_params_general_80Mhz["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -284,9 +277,6 @@ class TestThroughputAcrossBw80MhzNAT(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -314,10 +304,10 @@ class TestThroughputAcrossBw80MhzNAT(object):
     @pytest.mark.bw80Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Throughput Across Bw nat Mode
-           pytest -m "throughput_across_bw_test and nat and wpa2_personal and fiveg"
+        """Throughput Across Bw NAT Mode
+           pytest -m "throughput_across_bw_test and NAT and wpa2_personal and fiveg"
         """
         profile_data = setup_params_general_80Mhz["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -327,9 +317,6 @@ class TestThroughputAcrossBw80MhzNAT(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -378,18 +365,18 @@ setup_params_general_160Mhz = {
 )
 @pytest.mark.usefixtures("setup_profiles")
 class TestThroughputAcrossBw160MhzNAT(object):
-    """Throughput Across Bw nat Mode
-       pytest -m "throughput_across_bw_test and nat"
+    """Throughput Across Bw NAT Mode
+       pytest -m "throughput_across_bw_test and NAT"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2559", name="WIFI-2559")
     @pytest.mark.bw160Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Across Bw nat Mode
-           pytest -m "throughput_across_bw_test and nat and wpa2_personal and twog"
+        """Throughput Across Bw NAT Mode
+           pytest -m "throughput_across_bw_test and NAT and wpa2_personal and twog"
         """
         profile_data = setup_params_general_160Mhz["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -399,9 +386,6 @@ class TestThroughputAcrossBw160MhzNAT(object):
         band = "twog"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -429,10 +413,10 @@ class TestThroughputAcrossBw160MhzNAT(object):
     @pytest.mark.bw160Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Throughput Across Bw nat Mode
-           pytest -m "throughput_across_bw_test and nat and wpa2_personal and fiveg"
+        """Throughput Across Bw NAT Mode
+           pytest -m "throughput_across_bw_test and NAT and wpa2_personal and fiveg"
         """
         profile_data = setup_params_general_160Mhz["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -442,9 +426,6 @@ class TestThroughputAcrossBw160MhzNAT(object):
         band = "fiveg"
         vlan = 1
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_vlan_mode.py
index 8c762fac0..b890251de 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_across_channel_bw/test_vlan_mode.py
@@ -1,15 +1,19 @@
 """
 
-    Performance Test: Throughput Across Bandwidth Test: vlan Mode
-    pytest -m "throughput_across_bw_test and vlan"
+    Performance Test: Throughput  Across Bandwidth Test: VLAN Mode
+    pytest -m "throughput_across_bw_test and VLAN"
 
 """
 import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.throughput_across_bw_test, pytest.mark.vlan,
-              pytest.mark.usefixtures("setup_test_run")]
+pytestmark = [pytest.mark.throughput_across_bw_test, pytest.mark.vlan]
+raw_lines = [['pkts: %s' % 1],
+                         ['directions: DUT Transmit;DUT Receive'],
+                         ['bandw_options: %s' % 1],
+                         ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                         ["show_ll_graphs: 1"], ["show_log: 1"]]
 
 setup_params_general_20Mhz = {
     "mode": "VLAN",
@@ -35,18 +39,18 @@ setup_params_general_20Mhz = {
 )
 @pytest.mark.usefixtures("setup_profiles")
 class TestThroughputAcrossBw20MhzVLAN(object):
-    """Throughput Across Bw vlan Mode
-       pytest -m "throughput_across_bw_test and vlan"
+    """Throughput Across Bw VLAN Mode
+       pytest -m "throughput_across_bw_test and VLAN"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2556", name="WIFI-2556")
     @pytest.mark.bw20Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Across Bw vlan Mode
-           pytest -m "throughput_across_bw_test and vlan and wpa2_personal and twog"
+        """Throughput Across Bw VLAN Mode
+           pytest -m "throughput_across_bw_test and VLAN and wpa2_personal and twog"
         """
         profile_data = setup_params_general_20Mhz["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -54,11 +58,8 @@ class TestThroughputAcrossBw20MhzVLAN(object):
         security = "open"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -81,14 +82,15 @@ class TestThroughputAcrossBw20MhzVLAN(object):
             assert station
         else:
             assert False
+
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2556", name="WIFI-2556")
     @pytest.mark.bw20Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Throughput Across Bw vlan Mode
-           pytest -m "throughput_across_bw_test and vlan and wpa2_personal and fiveg"
+        """Throughput Across Bw VLAN Mode
+           pytest -m "throughput_across_bw_test and VLAN and wpa2_personal and fiveg"
         """
         profile_data = setup_params_general_40Mhz["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -96,11 +98,8 @@ class TestThroughputAcrossBw20MhzVLAN(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -149,18 +148,18 @@ setup_params_general_40Mhz = {
 )
 @pytest.mark.usefixtures("setup_profiles")
 class TestThroughputAcrossBw40MhzVLAN(object):
-    """Throughput Across Bw vlan Mode
-       pytest -m "throughput_across_bw_test and vlan"
+    """Throughput Across Bw VLAN Mode
+       pytest -m "throughput_across_bw_test and VLAN"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2557", name="WIFI-2557")
     @pytest.mark.bw40Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Across Bw vlan Mode
-           pytest -m "throughput_across_bw_test and vlan and wpa2_personal and twog"
+        """Throughput Across Bw VLAN Mode
+           pytest -m "throughput_across_bw_test and VLAN and wpa2_personal and twog"
         """
         profile_data = setup_params_general_80Mhz["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -168,11 +167,8 @@ class TestThroughputAcrossBw40MhzVLAN(object):
         security = "open"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -200,10 +196,10 @@ class TestThroughputAcrossBw40MhzVLAN(object):
     @pytest.mark.bw40Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Throughput Across Bw vlan Mode
-           pytest -m "throughput_across_bw_test and vlan and wpa2_personal and fiveg"
+        """Throughput Across Bw VLAN Mode
+           pytest -m "throughput_across_bw_test and VLAN and wpa2_personal and fiveg"
         """
         profile_data = setup_params_general_80Mhz["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -211,11 +207,8 @@ class TestThroughputAcrossBw40MhzVLAN(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -263,18 +256,18 @@ setup_params_general_80Mhz = {
 )
 @pytest.mark.usefixtures("setup_profiles")
 class TestThroughputAcrossBw80MhzVLAN(object):
-    """Throughput Across Bw vlan Mode
-       pytest -m "throughput_across_bw_test and vlan"
+    """Throughput Across Bw VLAN Mode
+       pytest -m "throughput_across_bw_test and VLAN"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2558", name="WIFI-2558")
     @pytest.mark.bw80Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Across Bw vlan Mode
-           pytest -m "throughput_across_bw_test and vlan and wpa2_personal and twog"
+        """Throughput Across Bw VLAN Mode
+           pytest -m "throughput_across_bw_test and VLAN and wpa2_personal and twog"
         """
         profile_data = setup_params_general_80Mhz["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -282,11 +275,8 @@ class TestThroughputAcrossBw80MhzVLAN(object):
         security = "open"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -314,10 +304,10 @@ class TestThroughputAcrossBw80MhzVLAN(object):
     @pytest.mark.bw80Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Throughput Across Bw vlan Mode
-           pytest -m "throughput_across_bw_test and vlan and wpa2_personal and fiveg"
+        """Throughput Across Bw VLAN Mode
+           pytest -m "throughput_across_bw_test and VLAN and wpa2_personal and fiveg"
         """
         profile_data = setup_params_general_80Mhz["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -325,11 +315,8 @@ class TestThroughputAcrossBw80MhzVLAN(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -378,18 +365,18 @@ setup_params_general_160Mhz = {
 )
 @pytest.mark.usefixtures("setup_profiles")
 class TestThroughputAcrossBw160MhzVLAN(object):
-    """Throughput Across Bw vlan Mode
-       pytest -m "throughput_across_bw_test and vlan"
+    """Throughput Across Bw VLAN Mode
+       pytest -m "throughput_across_bw_test and VLAN"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2559", name="WIFI-2559")
     @pytest.mark.bw160Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_personal_2g(self, get_vif_state,
+    def test_client_wpa2_personal_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Across Bw vlan Mode
-           pytest -m "throughput_across_bw_test and vlan and wpa2_personal and twog"
+        """Throughput Across Bw VLAN Mode
+           pytest -m "throughput_across_bw_test and VLAN and wpa2_personal and twog"
         """
         profile_data = setup_params_general_160Mhz["ssid_modes"]["wpa2_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -397,11 +384,8 @@ class TestThroughputAcrossBw160MhzVLAN(object):
         security = "open"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -429,10 +413,10 @@ class TestThroughputAcrossBw160MhzVLAN(object):
     @pytest.mark.bw160Mhz
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_personal_5g(self, get_vif_state,
+    def test_client_wpa2_personal_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut, get_configuration):
-        """Throughput Across Bw vlan Mode
-           pytest -m "throughput_across_bw_test and vlan and wpa2_personal and fiveg"
+        """Throughput Across Bw VLAN Mode
+           pytest -m "throughput_across_bw_test and VLAN and wpa2_personal and fiveg"
         """
         profile_data = setup_params_general_160Mhz["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -440,11 +424,8 @@ class TestThroughputAcrossBw160MhzVLAN(object):
         security = "wpa2"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          passkey=security_key, mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_bridge_mode.py
index cb40f01da..dde9dd5ae 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_bridge_mode.py
@@ -8,7 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.Bridge, pytest.mark.open,
+pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.bridge, pytest.mark.open,
               pytest.mark.usefixtures("setup_test_run")]
 
 setup_params_general = {
@@ -37,7 +37,7 @@ class TestThroughputVsPktBridge2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt60
-    def test_client_open_pkt_60_2g(self, get_vif_state,
+    def test_client_open_pkt_60_2g(self, 
                                    lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                    get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -54,9 +54,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -84,7 +81,7 @@ class TestThroughputVsPktBridge2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt142
-    def test_client_open_pkt_142_2g(self, get_vif_state,
+    def test_client_open_pkt_142_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -102,9 +99,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -132,7 +126,7 @@ class TestThroughputVsPktBridge2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt256
-    def test_client_open_pkt_256_2g(self, get_vif_state,
+    def test_client_open_pkt_256_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -150,9 +144,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -180,7 +171,7 @@ class TestThroughputVsPktBridge2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt512
-    def test_client_open_pkt_512_2g(self, get_vif_state,
+    def test_client_open_pkt_512_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -198,9 +189,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -228,7 +216,7 @@ class TestThroughputVsPktBridge2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt1024
-    def test_client_open_pkt_1024_2g(self, get_vif_state,
+    def test_client_open_pkt_1024_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -246,9 +234,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -276,7 +261,7 @@ class TestThroughputVsPktBridge2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pktMTU
-    def test_client_open_pkt_MTU_2g(self, get_vif_state,
+    def test_client_open_pkt_MTU_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -294,9 +279,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -347,7 +329,7 @@ class TestThroughputVsPktBridge5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt60
-    def test_client_open_pkt_142_5g(self, get_vif_state,
+    def test_client_open_pkt_142_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -365,9 +347,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -395,7 +374,7 @@ class TestThroughputVsPktBridge5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt142
-    def test_client_open_pkt_142_5g(self, get_vif_state,
+    def test_client_open_pkt_142_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -413,9 +392,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -443,7 +419,7 @@ class TestThroughputVsPktBridge5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt256
-    def test_client_open_pkt_256_5g(self, get_vif_state,
+    def test_client_open_pkt_256_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -461,9 +437,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -491,7 +464,7 @@ class TestThroughputVsPktBridge5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt512
-    def test_client_open_pkt_512_5g(self, get_vif_state,
+    def test_client_open_pkt_512_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -509,9 +482,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -539,7 +509,7 @@ class TestThroughputVsPktBridge5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt1024
-    def test_client_open_pkt_1024_5g(self, get_vif_state,
+    def test_client_open_pkt_1024_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                      get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -557,9 +527,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -587,7 +554,7 @@ class TestThroughputVsPktBridge5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pktMTU
-    def test_client_open_pkt_MTU_5g(self, get_vif_state,
+    def test_client_open_pkt_MTU_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -605,9 +572,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_nat_mode.py
index 704d5937c..4bfbf1b6c 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_nat_mode.py
@@ -1,7 +1,7 @@
 """
 
-    Performance Test: Throughput vs Various Pkt Size Test: nat Mode
-    pytest -m "throughput_vs_pkt and nat"
+    Performance Test: Throughput vs Various Pkt Size Test: NAT Mode
+    pytest -m "throughput_vs_pkt and NAT"
 
 """
 import os
@@ -29,19 +29,19 @@ setup_params_general = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-class TestThroughputVsPktNatOpen2G(object):
-    """Throughput vs Various Pkt Size Test nat mode
-       pytest -m "throughput_vs_pkt and nat"
+class TestThroughputVsPktNAT2G(object):
+    """Throughput vs Various Pkt Size Test NAT mode
+       pytest -m "throughput_vs_pkt and NAT"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2546", name="WIFI-2546")
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt60
-    def test_client_open_pkt_60_2g(self, get_vif_state,
+    def test_client_open_pkt_60_2g(self, 
                                    lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                    get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and twog"
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
@@ -49,21 +49,18 @@ class TestThroughputVsPktNatOpen2G(object):
         mode = "NAT"
         band = "twog"
         vlan = 1
+        dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 60'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        dut_name = create_lanforge_chamberview_dut
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_2G",
+                                       instance_name="TIP_PERF_PKT_60_OPEN_2G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -84,14 +81,15 @@ class TestThroughputVsPktNatOpen2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt142
-    def test_client_open_pkt_142_2g(self, get_vif_state,
+    def test_client_open_pkt_142_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and twog"
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "NAT"
         band = "twog"
@@ -101,17 +99,14 @@ class TestThroughputVsPktNatOpen2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_2G",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+                                       instance_name="TIP_PERF_PKT_142_OPEN_2G",
+                                       vlan_id=vlan, dut_name=dut_name,raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
             pdf = False
@@ -131,14 +126,15 @@ class TestThroughputVsPktNatOpen2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt256
-    def test_client_open_pkt_256_2g(self, get_vif_state,
+    def test_client_open_pkt_256_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and twog"
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "NAT"
         band = "twog"
@@ -148,16 +144,13 @@ class TestThroughputVsPktNatOpen2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_2G",
+                                       instance_name="TIP_PER_PKT_256_OPEN_2G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -178,14 +171,15 @@ class TestThroughputVsPktNatOpen2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt512
-    def test_client_open_pkt_512_2g(self, get_vif_state,
+    def test_client_open_pkt_512_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and twog"
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "NAT"
         band = "twog"
@@ -195,16 +189,13 @@ class TestThroughputVsPktNatOpen2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_2G",
+                                       instance_name="TIP_PERF_PKT_512_OPEN_2G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -225,14 +216,15 @@ class TestThroughputVsPktNatOpen2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt1024
-    def test_client_open_pkt_1024_2g(self, get_vif_state,
+    def test_client_open_pkt_1024_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and twog"
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "NAT"
         band = "twog"
@@ -242,16 +234,13 @@ class TestThroughputVsPktNatOpen2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_2G",
+                                       instance_name="TIP_PERF_PKT_1024_OPEN_2G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -272,14 +261,15 @@ class TestThroughputVsPktNatOpen2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pktMTU
-    def test_client_open_pkt_MTU_2g(self, get_vif_state,
+    def test_client_open_pkt_MTU_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and twog"
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "NAT"
         band = "twog"
@@ -289,16 +279,13 @@ class TestThroughputVsPktNatOpen2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_2G",
+                                       instance_name="TIP_PERF_PKT_MTU_OPEN_2G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -315,6 +302,7 @@ class TestThroughputVsPktNatOpen2G(object):
         else:
             assert False
 
+
 setup_params_5g = {
     "mode": "NAT",
     "ssid_modes": {
@@ -333,22 +321,23 @@ setup_params_5g = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-class TestThroughputVsPktNatOpen5G(object):
-    """Throughput vs Various Pkt Size Test nat mode
-       pytest -m "throughput_vs_pkt and nat"
+class TestThroughputVsPktNAT5G(object):
+    """Throughput vs Various Pkt Size Test NAT mode
+       pytest -m "throughput_vs_pkt and NAT"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2546", name="WIFI-2546")
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt60
-    def test_client_open_pkt_60_5g(self, get_vif_state,
-                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                   get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and fiveg"
+    def test_client_open_pkt_142_5g(self, 
+                                    lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                    get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "NAT"
         band = "fiveg"
@@ -358,16 +347,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_5G",
+                                       instance_name="TIP_PERF_PKT_60_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -388,14 +374,15 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt142
-    def test_client_open_pkt_142_5g(self, get_vif_state,
+    def test_client_open_pkt_142_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and fiveg"
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "NAT"
         band = "fiveg"
@@ -405,20 +392,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        raw_lines = [['pkts: 142'],
-                     ['directions: DUT Transmit;DUT Receive'],
-                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
-                     ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_5G",
+                                       instance_name="TIP_PERF_PKT_142_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -439,14 +419,15 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt256
-    def test_client_open_pkt_256_5g(self, get_vif_state,
+    def test_client_open_pkt_256_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and fiveg"
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "NAT"
         band = "fiveg"
@@ -456,16 +437,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_5G",
+                                       instance_name="TIP_PERF_PKT_256_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -486,14 +464,15 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt512
-    def test_client_open_pkt_512_5g(self, get_vif_state,
+    def test_client_open_pkt_512_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and fiveg"
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "NAT"
         band = "fiveg"
@@ -503,16 +482,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_5G",
+                                       instance_name="TIP_PERF_PKT_512_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -533,14 +509,15 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt1024
-    def test_client_open_pkt_1024_5g(self, get_vif_state,
+    def test_client_open_pkt_1024_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and fiveg"
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "NAT"
         band = "fiveg"
@@ -550,16 +527,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_5G",
+                                       instance_name="TIP_PERF_PKT_1024_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -580,14 +554,15 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pktMTU
-    def test_client_open_pkt_MTU_5g(self, get_vif_state,
+    def test_client_open_pkt_MTU_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and open and fiveg"
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "NAT"
         band = "fiveg"
@@ -597,16 +572,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_OPEN_5G",
+                                       instance_name="TIP_PERF_PKT_MTU_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_vlan_mode.py
index 76fda7482..abf8179b2 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/open_security/test_vlan_mode.py
@@ -1,7 +1,7 @@
 """
 
-    Performance Test: Throughput vs Various Pkt Size Test: VLAN MODE
-    pytest -m "throughput_vs_pkt and vlan"
+    Performance Test: Throughput vs Various Pkt Size Test: VLAN Mode
+    pytest -m "throughput_vs_pkt and VLAN"
 
 """
 import os
@@ -16,7 +16,6 @@ setup_params_general = {
     "ssid_modes": {
         "open": [{"ssid_name": "ssid_open_2g", "appliedRadios": ["2G"]},
                  {"ssid_name": "ssid_open_5g", "appliedRadios": ["5G"]}]},
-        
     "rf": {},
     "radius": False
 }
@@ -30,42 +29,38 @@ setup_params_general = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-@pytest.mark.open
-class TestThroughputVsPktVlanOpen2G(object):
-    """Throughput vs Various Pkt Size Test vlan mode
-       pytest -m "throughput_vs_pkt and vlan"
+class TestThroughputVsPktVLAN2G(object):
+    """Throughput vs Various Pkt Size Test VLAN mode
+       pytest -m "throughput_vs_pkt and VLAN"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2546", name="WIFI-2546")
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt60
-    def test_client_open_pkt_60_2g(self, get_vif_state,
+    def test_client_open_pkt_60_2g(self, 
                                    lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                    get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
         security = "open"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 60'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       instance_name="TIP_PERF_PKT_60_OPEN_2G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -86,34 +81,32 @@ class TestThroughputVsPktVlanOpen2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt142
-    def test_client_open_pkt_142_2g(self, get_vif_state,
+    def test_client_open_pkt_142_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 142'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
-                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+                                       instance_name="TIP_PERF_PKT_142_OPEN_2G",
+                                       vlan_id=vlan, dut_name=dut_name,raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
             pdf = False
@@ -133,33 +126,31 @@ class TestThroughputVsPktVlanOpen2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt256
-    def test_client_open_pkt_256_2g(self, get_vif_state,
+    def test_client_open_pkt_256_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 256'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       instance_name="TIP_PER_PKT_256_OPEN_2G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -180,33 +171,31 @@ class TestThroughputVsPktVlanOpen2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt512
-    def test_client_open_pkt_512_2g(self, get_vif_state,
+    def test_client_open_pkt_512_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 512'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       instance_name="TIP_PERF_PKT_512_OPEN_2G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -227,33 +216,31 @@ class TestThroughputVsPktVlanOpen2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pkt1024
-    def test_client_open_pkt_1024_2g(self, get_vif_state,
+    def test_client_open_pkt_1024_2g(self, 
                                      lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 1024'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       instance_name="TIP_PERF_PKT_1024_OPEN_2G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -274,33 +261,31 @@ class TestThroughputVsPktVlanOpen2G(object):
     @pytest.mark.open
     @pytest.mark.twog
     @pytest.mark.pktMTU
-    def test_client_open_pkt_MTU_2g(self, get_vif_state,
+    def test_client_open_pkt_MTU_2g(self, 
                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["open"][0]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: MTU'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       instance_name="TIP_PERF_PKT_MTU_OPEN_2G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -316,8 +301,8 @@ class TestThroughputVsPktVlanOpen2G(object):
             assert station
         else:
             assert False
-            
-            
+
+
 setup_params_5g = {
     "mode": "VLAN",
     "ssid_modes": {
@@ -336,42 +321,39 @@ setup_params_5g = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-@pytest.mark.open
-class TestThroughputVsPktVlanOpen5G(object):
-    """Throughput vs Various Pkt Size Test vlan mode
-       pytest -m "throughput_vs_pkt and vlan"
+class TestThroughputVsPktVLAN5G(object):
+    """Throughput vs Various Pkt Size Test VLAN mode
+       pytest -m "throughput_vs_pkt and VLAN"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2546", name="WIFI-2546")
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt60
-    def test_client_open_pkt_60_5g(self, get_vif_state,
-                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                   get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and fiveg"
+    def test_client_open_pkt_142_5g(self, 
+                                    lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                    get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 60'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       instance_name="TIP_PERF_PKT_60_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -392,33 +374,31 @@ class TestThroughputVsPktVlanOpen5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt142
-    def test_client_open_pkt_142_5g(self, get_vif_state,
+    def test_client_open_pkt_142_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and fiveg"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 142'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       instance_name="TIP_PERF_PKT_142_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -439,11 +419,11 @@ class TestThroughputVsPktVlanOpen5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt256
-    def test_client_open_pkt_256_5g(self, get_vif_state,
+    def test_client_open_pkt_256_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and fiveg"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
@@ -451,22 +431,19 @@ class TestThroughputVsPktVlanOpen5G(object):
         security = "open"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 256'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       instance_name="TIP_PERF_PKT_256_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -487,33 +464,31 @@ class TestThroughputVsPktVlanOpen5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt512
-    def test_client_open_pkt_512_5g(self, get_vif_state,
+    def test_client_open_pkt_512_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and fiveg"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 512'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       instance_name="TIP_PERF_PKT_512_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -534,33 +509,31 @@ class TestThroughputVsPktVlanOpen5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pkt1024
-    def test_client_open_pkt_1024_5g(self, get_vif_state,
+    def test_client_open_pkt_1024_5g(self, 
                                      lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                      get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and fiveg"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 1024'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       instance_name="TIP_PERF_PKT_1024_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -581,33 +554,31 @@ class TestThroughputVsPktVlanOpen5G(object):
     @pytest.mark.open
     @pytest.mark.fiveg
     @pytest.mark.pktMTU
-    def test_client_open_pkt_MTU_5g(self, get_vif_state,
+    def test_client_open_pkt_MTU_5g(self, 
                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                     get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and open and fiveg"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and open and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["open"][1]
         ssid_name = profile_data["ssid_name"]
+
         security = "open"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: MTU'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       instance_name="TIP_PERF_PKT_MTU_OPEN_5G",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -623,4 +594,3 @@ class TestThroughputVsPktVlanOpen5G(object):
             assert station
         else:
             assert False
-
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_bridge_mode.py
index a6b626e2e..33a28b2d6 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_bridge_mode.py
@@ -8,8 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.Bridge, pytest.mark.wpa2,
-              pytest.mark.usefixtures("setup_test_run")]
+pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.bridge, pytest.mark.wpa2]
 
 setup_params_general = {
     "mode": "BRIDGE",
@@ -40,7 +39,7 @@ class TestThroughputVsPktBridge2G(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
     @pytest.mark.pkt60
-    def test_client_wpa2_personal_bridge_bridge_pkt_60_2g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_bridge_pkt_60_2g(self, 
                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                             get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -58,9 +57,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -86,9 +82,9 @@ class TestThroughputVsPktBridge2G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
     @pytest.mark.wpa2_personal
-    @pytest.mark.twog
+    @pytest.mark.twogr
     @pytest.mark.pkt142
-    def test_client_wpa2_personal_bridge_pkt_142_2g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_pkt_142_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -106,9 +102,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -136,7 +129,7 @@ class TestThroughputVsPktBridge2G(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
     @pytest.mark.pkt256
-    def test_client_wpa2_personal_bridge_pkt_256_2g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_pkt_256_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -154,9 +147,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -184,7 +174,7 @@ class TestThroughputVsPktBridge2G(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
     @pytest.mark.pkt512
-    def test_client_wpa2_personal_bridge_pkt_512_2g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_pkt_512_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -202,9 +192,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -232,7 +219,7 @@ class TestThroughputVsPktBridge2G(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
     @pytest.mark.pkt1024
-    def test_client_wpa2_personal_bridge_pkt_1024_2g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_pkt_1024_2g(self, 
                                               lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                               get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -250,9 +237,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -280,7 +264,7 @@ class TestThroughputVsPktBridge2G(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
     @pytest.mark.pktMTU
-    def test_client_wpa2_personal_bridge_pkt_MTU_2g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_pkt_MTU_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -298,9 +282,6 @@ class TestThroughputVsPktBridge2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -353,7 +334,7 @@ class TestThroughputVsPktBridge5G(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt60
-    def test_client_wpa2_personal_bridge_pkt_60_5g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_pkt_60_5g(self, 
                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                             get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -371,9 +352,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -400,7 +378,7 @@ class TestThroughputVsPktBridge5G(object):
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
     @pytest.mark.fiveg
     @pytest.mark.pkt142
-    def test_client_wpa2_personal_bridge_pkt_142_5g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_pkt_142_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -418,9 +396,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -448,7 +423,7 @@ class TestThroughputVsPktBridge5G(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt256
-    def test_client_wpa2_personal_bridge_pkt_256_5g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_pkt_256_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -466,9 +441,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -496,7 +468,7 @@ class TestThroughputVsPktBridge5G(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt512
-    def test_client_wpa2_personal_bridge_pkt_512_5g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_pkt_512_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -514,9 +486,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -544,7 +513,7 @@ class TestThroughputVsPktBridge5G(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt1024
-    def test_client_wpa2_personal_bridge_pkt_1024_5g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_pkt_1024_5g(self, 
                                               lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                               get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -562,9 +531,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -592,7 +558,7 @@ class TestThroughputVsPktBridge5G(object):
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
     @pytest.mark.pktMTU
-    def test_client_wpa2_personal_bridge_pkt_MTU_5g(self, get_vif_state,
+    def test_client_wpa2_personal_bridge_pkt_MTU_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -610,9 +576,6 @@ class TestThroughputVsPktBridge5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_nat_mode.py
index d3ab55ccc..48709e598 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_nat_mode.py
@@ -1,15 +1,14 @@
 """
 
-    Performance Test: Wifi Capacity Test : Nat Mode
-    pytest -m "wifi_capacity_test and nat"
+    Performance Test: Throughput vs Various Pkt Size Test: NAT Mode
+    pytest -m "throughput_vs_pkt and NAT"
 
 """
 import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.nat]
-
+pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.nat, pytest.mark.wpa2]
 
 setup_params_general = {
     "mode": "NAT",
@@ -31,36 +30,42 @@ setup_params_general = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-class TestWifiCapacityNatMode(object):
-    """ Wifi Capacity Test Nat Mode
-           pytest -m "wifi_capacity_test and nat"
+@pytest.mark.wpa2
+class TestThroughputVsPktNAT2G(object):
+    """Throughput vs Various Pkt Size Test NAT mode
+       pytest -m "throughput_vs_pkt and NAT"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
     @pytest.mark.wpa2_personal
     @pytest.mark.twog
-    def test_client_wpa2_nat_2g(self, get_vif_state,
-                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                   get_configuration):
-        """ Wifi Capacity Test Nat Mode
-            pytest -m "wifi_capacity_test and nat and wpa2_personal and twog"
+    @pytest.mark.pkt60
+    def test_client_wpa2_personal_NAT_NAT_pkt_60_2g(self, 
+                                            lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                            get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and twog"
         """
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
         security = "wpa2"
         mode = "NAT"
-        security_key = profile_data["security_key"]
         band = "twog"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 60'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
+
         if station:
-            wct_obj = lf_test.wifi_capacity(stations="1.1.%s" % station_names_twog[0],
-                                            instance_name="test_wct_wpa2_nat", mode=mode, vlan_id=vlan)
-            report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G_60",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
             pdf = False
             for i in entries:
@@ -75,7 +80,232 @@ class TestWifiCapacityNatMode(object):
         else:
             assert False
 
-setup_params_general_5g = {
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twogr
+    @pytest.mark.pkt142
+    def test_client_wpa2_personal_NAT_pkt_142_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and twog"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "twog"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 142'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_twog)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    @pytest.mark.pkt256
+    def test_client_wpa2_personal_NAT_pkt_256_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and twog"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "twog"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 256'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_twog)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    @pytest.mark.pkt512
+    def test_client_wpa2_personal_NAT_pkt_512_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and twog"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "twog"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 512'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_twog)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    @pytest.mark.pkt1024
+    def test_client_wpa2_personal_NAT_pkt_1024_2g(self, 
+                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                              get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and twog"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "twog"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 1024'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_twog)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    @pytest.mark.pktMTU
+    def test_client_wpa2_personal_NAT_pkt_MTU_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and twog"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "twog"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: MTU'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_twog)
+            assert station
+        else:
+            assert False
+
+setup_params_5g = {
     "mode": "NAT",
     "ssid_modes": {
         "wpa2_personal": [
@@ -90,41 +320,271 @@ setup_params_general_5g = {
 @allure.feature("NAT MODE CLIENT CONNECTIVITY")
 @pytest.mark.parametrize(
     'setup_profiles',
-    [setup_params_general_5g],
+    [setup_params_5g],
     indirect=True,
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-class TestWifiCapacityNatMode5g(object):
-    """ Wifi Capacity Test Nat mode
-           pytest -m "wifi_capacity_test and Nat"
+@pytest.mark.wpa2
+class TestThroughputVsPktNAT5G(object):
+    """Throughput vs Various Pkt Size Test NAT mode
+       pytest -m "throughput_vs_pkt and NAT"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_nat_5gg(self, get_vif_state,
-                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                   get_configuration):
-        """ Wifi Capacity Test Nat mode
-            pytest -m "wifi_capacity_test and nat and wpa2_personal and fiveg"
+    @pytest.mark.pkt60
+    def test_client_wpa2_personal_NAT_pkt_60_5g(self, 
+                                            lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                            get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and fiveg"
         """
-        profile_data = setup_params_general_5g["ssid_modes"]["wpa2_personal"][1]
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
         security = "wpa2"
         mode = "NAT"
-        security_key = profile_data["security_key"]
         band = "fiveg"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 60'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
+
         if station:
-            wct_obj = lf_test.wifi_capacity(stations="1.1.%s" % station_names_fiveg[0],
-                                            instance_name="test_wct_wpa2_nat", mode=mode, vlan_id=vlan)
-            report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, praw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.fiveg
+    @pytest.mark.pkt142
+    def test_client_wpa2_personal_NAT_pkt_142_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and fiveg"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 142'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.pkt256
+    def test_client_wpa2_personal_NAT_pkt_256_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and fiveg"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 256'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.pkt512
+    def test_client_wpa2_personal_NAT_pkt_512_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and fiveg"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 512'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.pkt1024
+    def test_client_wpa2_personal_NAT_pkt_1024_5g(self, 
+                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                              get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and fiveg"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 1024'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.pktMTU
+    def test_client_wpa2_personal_NAT_pkt_MTU_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa2_personal and fiveg"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "NAT"
+        band = "fiveg"
+        vlan = 1
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: MTU'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
             pdf = False
             for i in entries:
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_vlan_mode.py
index e6b10bc80..8aede40d8 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa2_security/test_vlan_mode.py
@@ -1,15 +1,14 @@
 """
 
-    Performance Test: Wifi Capacity Test : Vlan Mode
-    pytest -m "wifi_capacity_test and vlan"
+    Performance Test: Throughput vs Various Pkt Size Test: VLAN Mode
+    pytest -m "throughput_vs_pkt and VLAN"
 
 """
 import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.vlan]
-
+pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.vlan, pytest.mark.wpa2]
 
 setup_params_general = {
     "mode": "VLAN",
@@ -23,108 +22,569 @@ setup_params_general = {
 }
 
 
-@allure.feature("NAT MODE CLIENT CONNECTIVITY")
-@pytest.mark.parametrize(
-    'setup_profiles',
-    [setup_params_general],
-    indirect=True,
-    scope="class"
-)
-@pytest.mark.usefixtures("setup_profiles")
-class TestWifiCapacityVlanMode(object):
-    """ Wifi Capacity Test Vlan Mode
-           pytest -m "wifi_capacity_test and vlan"
-    """
-    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
-    @pytest.mark.wpa2_personal
-    @pytest.mark.twog
-    def test_client_wpa2_vlan_2g(self, get_vif_state,
-                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                   get_configuration):
-        """ Wifi Capacity Test Vlan Mode
-            pytest -m "wifi_capacity_test and vlan and wpa2_personal and twog"
-        """
-        profile_data = setup_params_general["ssid_modes"]["wpa2_personal"][0]
-        ssid_name = profile_data["ssid_name"]
-        security = "wpa2"
-        mode = "VLAN"
-        security_key = profile_data["security_key"]
-        band = "twog"
-        vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
-                                         mode=mode, band=band,
-                                         station_name=station_names_twog, vlan_id=vlan)
-        if station:
-            wct_obj = lf_test.wifi_capacity(stations="1.1.%s" % station_names_twog[0],
-                                            instance_name="test_wct_wpa2_vlan", mode=mode, vlan_id=vlan)
-            report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
-            entries = os.listdir("../reports/" + report_name + '/')
-            pdf = False
-            for i in entries:
-                if ".pdf" in i:
-                    pdf = i
-            if pdf:
-                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
-                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
-            print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_twog)
-            assert station
-        else:
-            assert False
-
-setup_params_general_5g = {
-    "mode": "VLAN",
-    "ssid_modes": {
-        "wpa2_personal": [
-            {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"},
-            {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
-             "security_key": "something"}]},
-    "rf": {},
-    "radius": False
-}
-
-
 @allure.feature("VLAN MODE CLIENT CONNECTIVITY")
 @pytest.mark.parametrize(
     'setup_profiles',
-    [setup_params_general_5g],
+    [setup_params_general],
     indirect=True,
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-class TestWifiCapacityVlanMode5g(object):
-    """ Wifi Capacity Test Vlan mode
-           pytest -m "wifi_capacity_test and vlan"
+@pytest.mark.wpa2
+class TestThroughputVsPktVLAN2G(object):
+    """Throughput vs Various Pkt Size Test VLAN mode
+       pytest -m "throughput_vs_pkt and VLAN"
+    """
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    @pytest.mark.pkt60
+    def test_client_wpa2_personal_VLAN_VLAN_pkt_60_2g(self,
+                                            lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                            get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and twog"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "VLAN"
+        band = "twog"
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 60'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G_60",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_twog)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twogr
+    @pytest.mark.pkt142
+    def test_client_wpa2_personal_VLAN_pkt_142_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and twog"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "VLAN"
+        band = "twog"
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 142'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_twog)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    @pytest.mark.pkt256
+    def test_client_wpa2_personal_VLAN_pkt_256_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and twog"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "VLAN"
+        band = "twog"
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 256'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_twog)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    @pytest.mark.pkt512
+    def test_client_wpa2_personal_VLAN_pkt_512_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and twog"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "VLAN"
+        band = "twog"
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 512'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_twog)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    @pytest.mark.pkt1024
+    def test_client_wpa2_personal_VLAN_pkt_1024_2g(self, 
+                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                              get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and twog"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "VLAN"
+        band = "twog"
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 1024'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_twog)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.twog
+    @pytest.mark.pktMTU
+    def test_client_wpa2_personal_VLAN_pkt_MTU_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and twog"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "VLAN"
+        band = "twog"
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: MTU'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_twog, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_2G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_twog)
+            assert station
+        else:
+            assert False
+
+setup_params_5g = {
+    "mode": "VLAN",
+    "ssid_modes": {
+        "wpa2_personal": [
+            {"ssid_name": "ssid_wpa2_2g", "appliedRadios": ["2G"], "security_key": "something"},
+            {"ssid_name": "ssid_wpa2_5g", "appliedRadios": ["5G"],
+             "security_key": "something"}]},
+    "rf": {},
+    "radius": False
+}
+
+
+@allure.feature("VLAN MODE CLIENT CONNECTIVITY")
+@pytest.mark.parametrize(
+    'setup_profiles',
+    [setup_params_5g],
+    indirect=True,
+    scope="class"
+)
+@pytest.mark.usefixtures("setup_profiles")
+@pytest.mark.wpa2
+class TestThroughputVsPktVLAN5G(object):
+    """Throughput vs Various Pkt Size Test VLAN mode
+       pytest -m "throughput_vs_pkt and VLAN"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
     @pytest.mark.wpa2_personal
     @pytest.mark.fiveg
-    def test_client_wpa2_vlan_5g(self, get_vif_state,
-                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                   get_configuration):
-        """ Wifi Capacity Test Vlan mode
-            pytest -m "wifi_capacity_test and vlan and wpa2_personal and fiveg"
+    @pytest.mark.pkt60
+    def test_client_wpa2_personal_VLAN_pkt_60_5g(self, 
+                                            lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                            get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and fiveg"
         """
-        profile_data = setup_params_general_5g["ssid_modes"]["wpa2_personal"][1]
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
         ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
         security = "wpa2"
         mode = "VLAN"
-        security_key = profile_data["security_key"]
         band = "fiveg"
-        vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 60'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
+
         if station:
-            wct_obj = lf_test.wifi_capacity(stations="1.1.%s" % station_names_fiveg[0],
-                                            instance_name="test_wct_wpa2_vlan", mode=mode, vlan_id=vlan)
-            report_name = wct_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, praw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.fiveg
+    @pytest.mark.pkt142
+    def test_client_wpa2_personal_VLAN_pkt_142_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and fiveg"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "VLAN"
+        band = "fiveg"
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 142'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.pkt256
+    def test_client_wpa2_personal_VLAN_pkt_256_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and fiveg"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "VLAN"
+        band = "fiveg"
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 256'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.pkt512
+    def test_client_wpa2_personal_VLAN_pkt_512_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and fiveg"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "VLAN"
+        band = "fiveg"
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 512'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.pkt1024
+    def test_client_wpa2_personal_VLAN_pkt_1024_5g(self, 
+                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                              get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and fiveg"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "VLAN"
+        band = "fiveg"
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: 1024'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
+            entries = os.listdir("../reports/" + report_name + '/')
+            pdf = False
+            for i in entries:
+                if ".pdf" in i:
+                    pdf = i
+            if pdf:
+                allure.attach.file(source="../reports/" + report_name + "/" + pdf,
+                                   name=get_configuration["access_point"][0]["model"] + "_dataplane")
+            print("Test Completed... Cleaning up Stations")
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
+            assert station
+        else:
+            assert False
+
+    @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2547", name="WIFI-2547")
+    @pytest.mark.wpa2_personal
+    @pytest.mark.fiveg
+    @pytest.mark.pktMTU
+    def test_client_wpa2_personal_VLAN_pkt_MTU_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa2_personal and fiveg"
+        """
+        profile_data = setup_params_5g["ssid_modes"]["wpa2_personal"][1]
+        ssid_name = profile_data["ssid_name"]
+        security_key = profile_data["security_key"]
+        security = "wpa2"
+        mode = "VLAN"
+        band = "fiveg"
+        vlan = 100
+        dut_name = create_lanforge_chamberview_dut
+        raw_lines = [['pkts: MTU'],
+                     ['directions: DUT Transmit;DUT Receive'],
+                     ['traffic_types: UDP;TCP'], ["show_3s: 1"],
+                     ["show_ll_graphs: 1"], ["show_log: 1"]]
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
+                                         mode=mode, band=band,
+                                         station_name=station_names_fiveg, vlan_id=vlan)
+
+        if station:
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_DPT_WPA2_5G",
+                                       vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
+            report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
             pdf = False
             for i in entries:
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_bridge_mode.py
index 2a7332d37..df273a935 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_bridge_mode.py
@@ -40,7 +40,7 @@ class TestThroughputVsPktBridgeWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt60
-    def test_client_wpa3_personal_pkt_bridge_60_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_60_2g(self, 
                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                             get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -58,9 +58,6 @@ class TestThroughputVsPktBridgeWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -88,7 +85,7 @@ class TestThroughputVsPktBridgeWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt142
-    def test_client_wpa3_personal_pkt_bridge_142_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_142_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -106,9 +103,6 @@ class TestThroughputVsPktBridgeWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -136,7 +130,7 @@ class TestThroughputVsPktBridgeWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt256
-    def test_client_wpa3_personal_pkt_bridge_256_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_256_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -154,9 +148,6 @@ class TestThroughputVsPktBridgeWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -184,7 +175,7 @@ class TestThroughputVsPktBridgeWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt512
-    def test_client_wpa3_personal_pkt_bridge_512_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_512_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -202,9 +193,6 @@ class TestThroughputVsPktBridgeWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -232,7 +220,7 @@ class TestThroughputVsPktBridgeWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt1024
-    def test_client_wpa3_personal_pkt_bridge_1024_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_1024_2g(self, 
                                               lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                               get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -250,9 +238,6 @@ class TestThroughputVsPktBridgeWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -280,7 +265,7 @@ class TestThroughputVsPktBridgeWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pktMTU
-    def test_client_wpa3_personal_pkt_bridge_MTU_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_MTU_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -298,9 +283,6 @@ class TestThroughputVsPktBridgeWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -353,7 +335,7 @@ class TestThroughputVsPktBridgeWpa35G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt60
-    def test_client_wpa3_personal_pkt_bridge_60_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_60_5g(self, 
                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                             get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -371,9 +353,6 @@ class TestThroughputVsPktBridgeWpa35G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -401,7 +380,7 @@ class TestThroughputVsPktBridgeWpa35G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt142
-    def test_client_wpa3_personal_pkt_bridge_142_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_142_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -419,9 +398,6 @@ class TestThroughputVsPktBridgeWpa35G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -449,7 +425,7 @@ class TestThroughputVsPktBridgeWpa35G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt256
-    def test_client_wpa3_personal_pkt_bridge_256_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_256_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -467,9 +443,6 @@ class TestThroughputVsPktBridgeWpa35G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -497,7 +470,7 @@ class TestThroughputVsPktBridgeWpa35G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt512
-    def test_client_wpa3_personal_pkt_bridge_512_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_512_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -515,9 +488,6 @@ class TestThroughputVsPktBridgeWpa35G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -545,7 +515,7 @@ class TestThroughputVsPktBridgeWpa35G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt1024
-    def test_client_wpa3_personal_pkt_bridge_1024_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_1024_5g(self, 
                                               lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                               get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -563,9 +533,6 @@ class TestThroughputVsPktBridgeWpa35G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -593,7 +560,7 @@ class TestThroughputVsPktBridgeWpa35G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pktMTU
-    def test_client_wpa3_personal_pkt_bridge_MTU_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_bridge_MTU_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
         """Throughput Vs Pkt Sizes Bridge Mode
@@ -611,9 +578,6 @@ class TestThroughputVsPktBridgeWpa35G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_nat_mode.py
index abfbd8956..64ad7d0d9 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_nat_mode.py
@@ -1,7 +1,7 @@
 """
 
-    Performance Test: Throughput vs Various Pkt Size Test: nat Mode
-    pytest -m "throughput_vs_pkt and nat"
+    Performance Test: Throughput vs Various Pkt Size Test: NAT Mode
+    pytest -m "throughput_vs_pkt and NAT"
 
 """
 import os
@@ -32,19 +32,19 @@ setup_params_general = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-class TestThroughputVsPktNatAWpa32G(object):
-    """Throughput vs Various Pkt Size Test nat mode
-       pytest -m "throughput_vs_pkt and nat"
+class TestThroughputVsPktNATWpa32G(object):
+    """Throughput vs Various Pkt Size Test NAT mode
+       pytest -m "throughput_vs_pkt and NAT"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2549", name="WIFI-2549")
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt60
-    def test_client_wpa3_personal_nat_pkt_60_2g(self, get_vif_state,
-                                                lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                                get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and twog"
+    def test_client_wpa3_personal_pkt_NAT_60_2g(self, 
+                                            lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                            get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -58,16 +58,13 @@ class TestThroughputVsPktNatAWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_60",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_60",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -88,11 +85,11 @@ class TestThroughputVsPktNatAWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt142
-    def test_client_wpa3_personal_nat_pkt_142_2g(self, get_vif_state,
-                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                                 get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and twog"
+    def test_client_wpa3_personal_pkt_NAT_142_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -106,16 +103,13 @@ class TestThroughputVsPktNatAWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_142",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_142",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -136,11 +130,11 @@ class TestThroughputVsPktNatAWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt256
-    def test_client_wpa3_personal_nat_pkt_256_2g(self, get_vif_state,
-                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                                 get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and twog"
+    def test_client_wpa3_personal_pkt_NAT_256_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -154,16 +148,13 @@ class TestThroughputVsPktNatAWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_256",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_256",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -184,11 +175,11 @@ class TestThroughputVsPktNatAWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt512
-    def test_client_wpa3_personal_nat_pkt_512_2g(self, get_vif_state,
-                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                                 get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and twog"
+    def test_client_wpa3_personal_pkt_NAT_512_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -202,16 +193,13 @@ class TestThroughputVsPktNatAWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_512",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_512",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -232,11 +220,11 @@ class TestThroughputVsPktNatAWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt1024
-    def test_client_wpa3_personal_nat_pkt_1024_2g(self, get_vif_state,
-                                                  lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                                  get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and twog"
+    def test_client_wpa3_personal_pkt_NAT_1024_2g(self, 
+                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                              get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -250,16 +238,13 @@ class TestThroughputVsPktNatAWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_1024",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_1024",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -280,11 +265,11 @@ class TestThroughputVsPktNatAWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pktMTU
-    def test_client_wpa3_personal_nat_pkt_MTU_2g(self, get_vif_state,
-                                                 lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                                 get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and twog"
+    def test_client_wpa3_personal_pkt_NAT_MTU_2g(self, 
+                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -298,16 +283,13 @@ class TestThroughputVsPktNatAWpa32G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_MTU",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_MTU",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -345,20 +327,19 @@ setup_params_5g = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-class TestThroughputVsPktNatOpen5G(object):
-    """Throughput vs Various Pkt Size Test nat mode
-       pytest -m "throughput_vs_pkt and nat"
+class TestThroughputVsPktNATWpa35G(object):
+    """Throughput vs Various Pkt Size Test NAT mode
+       pytest -m "throughput_vs_pkt and NAT"
     """
-
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2549", name="WIFI-2549")
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt60
-    def test_client_wpa3_personal_nat_pkt_60_5g(self, get_vif_state,
-                                                lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                                get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and fiveg"
+    def test_client_wpa3_personal_pkt_NAT_60_5g(self, 
+                                            lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                            get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -372,16 +353,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_5G_60",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA3_5G_60",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -402,11 +380,11 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt142
-    def test_client_wpa3_personal_nat_pkt_142_5g(self, get_vif_state,
-                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                                 get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and fiveg"
+    def test_client_wpa3_personal_pkt_NAT_142_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -420,16 +398,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_5G_142",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA3_5G_142",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -450,11 +425,11 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt256
-    def test_client_wpa3_personal_nat_pkt_256_5g(self, get_vif_state,
-                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                                 get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and fiveg"
+    def test_client_wpa3_personal_pkt_NAT_256_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -468,16 +443,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_5G_256",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA3_5G_256",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -498,11 +470,11 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt512
-    def test_client_wpa3_personal_nat_pkt_512_5g(self, get_vif_state,
-                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                                 get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and fiveg"
+    def test_client_wpa3_personal_pkt_NAT_512_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -516,9 +488,6 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -546,11 +515,11 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt1024
-    def test_client_wpa3_personal_nat_pkt_1024_5g(self, get_vif_state,
-                                                  lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                                  get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and fiveg"
+    def test_client_wpa3_personal_pkt_NAT_1024_5g(self, 
+                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                              get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -564,16 +533,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_5G_1024",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA3_5G_1024",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -594,11 +560,11 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pktMTU
-    def test_client_wpa3_personal_nat_pkt_MTU_5g(self, get_vif_state,
-                                                 lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                                 get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa3_personal and fiveg"
+    def test_client_wpa3_personal_pkt_NAT_MTU_5g(self, 
+                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                             get_configuration):
+        """Throughput Vs Pkt Sizes NAT Mode
+           pytest -m "throughput_vs_pkt and NAT and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -612,16 +578,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_5G_MTU",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA3_5G_MTU",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_vlan_mode.py
index 34e81af5f..6912033fe 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa3_security/test_vlan_mode.py
@@ -1,7 +1,7 @@
 """
 
-    Performance Test: Throughput vs Various Pkt Size Test: VLAN MODE
-    pytest -m "throughput_vs_pkt and vlan"
+    Performance Test: Throughput vs Various Pkt Size Test: VLAN Mode
+    pytest -m "throughput_vs_pkt and VLAN"
 
 """
 import os
@@ -32,19 +32,19 @@ setup_params_general = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-class TestThroughputVsPktVlanWpa32G(object):
-    """Throughput vs Various Pkt Size Test vlan mode
-       pytest -m "throughput_vs_pkt and vlan"
+class TestThroughputVsPktVLANWpa32G(object):
+    """Throughput vs Various Pkt Size Test VLAN mode
+       pytest -m "throughput_vs_pkt and VLAN"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2549", name="WIFI-2549")
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt60
-    def test_client_wpa3_personal_pkt_vlan_60_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_60_2g(self, 
                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                             get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -52,22 +52,19 @@ class TestThroughputVsPktVlanWpa32G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 60'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
-        station = lf_test.Client_Connect(ssid=ssid_name, security=security,
+        station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_60",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_60",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -88,11 +85,11 @@ class TestThroughputVsPktVlanWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt142
-    def test_client_wpa3_personal_pkt_vlan_142_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_142_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -100,22 +97,19 @@ class TestThroughputVsPktVlanWpa32G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 142'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_142",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_142",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -136,11 +130,11 @@ class TestThroughputVsPktVlanWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt256
-    def test_client_wpa3_personal_pkt_vlan_256_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_256_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -148,22 +142,19 @@ class TestThroughputVsPktVlanWpa32G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 256'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_256",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_256",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -184,11 +175,11 @@ class TestThroughputVsPktVlanWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt512
-    def test_client_wpa3_personal_pkt_vlan_512_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_512_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -196,22 +187,19 @@ class TestThroughputVsPktVlanWpa32G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 512'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_1024",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_512",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -232,11 +220,11 @@ class TestThroughputVsPktVlanWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pkt1024
-    def test_client_wpa3_personal_pkt_vlan_1024_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_1024_2g(self, 
                                               lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                               get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -244,22 +232,19 @@ class TestThroughputVsPktVlanWpa32G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 1024'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_MTU",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_1024",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -280,11 +265,11 @@ class TestThroughputVsPktVlanWpa32G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.twog
     @pytest.mark.pktMTU
-    def test_client_wpa3_personal_pkt_vlan_MTU_2g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_MTU_2g(self, 
                                              lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                              get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and twog"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa3_personal"][0]
         ssid_name = profile_data["ssid_name"]
@@ -292,22 +277,19 @@ class TestThroughputVsPktVlanWpa32G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: MTU'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_2G_MTU",
+                                       instance_name="TIP_PERF_DPT_WPA3_2G_MTU",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -324,6 +306,7 @@ class TestThroughputVsPktVlanWpa32G(object):
         else:
             assert False
 
+
 setup_params_5g = {
     "mode": "VLAN",
     "ssid_modes": {
@@ -344,19 +327,19 @@ setup_params_5g = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-class TestThroughputVsPktVlanWpa35G(object):
-    """Throughput vs Various Pkt Size Test vlan mode
-       pytest -m "throughput_vs_pkt and vlan"
+class TestThroughputVsPktVLANWpa35G(object):
+    """Throughput vs Various Pkt Size Test VLAN mode
+       pytest -m "throughput_vs_pkt and VLAN"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2549", name="WIFI-2549")
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt60
-    def test_client_wpa3_personal_pkt_vlan_60_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_60_5g(self, 
                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                             get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and fiveg"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -364,22 +347,19 @@ class TestThroughputVsPktVlanWpa35G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 60'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_5G",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA3_5G_60",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -400,11 +380,11 @@ class TestThroughputVsPktVlanWpa35G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt142
-    def test_client_wpa3_personal_pkt_vlan_142_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_142_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and fiveg"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -412,22 +392,19 @@ class TestThroughputVsPktVlanWpa35G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 142'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_5G_142",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA3_5G_142",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -448,11 +425,11 @@ class TestThroughputVsPktVlanWpa35G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt256
-    def test_client_wpa3_personal_pkt_vlan_256_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_256_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and fiveg"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -460,22 +437,19 @@ class TestThroughputVsPktVlanWpa35G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 256'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_5G_256",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA3_5G_256",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -496,11 +470,11 @@ class TestThroughputVsPktVlanWpa35G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt512
-    def test_client_wpa3_personal_pkt_vlan_512_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_512_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and fiveg"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -508,22 +482,19 @@ class TestThroughputVsPktVlanWpa35G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 512'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_5G_512",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA3_5G_512",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -544,11 +515,11 @@ class TestThroughputVsPktVlanWpa35G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt1024
-    def test_client_wpa3_personal_pkt_vlan_1024_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_1024_5g(self, 
                                               lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                               get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and fiveg"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -556,22 +527,19 @@ class TestThroughputVsPktVlanWpa35G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 1024'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_5G_1024",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA3_5G_1024",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -592,11 +560,11 @@ class TestThroughputVsPktVlanWpa35G(object):
     @pytest.mark.wpa3_personal
     @pytest.mark.fiveg
     @pytest.mark.pktMTU
-    def test_client_wpa3_personal_pkt_vlan_MTU_5g(self, get_vif_state,
+    def test_client_wpa3_personal_pkt_VLAN_MTU_5g(self, 
                                              lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                              get_configuration):
-        """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa3_personal and fiveg"
+        """Throughput Vs Pkt Sizes VLAN Mode
+           pytest -m "throughput_vs_pkt and VLAN and wpa3_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa3_personal"][1]
         ssid_name = profile_data["ssid_name"]
@@ -604,22 +572,19 @@ class TestThroughputVsPktVlanWpa35G(object):
         security = "wpa3"
         mode = "VLAN"
         band = "fiveg"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: MTU'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA3_NAT_5G_MTU",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA3_5G_MTU",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -635,4 +600,3 @@ class TestThroughputVsPktVlanWpa35G(object):
             assert station
         else:
             assert False
-
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_bridge_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_bridge_mode.py
index bbc994e16..2e3ec2cb2 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_bridge_mode.py
@@ -38,7 +38,7 @@ class TestThroughputVsPktBridgeWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt60
-    def test_client_wpa_personal_bridge_pkt_60_2g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_60_2g(self, 
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -56,9 +56,6 @@ class TestThroughputVsPktBridgeWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -86,7 +83,7 @@ class TestThroughputVsPktBridgeWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt142
-    def test_client_wpa_personal_bridge_pkt_142_2g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_142_2g(self, 
                                                    lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                    get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -104,9 +101,6 @@ class TestThroughputVsPktBridgeWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -134,7 +128,7 @@ class TestThroughputVsPktBridgeWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt256
-    def test_client_wpa_personal_bridge_pkt_256_2g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_256_2g(self, 
                                                    lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                    get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -152,9 +146,6 @@ class TestThroughputVsPktBridgeWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -182,7 +173,7 @@ class TestThroughputVsPktBridgeWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt512
-    def test_client_wpa_personal_bridge_pkt_512_2g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_512_2g(self, 
                                                    lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                    get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -200,9 +191,6 @@ class TestThroughputVsPktBridgeWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -230,7 +218,7 @@ class TestThroughputVsPktBridgeWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt1024
-    def test_client_wpa_personal_bridge_pkt_1024_2g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_1024_2g(self, 
                                                     lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                     get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -248,9 +236,6 @@ class TestThroughputVsPktBridgeWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -278,7 +263,7 @@ class TestThroughputVsPktBridgeWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pktMTU
-    def test_client_wpa_personal_bridge_pkt_MTU_2g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_MTU_2g(self, 
                                                    lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                    get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -296,9 +281,6 @@ class TestThroughputVsPktBridgeWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
@@ -351,7 +333,7 @@ class TestThroughputVsPktBridgeWpa5G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt60
-    def test_client_wpa_personal_bridge_pkt_60_5g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_60_5g(self, 
                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -369,9 +351,6 @@ class TestThroughputVsPktBridgeWpa5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -399,7 +378,7 @@ class TestThroughputVsPktBridgeWpa5G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt142
-    def test_client_wpa_personal_bridge_pkt_142_5g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_142_5g(self, 
                                                    lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                    get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -417,9 +396,6 @@ class TestThroughputVsPktBridgeWpa5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -447,7 +423,7 @@ class TestThroughputVsPktBridgeWpa5G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt256
-    def test_client_wpa_personal_bridge_pkt_256_5g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_256_5g(self, 
                                                    lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                    get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -465,9 +441,6 @@ class TestThroughputVsPktBridgeWpa5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -495,7 +468,7 @@ class TestThroughputVsPktBridgeWpa5G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt512
-    def test_client_wpa_personal_bridge_pkt_512_5g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_512_5g(self, 
                                                    lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                    get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -513,9 +486,6 @@ class TestThroughputVsPktBridgeWpa5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -543,7 +513,7 @@ class TestThroughputVsPktBridgeWpa5G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt1024
-    def test_client_wpa_personal_bridge_pkt_1024_5g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_1024_5g(self, 
                                                     lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                     get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -561,9 +531,6 @@ class TestThroughputVsPktBridgeWpa5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
@@ -591,7 +558,7 @@ class TestThroughputVsPktBridgeWpa5G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pktMTU
-    def test_client_wpa_personal_bridge_pkt_MTU_5g(self, get_vif_state,
+    def test_client_wpa_personal_bridge_pkt_MTU_5g(self, 
                                                    lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
                                                    get_configuration):
         """Throughput Vs Pkt Sizes BRIDGE MODE
@@ -609,9 +576,6 @@ class TestThroughputVsPktBridgeWpa5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_nat_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_nat_mode.py
index 03d26bf0f..0d4f43b2f 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_nat_mode.py
@@ -1,23 +1,22 @@
 """
 
-    Performance Test: Throughput vs Various Pkt Size Test: nat Mode
-    pytest -m "throughput_vs_pkt and nat"
+    Performance Test: Throughput vs Various Pkt Size Test: NAT MODE
+    pytest -m "throughput_vs_pkt and NAT"
 
 """
 import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.nat, pytest.mark.wpa,
-              pytest.mark.usefixtures("setup_test_run")]
+pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.nat]
+
 
 setup_params_general = {
     "mode": "NAT",
     "ssid_modes": {
         "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}]},
-
+                         {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
+                          "security_key": "something"}]},
     "rf": {},
     "radius": False
 }
@@ -31,25 +30,24 @@ setup_params_general = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-@pytest.mark.wpa
-class TestThroughputVsPktNatAWpa2G(object):
-    """Throughput vs Various Pkt Size Test nat mode
-       pytest -m "throughput_vs_pkt and nat"
+class TestThroughputVsPktNATWpa2G(object):
+    """Throughput vs Various Pkt Size Test NAT MODE
+       pytest -m "throughput_vs_pkt and NAT"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2548", name="WIFI-2548")
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt60
-    def test_client_wpa_personal_pkt_60_2g(self, get_vif_state,
-                                           lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                           get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and twog"
+    def test_client_wpa_personal_NAT_pkt_60_2g(self, 
+                                                  lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                  get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "twog"
         vlan = 1
@@ -58,16 +56,13 @@ class TestThroughputVsPktNatAWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_2G_60",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_60",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -88,16 +83,16 @@ class TestThroughputVsPktNatAWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt142
-    def test_client_wpa_personal_pkt_142_2g(self, get_vif_state,
-                                            lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                            get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and twog"
+    def test_client_wpa_personal_NAT_pkt_142_2g(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "twog"
         vlan = 1
@@ -106,16 +101,13 @@ class TestThroughputVsPktNatAWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_2G_142",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_142",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -136,16 +128,16 @@ class TestThroughputVsPktNatAWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt256
-    def test_client_wpa_personal_pkt_256_2g(self, get_vif_state,
-                                            lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                            get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and twog"
+    def test_client_wpa_personal_NAT_pkt_256_2g(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "twog"
         vlan = 1
@@ -154,16 +146,13 @@ class TestThroughputVsPktNatAWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_2G_256",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_256",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -184,16 +173,16 @@ class TestThroughputVsPktNatAWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt512
-    def test_client_wpa_personal_pkt_512_2g(self, get_vif_state,
-                                            lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                            get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and twog"
+    def test_client_wpa_personal_NAT_pkt_512_2g(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "twog"
         vlan = 1
@@ -202,16 +191,13 @@ class TestThroughputVsPktNatAWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_2G_512",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_512",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -232,16 +218,16 @@ class TestThroughputVsPktNatAWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt1024
-    def test_client_wpa_personal_pkt_1024_2g(self, get_vif_state,
-                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                             get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and twog"
+    def test_client_wpa_personal_NAT_pkt_1024_2g(self, 
+                                                    lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                    get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "twog"
         vlan = 1
@@ -250,16 +236,13 @@ class TestThroughputVsPktNatAWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_2G_1024",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_1024",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -280,16 +263,16 @@ class TestThroughputVsPktNatAWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pktMTU
-    def test_client_wpa_personal_pkt_MTU_2g(self, get_vif_state,
-                                            lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                            get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and twog"
+    def test_client_wpa_personal_NAT_pkt_MTU_2g(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "twog"
         vlan = 1
@@ -298,16 +281,13 @@ class TestThroughputVsPktNatAWpa2G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_2G_MTU",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_MTU",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -325,13 +305,13 @@ class TestThroughputVsPktNatAWpa2G(object):
             assert False
 
 
-
 setup_params_5g = {
     "mode": "NAT",
     "ssid_modes": {
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}]},
+        "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
+                         {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
+                          "security_key": "something"}]},
+
     "rf": {},
     "radius": False
 }
@@ -345,25 +325,24 @@ setup_params_5g = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-@pytest.mark.wpa
-class TestThroughputVsPktNatOpen5G(object):
-    """Throughput vs Various Pkt Size Test nat mode
-       pytest -m "throughput_vs_pkt and nat"
+class TestThroughputVsPktNATWpa5G(object):
+    """Throughput vs Various Pkt Size Test NAT MODE
+       pytest -m "throughput_vs_pkt and NAT"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2548", name="WIFI-2548")
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt60
-    def test_client_wpa_personal_pkt_60_5g(self, get_vif_state,
-                                           lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                           get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and fiveg"
+    def test_client_wpa_personal_NAT_pkt_60_5g(self, 
+                                                  lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                  get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "fiveg"
         vlan = 1
@@ -372,16 +351,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_5G_60",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_60",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -402,16 +378,16 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt142
-    def test_client_wpa_personal_pkt_142_5g(self, get_vif_state,
-                                            lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                            get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and fiveg"
+    def test_client_wpa_personal_NAT_pkt_142_5g(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "fiveg"
         vlan = 1
@@ -420,16 +396,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_5G_142",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_142",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -450,16 +423,16 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt256
-    def test_client_wpa_personal_pkt_256_5g(self, get_vif_state,
-                                            lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                            get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and fiveg"
+    def test_client_wpa_personal_NAT_pkt_256_5g(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "fiveg"
         vlan = 1
@@ -468,16 +441,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_5G_256",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_256",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -498,16 +468,16 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt512
-    def test_client_wpa_personal_pkt_512_5g(self, get_vif_state,
-                                            lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                            get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and fiveg"
+    def test_client_wpa_personal_NAT_pkt_512_5g(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "fiveg"
         vlan = 1
@@ -516,16 +486,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_5G_512",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_512",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -546,16 +513,16 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pkt1024
-    def test_client_wpa_personal_pkt_1024_5g(self, get_vif_state,
-                                             lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                             get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and fiveg"
+    def test_client_wpa_personal_NAT_pkt_1024_5g(self, 
+                                                    lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                    get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "fiveg"
         vlan = 1
@@ -564,16 +531,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_5G_1024",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_1024",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -594,16 +558,16 @@ class TestThroughputVsPktNatOpen5G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.fiveg
     @pytest.mark.pktMTU
-    def test_client_wpa_personal_pkt_MTU_5g(self, get_vif_state,
-                                            lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
-                                            get_configuration):
-        """Throughput Vs Pkt Sizes nat Mode
-           pytest -m "throughput_vs_pkt and nat and wpa_personal and fiveg"
+    def test_client_wpa_personal_NAT_pkt_MTU_5g(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
+        """Throughput Vs Pkt Sizes NAT MODE
+           pytest -m "throughput_vs_pkt and NAT and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "NAT"
         band = "fiveg"
         vlan = 1
@@ -612,16 +576,13 @@ class TestThroughputVsPktNatOpen5G(object):
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_NAT_5G_MTU",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_MTU",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
diff --git a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_vlan_mode.py b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_vlan_mode.py
index f785ec053..6c499ba03 100644
--- a/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/throughput_benchmark/throughput_vs_various_pkt_sizes/wpa_security/test_vlan_mode.py
@@ -1,23 +1,27 @@
 """
 
     Performance Test: Throughput vs Various Pkt Size Test: VLAN MODE
-    pytest -m "throughput_vs_pkt and vlan"
+    pytest -m "throughput_vs_pkt and VLAN"
 
 """
 import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.throughput_vs_pkt, pytest.mark.vlan, pytest.mark.wpa,
-              pytest.mark.usefixtures("setup_test_run")]
+pytestmark = [pytest.mark.wifi_capacity_test, pytest.mark.vlan]
+
 
 setup_params_general = {
     "mode": "VLAN",
     "ssid_modes": {
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}]},
-
+        "wpa_personal": [{"ssid_name": "ssid_wpa_2g",
+                          "appliedRadios": ["2G"],
+                          "security_key": "something",
+                          "vlan":100},
+                         {"ssid_name": "ssid_wpa_5g",
+                          "appliedRadios": ["5G"],
+                          "security_key": "something",
+                          "vlan":100}]},
     "rf": {},
     "radius": False
 }
@@ -31,43 +35,39 @@ setup_params_general = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-@pytest.mark.wpa
-class TestThroughputVsPktVlanWpa2G(object):
-    """Throughput vs Various Pkt Size Test vlan mode
-       pytest -m "throughput_vs_pkt and vlan"
+class TestThroughputVsPktVLANWpa2G(object):
+    """Throughput vs Various Pkt Size Test VLAN MODE
+       pytest -m "throughput_vs_pkt and VLAN"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2548", name="WIFI-2548")
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt60
-    def test_client_wpa_personal_pkt_60_2g(self, get_vif_state,
-                                           lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                           get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_60_2g(self, 
+                                                  lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                  get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and twog"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 60'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_2G_60",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_60",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -88,34 +88,31 @@ class TestThroughputVsPktVlanWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt142
-    def test_client_wpa_personal_pkt_142_2g(self, get_vif_state,
-                                            lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                            get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_142_2g(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and twog"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 142'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_2G_142",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_142",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -136,34 +133,31 @@ class TestThroughputVsPktVlanWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt256
-    def test_client_wpa_personal_pkt_256_2g(self, get_vif_state,
-                                            lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                            get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_256_2g(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and twog"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 256'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_2G_256",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_256",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -184,34 +178,31 @@ class TestThroughputVsPktVlanWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt512
-    def test_client_wpa_personal_pkt_512_2g(self, get_vif_state,
-                                            lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                            get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_512_2g(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and twog"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 512'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_2G_512",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_512",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -232,34 +223,31 @@ class TestThroughputVsPktVlanWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pkt1024
-    def test_client_wpa_personal_pkt_1024_2g(self, get_vif_state,
-                                             lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                             get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_1024_2g(self, 
+                                                    lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                    get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and twog"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 1024'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_2G_1024",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_1024",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -280,34 +268,31 @@ class TestThroughputVsPktVlanWpa2G(object):
     @pytest.mark.wpa_personal
     @pytest.mark.twog
     @pytest.mark.pktMTU
-    def test_client_wpa_personal_pkt_MTU_2g(self, get_vif_state,
-                                            lf_test, station_names_twog, create_lanforge_chamberview_dut,
-                                            get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_MTU_2g(self, 
+                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and twog"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and twog"
         """
         profile_data = setup_params_general["ssid_modes"]["wpa_personal"][0]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
         band = "twog"
-        vlan = 1
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: MTU'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
                                          station_name=station_names_twog, vlan_id=vlan)
 
         if station:
             dp_obj = lf_test.dataplane(station_name=station_names_twog, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_2G_MTU",
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_2G_MTU",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -328,9 +313,10 @@ class TestThroughputVsPktVlanWpa2G(object):
 setup_params_5g = {
     "mode": "VLAN",
     "ssid_modes": {
-        "wpa": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
-                {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
-                 "security_key": "something"}]},
+        "wpa_personal": [{"ssid_name": "ssid_wpa_2g", "appliedRadios": ["2G"], "security_key": "something"},
+                         {"ssid_name": "ssid_wpa_5g", "appliedRadios": ["5G"],
+                          "security_key": "something"}]},
+
     "rf": {},
     "radius": False
 }
@@ -344,43 +330,39 @@ setup_params_5g = {
     scope="class"
 )
 @pytest.mark.usefixtures("setup_profiles")
-@pytest.mark.wpa
-class TestThroughputVsPktVlan5G(object):
-    """Throughput vs Various Pkt Size Test vlan mode
-       pytest -m "throughput_vs_pkt and vlan"
+class TestThroughputVsPktVLANWpa5G(object):
+    """Throughput vs Various Pkt Size Test VLAN MODE
+       pytest -m "throughput_vs_pkt and VLAN"
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2548", name="WIFI-2548")
     @pytest.mark.wpa_personal
-    @pytest.mark.fivg
+    @pytest.mark.fiveg
     @pytest.mark.pkt60
-    def test_client_wpa_personal_pkt_60_5g(self, get_vif_state,
-                                           lf_test, station_names_fivg, create_lanforge_chamberview_dut,
-                                           get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_60_5g(self, 
+                                                  lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                  get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and fivg"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
-        band = "fivg"
-        vlan = 1
+        band = "fiveg"
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 60'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
-                                         station_name=station_names_fivg, vlan_id=vlan)
+                                         station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
-            dp_obj = lf_test.dataplane(station_name=station_names_fivg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_5G_60",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_60",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -392,43 +374,40 @@ class TestThroughputVsPktVlan5G(object):
                 allure.attach.file(source="../reports/" + report_name + "/" + pdf,
                                    name=get_configuration["access_point"][0]["model"] + "_dataplane")
             print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fivg)
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
             assert station
         else:
             assert False
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2548", name="WIFI-2548")
     @pytest.mark.wpa_personal
-    @pytest.mark.fivg
+    @pytest.mark.fiveg
     @pytest.mark.pkt142
-    def test_client_wpa_personal_pkt_142_5g(self, get_vif_state,
-                                            lf_test, station_names_fivg, create_lanforge_chamberview_dut,
-                                            get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_142_5g(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and fivg"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
-        band = "fivg"
-        vlan = 1
+        band = "fiveg"
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 142'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
-                                         station_name=station_names_fivg, vlan_id=vlan)
+                                         station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
-            dp_obj = lf_test.dataplane(station_name=station_names_fivg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_5G_142",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_142",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -440,43 +419,40 @@ class TestThroughputVsPktVlan5G(object):
                 allure.attach.file(source="../reports/" + report_name + "/" + pdf,
                                    name=get_configuration["access_point"][0]["model"] + "_dataplane")
             print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fivg)
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
             assert station
         else:
             assert False
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2548", name="WIFI-2548")
     @pytest.mark.wpa_personal
-    @pytest.mark.fivg
+    @pytest.mark.fiveg
     @pytest.mark.pkt256
-    def test_client_wpa_personal_pkt_256_5g(self, get_vif_state,
-                                            lf_test, station_names_fivg, create_lanforge_chamberview_dut,
-                                            get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_256_5g(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and fivg"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
-        band = "fivg"
-        vlan = 1
+        band = "fiveg"
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 256'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
-                                         station_name=station_names_fivg, vlan_id=vlan)
+                                         station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
-            dp_obj = lf_test.dataplane(station_name=station_names_fivg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_5G",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_256",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -488,43 +464,40 @@ class TestThroughputVsPktVlan5G(object):
                 allure.attach.file(source="../reports/" + report_name + "/" + pdf,
                                    name=get_configuration["access_point"][0]["model"] + "_dataplane")
             print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fivg)
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
             assert station
         else:
             assert False
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2548", name="WIFI-2548")
     @pytest.mark.wpa_personal
-    @pytest.mark.fivg
+    @pytest.mark.fiveg
     @pytest.mark.pkt512
-    def test_client_wpa_personal_pkt_512_5g(self, get_vif_state,
-                                            lf_test, station_names_fivg, create_lanforge_chamberview_dut,
-                                            get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_512_5g(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and fivg"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
-        band = "fivg"
-        vlan = 1
+        band = "fiveg"
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 512'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
-                                         station_name=station_names_fivg, vlan_id=vlan)
+                                         station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
-            dp_obj = lf_test.dataplane(station_name=station_names_fivg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_5G_512",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_512",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -536,43 +509,40 @@ class TestThroughputVsPktVlan5G(object):
                 allure.attach.file(source="../reports/" + report_name + "/" + pdf,
                                    name=get_configuration["access_point"][0]["model"] + "_dataplane")
             print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fivg)
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
             assert station
         else:
             assert False
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2548", name="WIFI-2548")
     @pytest.mark.wpa_personal
-    @pytest.mark.fivg
+    @pytest.mark.fiveg
     @pytest.mark.pkt1024
-    def test_client_wpa_personal_pkt_1024_5g(self, get_vif_state,
-                                             lf_test, station_names_fivg, create_lanforge_chamberview_dut,
-                                             get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_1024_5g(self, 
+                                                    lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                    get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and fivg"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
-        band = "fivg"
-        vlan = 1
+        band = "fiveg"
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: 1024'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
-                                         station_name=station_names_fivg, vlan_id=vlan)
+                                         station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
-            dp_obj = lf_test.dataplane(station_name=station_names_fivg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_5G_1024",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_1024",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -584,43 +554,40 @@ class TestThroughputVsPktVlan5G(object):
                 allure.attach.file(source="../reports/" + report_name + "/" + pdf,
                                    name=get_configuration["access_point"][0]["model"] + "_dataplane")
             print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fivg)
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
             assert station
         else:
             assert False
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2548", name="WIFI-2548")
     @pytest.mark.wpa_personal
-    @pytest.mark.fivg
+    @pytest.mark.fiveg
     @pytest.mark.pktMTU
-    def test_client_wpa_personal_pkt_MTU_5g(self, get_vif_state,
-                                            lf_test, station_names_fivg, create_lanforge_chamberview_dut,
-                                            get_configuration):
+    def test_client_wpa_personal_VLAN_pkt_MTU_5g(self, 
+                                                   lf_test, station_names_fiveg, create_lanforge_chamberview_dut,
+                                                   get_configuration):
         """Throughput Vs Pkt Sizes VLAN MODE
-           pytest -m "throughput_vs_pkt and vlan and wpa_personal and fivg"
+           pytest -m "throughput_vs_pkt and VLAN and wpa_personal and fiveg"
         """
         profile_data = setup_params_5g["ssid_modes"]["wpa_personal"][1]
         ssid_name = profile_data["ssid_name"]
         security_key = profile_data["security_key"]
-        security = "wpa_personal"
+        security = "wpa"
         mode = "VLAN"
-        band = "fivg"
-        vlan = 1
+        band = "fiveg"
+        vlan = 100
         dut_name = create_lanforge_chamberview_dut
         raw_lines = [['pkts: MTU'],
                      ['directions: DUT Transmit;DUT Receive'],
                      ['traffic_types: UDP;TCP'], ["show_3s: 1"],
                      ["show_ll_graphs: 1"], ["show_log: 1"]]
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         station = lf_test.Client_Connect(ssid=ssid_name, security=security, passkey=security_key,
                                          mode=mode, band=band,
-                                         station_name=station_names_fivg, vlan_id=vlan)
+                                         station_name=station_names_fiveg, vlan_id=vlan)
 
         if station:
-            dp_obj = lf_test.dataplane(station_name=station_names_fivg, mode=mode,
-                                       instance_name="TIP_PERF_THRU_PKT_WPA_VLAN_5G_MTU",
+            dp_obj = lf_test.dataplane(station_name=station_names_fiveg, mode=mode,
+                                       instance_name="TIP_PERF_THRU_PKT_WPA_5G_MTU",
                                        vlan_id=vlan, dut_name=dut_name, raw_lines=raw_lines)
             report_name = dp_obj.report_name[0]['LAST']["response"].split(":::")[1].split("/")[-1]
             entries = os.listdir("../reports/" + report_name + '/')
@@ -632,7 +599,7 @@ class TestThroughputVsPktVlan5G(object):
                 allure.attach.file(source="../reports/" + report_name + "/" + pdf,
                                    name=get_configuration["access_point"][0]["model"] + "_dataplane")
             print("Test Completed... Cleaning up Stations")
-            lf_test.Client_disconnect(station_name=station_names_fivg)
+            lf_test.Client_disconnect(station_name=station_names_fiveg)
             assert station
         else:
             assert False
diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py
index 2e79694ec..5caf19cdd 100644
--- a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py
+++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_bridge_mode.py
@@ -44,8 +44,8 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
     """
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3926", name="WIFI-3926")
-    @pytest.mark.tcp_download
-    def test_client_wpa2_bridge_tcp_dl(self, get_vif_state, lf_tools, setup_profiles,
+    @pytest.mark.tcp_download_wct
+    def test_client_wpa2_BRIDGE_tcp_dl(self,  lf_tools, setup_profiles,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -56,10 +56,6 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        get_vif_state.append(ssid_name)
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
@@ -78,7 +74,7 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3927", name="WIFI-3927")
     @pytest.mark.udp_download
-    def test_client_wpa2_bridge_udp_dl(self, get_vif_state, lf_tools,
+    def test_client_wpa2_BRIDGE_udp_dl(self,  lf_tools,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -89,10 +85,6 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        get_vif_state.append(ssid_name)
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
@@ -111,7 +103,7 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3932", name="WIFI-3932")
     @pytest.mark.tcp_bidirectional
-    def test_client_wpa2_bridge_tcp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_BRIDGE_tcp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -122,9 +114,6 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
@@ -143,7 +132,7 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3933", name="WIFI-3933")
     @pytest.mark.udp_bidirectional
-    def test_client_wpa2_bridge_udp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_BRIDGE_udp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -154,9 +143,6 @@ class TestWifiCapacityBRIDGEModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
@@ -204,7 +190,7 @@ class TestWifiCapacityBRIDGEMode2G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3928", name="WIFI-3928")
     @pytest.mark.tcp_download
-    def test_client_wpa2_bridge_tcp_dl(self, get_vif_state, lf_tools, setup_profiles,
+    def test_client_wpa2_BRIDGE_tcp_dl(self,  lf_tools, setup_profiles,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -214,11 +200,8 @@ class TestWifiCapacityBRIDGEMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
-        lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
+        lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_dl", mode=mode, vlan_id=vlan,
                                         download_rate="1Gbps",
@@ -232,7 +215,7 @@ class TestWifiCapacityBRIDGEMode2G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3930", name="WIFI-3930")
     @pytest.mark.udp_download
-    def test_client_wpa2_bridge_udp_dl(self, get_vif_state, lf_tools,
+    def test_client_wpa2_BRIDGE_udp_dl(self,  lf_tools,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -242,11 +225,8 @@ class TestWifiCapacityBRIDGEMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
-        lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
+        lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_dl", mode=mode, vlan_id=vlan,
                                         download_rate="1Gbps",
@@ -260,7 +240,7 @@ class TestWifiCapacityBRIDGEMode2G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3934", name="WIFI-3934")
     @pytest.mark.tcp_bidirectional
-    def test_client_wpa2_bridge_tcp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_BRIDGE_tcp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -270,11 +250,8 @@ class TestWifiCapacityBRIDGEMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
-        lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
+        lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_bi", mode=mode, vlan_id=vlan,
                                         download_rate="1Gbps",
@@ -288,7 +265,7 @@ class TestWifiCapacityBRIDGEMode2G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3935", name="WIFI-3935")
     @pytest.mark.udp_bidirectional
-    def test_client_wpa2_bridge_udp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_BRIDGE_udp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -298,11 +275,8 @@ class TestWifiCapacityBRIDGEMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
-        lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
+        lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_bi", mode=mode, vlan_id=vlan,
                                         download_rate="1Gbps",
@@ -345,7 +319,7 @@ class TestWifiCapacityBRIDGEMode5G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3929", name="WIFI-3929")
     @pytest.mark.tcp_download
-    def test_client_wpa2_bridge_tcp_dl(self, get_vif_state, lf_tools, setup_profiles,
+    def test_client_wpa2_BRIDGE_tcp_dl(self,  lf_tools, setup_profiles,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -355,11 +329,8 @@ class TestWifiCapacityBRIDGEMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
+        lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
-        lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_dl", mode=mode, vlan_id=vlan,
                                         download_rate="1Gbps",
@@ -373,7 +344,7 @@ class TestWifiCapacityBRIDGEMode5G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3931", name="WIFI-3931")
     @pytest.mark.udp_download
-    def test_client_wpa2_bridge_udp_dl(self, get_vif_state, lf_tools,
+    def test_client_wpa2_BRIDGE_udp_dl(self,  lf_tools,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -383,11 +354,8 @@ class TestWifiCapacityBRIDGEMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
+        lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
-        lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_dl", mode=mode, vlan_id=vlan,
                                         download_rate="1Gbps",
@@ -401,7 +369,7 @@ class TestWifiCapacityBRIDGEMode5G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3936", name="WIFI-3936")
     @pytest.mark.tcp_bidirectional
-    def test_client_wpa2_bridge_tcp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_BRIDGE_tcp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -411,11 +379,8 @@ class TestWifiCapacityBRIDGEMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
+        lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
-        lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_tcp_bi", mode=mode, vlan_id=vlan,
                                         download_rate="1Gbps",
@@ -429,7 +394,7 @@ class TestWifiCapacityBRIDGEMode5G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3937", name="WIFI-3937")
     @pytest.mark.udp_bidirectional
-    def test_client_wpa2_bridge_udp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_BRIDGE_udp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test BRIDGE mode
@@ -439,11 +404,8 @@ class TestWifiCapacityBRIDGEMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "BRIDGE"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
+        lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
-        lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_BRIDGE_udp_bi", mode=mode, vlan_id=vlan,
                                         download_rate="1Gbps",
diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_nat_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_nat_mode.py
index 699963461..5d68fea35 100644
--- a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_nat_mode.py
+++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_nat_mode.py
@@ -42,7 +42,7 @@ class TestWifiCapacityNATModeDualBand(object):
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3926", name="WIFI-3926")
     @pytest.mark.tcp_download
-    def test_client_wpa2_NAT_tcp_dl(self, get_vif_state, lf_tools, setup_profiles,
+    def test_client_wpa2_NAT_tcp_dl(self, lf_tools, setup_profiles,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test NAT mode
@@ -52,9 +52,6 @@ class TestWifiCapacityNATModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
@@ -71,7 +68,7 @@ class TestWifiCapacityNATModeDualBand(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3927", name="WIFI-3927")
     @pytest.mark.udp_download
-    def test_client_wpa2_NAT_udp_dl(self, get_vif_state, lf_tools,
+    def test_client_wpa2_NAT_udp_dl(self, lf_tools,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test NAT mode
@@ -81,9 +78,6 @@ class TestWifiCapacityNATModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
@@ -110,9 +104,6 @@ class TestWifiCapacityNATModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
@@ -139,9 +130,6 @@ class TestWifiCapacityNATModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
@@ -196,9 +184,6 @@ class TestWifiCapacityNATMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
@@ -224,9 +209,6 @@ class TestWifiCapacityNATMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
@@ -252,9 +234,6 @@ class TestWifiCapacityNATMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
@@ -280,9 +259,6 @@ class TestWifiCapacityNATMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
@@ -336,9 +312,6 @@ class TestWifiCapacityNATMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
@@ -364,9 +337,6 @@ class TestWifiCapacityNATMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
@@ -392,9 +362,6 @@ class TestWifiCapacityNATMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
@@ -420,9 +387,6 @@ class TestWifiCapacityNATMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "NAT"
         vlan = 1
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="ax", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
diff --git a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_vlan_mode.py b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_vlan_mode.py
index e650df793..1356c0049 100644
--- a/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_vlan_mode.py
+++ b/tests/e2e/basic/performance_tests/wifi_capacity_test/wpa2_personal/test_vlan_mode.py
@@ -8,8 +8,7 @@ import os
 import pytest
 import allure
 
-pytestmark = [pytest.mark.performance, pytest.mark.VLAN]
-# """pytest.mark.usefixtures("setup_test_run")"""]
+pytestmark = [pytest.mark.performance, pytest.mark.vlan]
 
 
 setup_params_general_dual_band = {
@@ -42,7 +41,7 @@ class TestWifiCapacityVLANModeDualBand(object):
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3926", name="WIFI-3926")
     @pytest.mark.tcp_download
-    def test_client_wpa2_VLAN_tcp_dl(self, get_vif_state, lf_tools, setup_profiles,
+    def test_client_wpa2_VLAN_tcp_dl(self,  lf_tools, setup_profiles,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -52,9 +51,6 @@ class TestWifiCapacityVLANModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
@@ -70,7 +66,7 @@ class TestWifiCapacityVLANModeDualBand(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3927", name="WIFI-3927")
     @pytest.mark.udp_download
-    def test_client_wpa2_VLAN_udp_dl(self, get_vif_state, lf_tools,
+    def test_client_wpa2_VLAN_udp_dl(self,  lf_tools,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -80,9 +76,6 @@ class TestWifiCapacityVLANModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
@@ -98,7 +91,7 @@ class TestWifiCapacityVLANModeDualBand(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3932", name="WIFI-3932")
     @pytest.mark.tcp_bidirectional
-    def test_client_wpa2_VLAN_tcp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_VLAN_tcp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -108,9 +101,6 @@ class TestWifiCapacityVLANModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
@@ -126,7 +116,7 @@ class TestWifiCapacityVLANModeDualBand(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3933", name="WIFI-3933")
     @pytest.mark.udp_bidirectional
-    def test_client_wpa2_VLAN_udp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_VLAN_udp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -136,9 +126,6 @@ class TestWifiCapacityVLANModeDualBand(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
@@ -182,7 +169,7 @@ class TestWifiCapacityVLANMode2G(object):
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3928", name="WIFI-3928")
     @pytest.mark.tcp_download
-    def test_client_wpa2_VLAN_tcp_dl(self, get_vif_state, lf_tools, setup_profiles,
+    def test_client_wpa2_VLAN_tcp_dl(self,  lf_tools, setup_profiles,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -192,9 +179,6 @@ class TestWifiCapacityVLANMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_tcp_dl", mode=mode, vlan_id=vlan,
@@ -209,7 +193,7 @@ class TestWifiCapacityVLANMode2G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3930", name="WIFI-3930")
     @pytest.mark.udp_download
-    def test_client_wpa2_VLAN_udp_dl(self, get_vif_state, lf_tools,
+    def test_client_wpa2_VLAN_udp_dl(self,  lf_tools,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -219,9 +203,6 @@ class TestWifiCapacityVLANMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_udp_dl", mode=mode, vlan_id=vlan,
@@ -236,7 +217,7 @@ class TestWifiCapacityVLANMode2G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3934", name="WIFI-3934")
     @pytest.mark.tcp_bidirectional
-    def test_client_wpa2_VLAN_tcp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_VLAN_tcp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -246,9 +227,6 @@ class TestWifiCapacityVLANMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_tcp_bi", mode=mode, vlan_id=vlan,
@@ -263,7 +241,7 @@ class TestWifiCapacityVLANMode2G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3935", name="WIFI-3935")
     @pytest.mark.udp_bidirectional
-    def test_client_wpa2_VLAN_udp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_VLAN_udp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -273,9 +251,6 @@ class TestWifiCapacityVLANMode2G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="2G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_udp_bi", mode=mode, vlan_id=vlan,
@@ -318,7 +293,7 @@ class TestWifiCapacityVLANMode5G(object):
     """
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3929", name="WIFI-3929")
     @pytest.mark.tcp_download
-    def test_client_wpa2_VLAN_tcp_dl(self, get_vif_state, lf_tools, setup_profiles,
+    def test_client_wpa2_VLAN_tcp_dl(self,  lf_tools, setup_profiles,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -328,9 +303,6 @@ class TestWifiCapacityVLANMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_tcp_dl", mode=mode, vlan_id=vlan,
@@ -345,7 +317,7 @@ class TestWifiCapacityVLANMode5G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3931", name="WIFI-3931")
     @pytest.mark.udp_download
-    def test_client_wpa2_VLAN_udp_dl(self, get_vif_state, lf_tools,
+    def test_client_wpa2_VLAN_udp_dl(self,  lf_tools,
                                        lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                        get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -355,9 +327,6 @@ class TestWifiCapacityVLANMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_udp_dl", mode=mode, vlan_id=vlan,
@@ -372,7 +341,7 @@ class TestWifiCapacityVLANMode5G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3936", name="WIFI-3936")
     @pytest.mark.tcp_bidirectional
-    def test_client_wpa2_VLAN_tcp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_VLAN_tcp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -382,9 +351,6 @@ class TestWifiCapacityVLANMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_tcp_bi", mode=mode, vlan_id=vlan,
@@ -399,7 +365,7 @@ class TestWifiCapacityVLANMode5G(object):
 
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-3937", name="WIFI-3937")
     @pytest.mark.udp_bidirectional
-    def test_client_wpa2_VLAN_udp_bidirectional(self, get_vif_state, lf_tools,
+    def test_client_wpa2_VLAN_udp_bidirectional(self,  lf_tools,
                                                   lf_test, station_names_twog, create_lanforge_chamberview_dut,
                                                   get_configuration):
         """ Wifi Capacity Test VLAN mode
@@ -409,9 +375,6 @@ class TestWifiCapacityVLANMode5G(object):
         ssid_name = profile_data["ssid_name"]
         mode = "VLAN"
         vlan = 100
-        if ssid_name not in get_vif_state:
-            allure.attach(name="retest,vif state ssid not available:", body=str(get_vif_state))
-            pytest.xfail("SSID NOT AVAILABLE IN VIF STATE")
         lf_tools.add_stations(band="5G", num_stations="max", dut=lf_tools.dut_name, ssid_name=ssid_name)
         lf_tools.Chamber_View()
         wct_obj = lf_test.wifi_capacity(instance_name="test_client_wpa2_VLAN_udp_bi", mode=mode, vlan_id=vlan,
diff --git a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py
index 18ff709d9..2075d181e 100644
--- a/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py
+++ b/tests/e2e/basic/validation_of_operating_modes/bridge_mode/client_connectivity/test_general_security_modes.py
@@ -46,7 +46,6 @@ class TestBridgeModeConnectivitySuiteA(object):
         pytest -m "client_connectivity and bridge and general and suiteA"
     """
 
-    @pytest.mark.reg
     @pytest.mark.open
     @pytest.mark.twog
     @allure.testcase(url="https://telecominfraproject.atlassian.net/browse/WIFI-2809", name="JIRA LINK")
diff --git a/tests/fixtures_2x.py b/tests/fixtures_2x.py
index 0c9fc6343..fc1ae5bf2 100644
--- a/tests/fixtures_2x.py
+++ b/tests/fixtures_2x.py
@@ -42,21 +42,25 @@ from configuration import RADIUS_ACCOUNTING_DATA
 
 class Fixtures_2x:
 
-    def __init__(self, configuration={}):
+    def __init__(self, configuration={}, run_lf=False):
         self.lab_info = configuration
         print(self.lab_info)
         print("2.X")
-        try:
-            self.controller_obj = Controller(controller_data=self.lab_info["controller"])
-            self.fw_client = FMSUtils(sdk_client=self.controller_obj)
-        except Exception as e:
-            print(e)
-            allure.attach(body=str(e), name="Controller Instantiation Failed: ")
-            sdk_client = False
-            pytest.exit("unable to communicate to Controller" + str(e))
+        self.run_lf = run_lf
+        self.controller_obj=""
+        if not run_lf:
+            try:
+                self.controller_obj = Controller(controller_data=self.lab_info["controller"])
+                self.fw_client = FMSUtils(sdk_client=self.controller_obj)
+            except Exception as e:
+                print(e)
+                allure.attach(body=str(e), name="Controller Instantiation Failed: ")
+                sdk_client = False
+                pytest.exit("unable to communicate to Controller" + str(e))
 
     def disconnect(self):
-        self.controller_obj.logout()
+        if not self.run_lf:
+            self.controller_obj.logout()
 
     def setup_firmware(self, get_apnos, get_configuration, request=""):
         # Query AP Firmware
@@ -311,11 +315,13 @@ class Fixtures_2x:
         return status_data
 
     def get_ap_version(self, get_apnos, get_configuration):
+
         version_list = []
-        for access_point_info in get_configuration['access_point']:
-            ap_ssh = get_apnos(access_point_info)
-            version = ap_ssh.get_ap_version_ucentral()
-            version_list.append(version)
+        if not self.run_lf:
+            for access_point_info in get_configuration['access_point']:
+                ap_ssh = get_apnos(access_point_info)
+                version = ap_ssh.get_ap_version_ucentral()
+                version_list.append(version)
         return version_list
 
     def get_uci_show(self, get_apnos, get_configuration):
@@ -363,8 +369,9 @@ class Fixtures_2x:
     def setup_profiles(self, request, param, setup_controller, testbed, get_equipment_ref,
                        instantiate_profile, get_markers, create_lanforge_chamberview_dut, lf_tools,
                        get_security_flags, get_configuration, radius_info, get_apnos,
-                       radius_accounting_info, skip_lf=False, open_flow=None):
-
+                       radius_accounting_info, skip_lf=False, run_lf=False):
+        if run_lf:
+           return 0
         instantiate_profile_obj = instantiate_profile(sdk_client=setup_controller)
         print(1, instantiate_profile_obj.sdk_client)
         vlan_id, mode = 0, 0