diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
index 5c0e82d54e..833b803ddd 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
@@ -281,62 +281,3 @@ Check the default ChipsetVendor param configurations:
   MaxLinear
   MaxLinear
   MaxLinear
-
-To return back SSID, remove instances:
-
-  $ R logger -t cram "Stop wireless"
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"SSID\":\"prplOS\"}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"SSID":"prplOS"}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"SSID\":\"prplOS-guest\"}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"SSID":"prplOS-guest"}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"Enable\":1}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"Enable":true}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"Enable\":1}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"Enable":true}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network AccessPointCommit"
-  {"retval":""}
-  {}
-  {"amxd-error-code":0}
-
-  $ sleep 5
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"Enable\":0}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"Enable":false}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"Enable\":0}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"Enable":false}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network AccessPointCommit"
-  {"retval":""}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _del"
-  {"retval":["X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.","X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.Security."]}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _del"
-  {"retval":["X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.","X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.Security."]}
-  {}
-  {"amxd-error-code":0}
-
-  $ sleep 10
-
diff --git a/.gitlab/tests/cram/wifi/dm-mapper.t b/.gitlab/tests/cram/wifi/dm-mapper.t
index b7560cf395..b874007fb5 100644
--- a/.gitlab/tests/cram/wifi/dm-mapper.t
+++ b/.gitlab/tests/cram/wifi/dm-mapper.t
@@ -53,6 +53,7 @@ Restart WiFiSensing mapper service and verify DM disappears/returns:
   root: pre-service hook wifi-sensing
 
   $ R "amx_wait_for Device.WiFi.X_PRPLWARE-COM_WiFiSensing."
+  $ sleep 10
 
 Write invalid value to Device.WiFi.AccessPoint.1.Enable and expect error:
 
diff --git a/.gitlab/tests/cram/wnc-freedom/100-pwhm_step_1.t b/.gitlab/tests/cram/wnc-freedom/100-pwhm_step_1.t
index f5d5a9bab3..f523d377db 100644
--- a/.gitlab/tests/cram/wnc-freedom/100-pwhm_step_1.t
+++ b/.gitlab/tests/cram/wnc-freedom/100-pwhm_step_1.t
@@ -356,3 +356,8 @@ Check wpacltrl socket file:
   wlan2.3_link2
 
   $ sleep 5
+
+Check if hostap pid has changed or not:
+
+  $ if [ "$(R pgrep -f 'hostapd')" = "$hostap_pid" ]; then echo "true"; else echo "hostap restarted during the test !"; fi
+  true
diff --git a/.gitlab/tests/cram/wnc-freedom/100-pwhm_step_2.t b/.gitlab/tests/cram/wnc-freedom/100-pwhm_step_2.t
index a024c61aac..24b00d771d 100644
--- a/.gitlab/tests/cram/wnc-freedom/100-pwhm_step_2.t
+++ b/.gitlab/tests/cram/wnc-freedom/100-pwhm_step_2.t
@@ -5,6 +5,11 @@ Create R alias:
 
   $ R "logger -t cram 'Starting PWHM test (step 2) ...'"
 
+Save hostap pid:
+
+  $ hostap_pid=$(R pgrep -f 'hostapd')
+  $ R logger -t cram "hostap PID : $hostap_pid"
+
 Check that hostapd is operating as expected:
 
   $ R logger -t cram "Check that hostapd is operating"
diff --git a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
index 4e6eacd56b..8c1d0edaab 100644
--- a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
@@ -326,62 +326,3 @@ Check the default ChipsetVendor param configurations:
   Qualcomm
   Qualcomm
   Qualcomm
-
-
-To return back SSID, remove instances:
-
-  $ R logger -t cram "Stop wireless"
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"SSID\":\"prplOS\"}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"SSID":"prplOS"}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"SSID\":\"prplOS-guest\"}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"SSID":"prplOS-guest"}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"Enable\":1}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"Enable":true}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"Enable\":1}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"Enable":true}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network AccessPointCommit"
-  {"retval":""}
-  {}
-  {"amxd-error-code":0}
-
-  $ sleep 5
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _set '{\"parameters\":{\"Enable\":0}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.":{"Enable":false}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _set '{\"parameters\":{\"Enable\":0}}'"
-  {"X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.":{"Enable":false}}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network AccessPointCommit"
-  {"retval":""}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1 _del"
-  {"retval":["X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.","X_PRPLWARE-COM_WiFiController.Network.AccessPoint.1.Security."]}
-  {}
-  {"amxd-error-code":0}
-
-  $ R "ubus -S call X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2 _del"
-  {"retval":["X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.","X_PRPLWARE-COM_WiFiController.Network.AccessPoint.2.Security."]}
-  {}
-  {"amxd-error-code":0}
-
-  $ sleep 10
diff --git a/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t b/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t
index 77928856c8..913663a4ac 100644
--- a/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t
+++ b/.gitlab/tests/cram/wnc-freedom/113-prplmesh-wpa3-cm.t
@@ -35,7 +35,7 @@ Check default SecMode:
 Check if private/guest VAPs contain WPA3-Personal-Compatibility in the Security.ModesAvailable list:
 (use the  regex AccessPoint\.[1-6]\+\.Security to filter out backhaul vaps )
 
-  $ wifi_dm "AccessPoint.*.Security.X_PRPLWARE-COM_ModesAvailable?" | sed -n 's/^\(WiFi\.AccessPoint\.[1-6]\+\.Security\.X_PRPLWARE-COM_ModesAvailable\).*WPA3-Personal-Compatibility.*/\1 has WPA3-Personal-Compatibility mode/p'
+  $ wifi_dm "AccessPoint.*.Security.X_PRPLWARE-COM_ModesAvailable?" | sed -n 's/^\(Device.WiFi\.AccessPoint\.[1-6]\+\.Security\.X_PRPLWARE-COM_ModesAvailable\).*WPA3-Personal-Compatibility.*/\1 has WPA3-Personal-Compatibility mode/p'
   Device.WiFi.AccessPoint.1.Security.X_PRPLWARE-COM_ModesAvailable has WPA3-Personal-Compatibility mode
   Device.WiFi.AccessPoint.2.Security.X_PRPLWARE-COM_ModesAvailable has WPA3-Personal-Compatibility mode
   Device.WiFi.AccessPoint.3.Security.X_PRPLWARE-COM_ModesAvailable has WPA3-Personal-Compatibility mode
diff --git a/.gitlab/tests/cram/wnc-freedom/121-dm-mapper-events.t b/.gitlab/tests/cram/wnc-freedom/121-dm-mapper-events.t
index cdde6d7539..fb82e97432 100644
--- a/.gitlab/tests/cram/wnc-freedom/121-dm-mapper-events.t
+++ b/.gitlab/tests/cram/wnc-freedom/121-dm-mapper-events.t
@@ -51,8 +51,8 @@ Register some data Change event from UBUS:
   $ R "cat /tmp/ubus_events"
   Event dm:object-changed
   {
-      eobject = "WiFi.AccessPoint.[DEFAULT_RADIO0_BAND0].",
-      object = "WiFi.AccessPoint.DEFAULT_RADIO0_BAND0.",
+      eobject = "WiFi.AccessPoint.[DEFAULT_RADIO0].",
+      object = "WiFi.AccessPoint.DEFAULT_RADIO0.",
       parameters = {
           Enable = {
               from = 0,