diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/105-pwhm-wpa3-cm.t b/.gitlab/tests/cram/mxl25641-hdk-6/105-pwhm-wpa3-cm.t
index db887059fa..26521c390a 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/105-pwhm-wpa3-cm.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/105-pwhm-wpa3-cm.t
@@ -27,11 +27,20 @@ Stop prplmesh:
 
 Provisory: update Security.ModesAvailable as required by PPM-3660
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio0'].Security.ModesAvailable='None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.1'].Security.ModesAvailable='None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE'\"" | grep 'ModesAvailable=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio2'].Security.ModesAvailable='None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.2'].Security.ModesAvailable='None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE'\"" | grep 'ModesAvailable=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio4'].Security.ModesAvailable='WPA3-Personal,WPA3-Personal-Compatibility,OWE'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.3'].Security.ModesAvailable='WPA3-Personal,WPA3-Personal-Compatibility,OWE'\"" | grep 'ModesAvailable=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
 
 Silently disable MLO:
 
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 8c25219142..f32441f295 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/110-prplmesh-dataelements.t
@@ -246,11 +246,20 @@ Check that wireless is disabled:
 
 Restore Security Mode to default values
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio0'].Security.ModeEnabled='WPA2-WPA3-Personal'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.1'].Security.ModeEnabled='WPA2-WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio2'].Security.ModeEnabled='WPA2-WPA3-Personal'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.2'].Security.ModeEnabled='WPA2-WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio4'].Security.ModeEnabled='WPA3-Personal'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.3'].Security.ModeEnabled='WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal" (re)
 
 Check the default ChipsetVendor param configurations:
 
diff --git a/.gitlab/tests/cram/wnc-freedom/105-pwhm-wpa3-cm.t b/.gitlab/tests/cram/wnc-freedom/105-pwhm-wpa3-cm.t
index 9e54a83c95..fee1063c52 100644
--- a/.gitlab/tests/cram/wnc-freedom/105-pwhm-wpa3-cm.t
+++ b/.gitlab/tests/cram/wnc-freedom/105-pwhm-wpa3-cm.t
@@ -27,11 +27,20 @@ Stop prplmesh:
 
 Provisory: update Security.ModesAvailable as required by PPM-3660
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio0_band0'].Security.ModesAvailable='None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.1'].Security.ModesAvailable='None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE'\"" | grep 'ModesAvailable=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio0_band1'].Security.ModesAvailable='None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.2'].Security.ModesAvailable='None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE'\"" | grep 'ModesAvailable=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="None,WPA2-Personal,WPA3-Personal,WPA2-WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio0_band2'].Security.ModesAvailable='WPA3-Personal,WPA3-Personal-Compatibility,OWE'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.3'].Security.ModesAvailable='WPA3-Personal,WPA3-Personal-Compatibility,OWE'\"" | grep 'ModesAvailable=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
+  WiFi.AccessPoint.\d+.Security.ModesAvailable="WPA3-Personal,WPA3-Personal-Compatibility,OWE" (re)
 
 Silently disable MLO:
 
diff --git a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
index 5abf1b9523..bd8b6f91c0 100644
--- a/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
+++ b/.gitlab/tests/cram/wnc-freedom/110-prplmesh-dataelements.t
@@ -246,11 +246,20 @@ To disable wireless, disable instances of Network.AccessPoint{i} and call Access
 
 Restore Security.ModeEnabled for AccessPoints used in the test
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio0_band0'].Security.ModeEnabled='WPA2-WPA3-Personal'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.1'].Security.ModeEnabled='WPA2-WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio0_band1'].Security.ModeEnabled='WPA2-WPA3-Personal'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.2'].Security.ModeEnabled='WPA2-WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio0_band2'].Security.ModeEnabled='WPA3-Personal'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.3'].Security.ModeEnabled='WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal" (re)
 
 Check that wireless is disabled:
 
@@ -280,11 +289,20 @@ Check that SSIDs did not change:
 
 Restore Security Mode to default values
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio0_band0'].Security.ModeEnabled='WPA2-WPA3-Personal'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.1'].Security.ModeEnabled='WPA2-WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio0_band1'].Security.ModeEnabled='WPA2-WPA3-Personal'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.2'].Security.ModeEnabled='WPA2-WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA2-WPA3-Personal" (re)
 
-  $ R "ba-cli \"WiFi.AccessPoint.[RadioReference == 'WiFi.Radio.radio0_band2'].Security.ModeEnabled='WPA3-Personal'\" > /dev/null "
+  $ R "ba-cli  \"WiFi.AccessPoint.[RadioReference == 'Device.WiFi.Radio.3'].Security.ModeEnabled='WPA3-Personal'\"" | grep 'ModeEnabled=' | sed '/^$/d' | grep -v '>'
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal" (re)
+  WiFi.AccessPoint.\d+.Security.ModeEnabled="WPA3-Personal" (re)
 
 Check the default ChipsetVendor param configurations: