diff --git a/libs/perfecto_interop/android_libs.py b/libs/perfecto_interop/android_libs.py
index c0d5bc704..b6ca30228 100644
--- a/libs/perfecto_interop/android_libs.py
+++ b/libs/perfecto_interop/android_libs.py
@@ -2613,7 +2613,7 @@ class android_libs:
 
             return WifiFlag
 
-        else:#------------------For Pixcel4 ------------------------
+        else:#------------------For Pixel4 ------------------------
             try:    # Disabling wifi-toggle button
                 time.sleep(2)
                 print("--Disable Wifi Radio Button")
diff --git a/libs/perfecto_interop/android_tests.py b/libs/perfecto_interop/android_tests.py
index b398bec21..f9bc0323a 100644
--- a/libs/perfecto_interop/android_tests.py
+++ b/libs/perfecto_interop/android_tests.py
@@ -217,14 +217,13 @@ class AndroidTests(android_libs):
     def toggle_wifi_mode_test(self, ssid, passkey):
         self.setup_perfectoMobile = list(self.setup_perfectoMobile_android(get_device_configuration=
                                                                            self.perfecto_data[self.device],
-                                                                           perfecto_data=self.perfecto_data,
-                                                                           testcase=self.testcase_name))
+                                                                           perfecto_data=self.perfecto_data))
         setup_perfecto_mobile = self.setup_perfectoMobile[0]
         try:
-            ssid_with_internet, setup = self.wifi_connect(ssid=ssid, passkey=passkey,
+            ssid_with_internet, setup, ssid_found = self.wifi_connect(ssid=ssid, passkey=passkey,
                                                           setup_perfectoMobile=setup_perfecto_mobile,
                                                           connData=self.connData)
-            if ssid_with_internet is True:
+            if ssid_with_internet is True and ssid_found is True:
                 wifi_toggling = self.toggle_wifi_mode(ssid=ssid, setup_perfectoMobile=setup_perfecto_mobile,
                                                     connData=self.connData)
                 self.closeApp(self.connData["appPackage-android"], setup)
@@ -300,8 +299,8 @@ if __name__ == '__main__':
     }]
     obj = AndroidTests(perfecto_data=perfecto_data, dut_data=access_point, device="Galaxy S10.*",
                        testcase="Test_perfecto_check")
-    print(obj.client_connectivity_test("ssid_wpa_5g_br_NE38276", security=None,
-                                       dut_data=None, passkey="something", mode=None, band=None, num_sta=None))
+    # print(obj.client_connectivity_test("ssid_wpa_5g_br_NE38276", security=None,
+    #                                    dut_data=None, passkey="something", mode=None, band=None, num_sta=None))
 
     # print(obj.rate_limiting_test(ssid="ssid_wpa2_2g_RL_1VE7537",passkey="something",up_rate="60",down_rate="10"))
     # print(obj.enterprise_client_connect(ssid="ssid_wpa_eap_5g_5O05610", identity="nolaradius", ttls_passwd="nolastart"))
diff --git a/libs/perfecto_interop/ios_tests.py b/libs/perfecto_interop/ios_tests.py
index 1d5956c44..94ec046f6 100644
--- a/libs/perfecto_interop/ios_tests.py
+++ b/libs/perfecto_interop/ios_tests.py
@@ -178,14 +178,13 @@ class ios_tests(ios_libs):
     def toggle_wifi_mode_test(self, ssid, passkey):
         self.setup_perfectoMobile = list(self.setup_perfectoMobile_iOS(get_device_configuration=
                                                                        self.perfecto_data[self.device],
-                                                                       perfecto_data=self.perfecto_data,
-                                                                       testcase=self.testcase_name))
+                                                                       perfecto_data=self.perfecto_data))
         setup_perfecto_mobile = self.setup_perfectoMobile[0]
         try:
-            ssid_with_internet, setup = self.wifi_connect(ssid=ssid, passkey=passkey,
+            ssid_with_internet, setup, ssid_found = self.wifi_connect(ssid=ssid, passkey=passkey,
                                                           setup_perfectoMobile=setup_perfecto_mobile,
                                                           connData=self.connData)
-            if ssid_with_internet is True:
+            if ssid_with_internet is True and ssid_found is True:
                 wifi_toggleing = self.toggle_wifi_mode(ssid=ssid, setup_perfectoMobile=setup_perfecto_mobile,
                                                     connData=self.connData)
                 self.closeApp(self.connData["bundleId-iOS-Settings"], setup)