diff --git a/.gitlab/tests/cram/generic/ubus-datamodel-list.t b/.gitlab/tests/cram/generic/ubus-datamodel-list.t
index 24aa0dde9d..3a9d60adef 100644
--- a/.gitlab/tests/cram/generic/ubus-datamodel-list.t
+++ b/.gitlab/tests/cram/generic/ubus-datamodel-list.t
@@ -207,73 +207,10 @@ Check that ubus has expected datamodels available:
   Users.User
   WiFi
   WiFi.AccessPoint
-  WiFi.AccessPoint.AssociatedDevice
-  WiFi.AccessPoint.AssociatedDevice.ProbeReqCaps
-  WiFi.AccessPoint.AssociationCount
-  WiFi.AccessPoint.AssociationCount.FastReconnectTypes
-  WiFi.AccessPoint.DriverConfig
-  WiFi.AccessPoint.HotSpot2
-  WiFi.AccessPoint.IEEE80211r
-  WiFi.AccessPoint.IEEE80211u
-  WiFi.AccessPoint.MACFiltering
-  WiFi.AccessPoint.MACFiltering.Entry
-  WiFi.AccessPoint.MACFiltering.TempEntry
-  WiFi.AccessPoint.Neighbour
-  WiFi.AccessPoint.ProbeFiltering
-  WiFi.AccessPoint.ProbeFiltering.TempEntry
-  WiFi.AccessPoint.RssiEventing
-  WiFi.AccessPoint.Security
-  WiFi.AccessPoint.VendorIEs
-  WiFi.AccessPoint.VendorIEs.VendorIE
-  WiFi.AccessPoint.WPS
   WiFi.AutoCommitMgr
   WiFi.EndPoint
-  WiFi.EndPoint.AssocStats
-  WiFi.EndPoint.Profile
-  WiFi.EndPoint.Profile.Security
-  WiFi.EndPoint.Security
-  WiFi.EndPoint.Stats
-  WiFi.EndPoint.WPS
   WiFi.Radio
-  WiFi.Radio.ChannelMgt
-  WiFi.Radio.DFS
-  WiFi.Radio.DFS.Event
-  WiFi.Radio.DriverConfig
-  WiFi.Radio.DriverStatus
-  WiFi.Radio.EventCounter
-  WiFi.Radio.MACConfig
-  WiFi.Radio.NaStaMonitor
-  WiFi.Radio.NaStaMonitor.MonitorDevice
-  WiFi.Radio.NaStaMonitor.NonAssociatedDevice
-  WiFi.Radio.NaStaMonitor.RssiEventing
-  WiFi.Radio.RadCaps
-  WiFi.Radio.ScanConfig
-  WiFi.Radio.ScanResults
-  WiFi.Radio.ScanResults.SurroundingChannels
-  WiFi.Radio.ScanResults.SurroundingChannels.Accesspoint
-  WiFi.Radio.ScanResults.SurroundingChannels.Accesspoint.SSID
-  WiFi.Radio.ScanStats
-  WiFi.Radio.ScanStats.ScanReason
-  WiFi.Radio.Stats
-  WiFi.Radio.Stats.WmmBytesReceived
-  WiFi.Radio.Stats.WmmBytesSent
-  WiFi.Radio.Stats.WmmFailedBytesReceived
-  WiFi.Radio.Stats.WmmFailedReceived
-  WiFi.Radio.Stats.WmmFailedSent
-  WiFi.Radio.Stats.WmmFailedbytesSent
-  WiFi.Radio.Stats.WmmPacketsReceived
-  WiFi.Radio.Stats.WmmPacketsSent
-  WiFi.Radio.Vendor
   WiFi.SSID
-  WiFi.SSID.Stats
-  WiFi.SSID.Stats.WmmBytesReceived
-  WiFi.SSID.Stats.WmmBytesSent
-  WiFi.SSID.Stats.WmmFailedBytesReceived
-  WiFi.SSID.Stats.WmmFailedReceived
-  WiFi.SSID.Stats.WmmFailedSent
-  WiFi.SSID.Stats.WmmFailedbytesSent
-  WiFi.SSID.Stats.WmmPacketsReceived
-  WiFi.SSID.Stats.WmmPacketsSent
   WiFi.wps_DefParam
   XPON
   XPON.ONU
diff --git a/.gitlab/tests/cram/glinet-b1300/010-network.t b/.gitlab/tests/cram/glinet-b1300/010-network.t
index 79a6fa59a0..6a5c533593 100644
--- a/.gitlab/tests/cram/glinet-b1300/010-network.t
+++ b/.gitlab/tests/cram/glinet-b1300/010-network.t
@@ -24,5 +24,7 @@ Check correct interface setup:
    lo: <LOOPBACK,UP,LOWER_UP> mtu 65535 qdisc noqueue state UNKNOWN mode DEFAULT group default qlen 1000
    teql0: <NOARP> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 100
    veth_gene_0@if3: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master br-lan state UP mode DEFAULT group default qlen 1000
-   wlan0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
-   wlan1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
\ No newline at end of file
+   wlan0.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
+   wlan0: <BROADCAST,MULTICAST> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
+   wlan1.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
+   wlan1: <BROADCAST,MULTICAST> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
diff --git a/.gitlab/tests/cram/glinet-b1300/020-ubus.t b/.gitlab/tests/cram/glinet-b1300/020-ubus.t
index 859a6625db..2ca2924a20 100644
--- a/.gitlab/tests/cram/glinet-b1300/020-ubus.t
+++ b/.gitlab/tests/cram/glinet-b1300/020-ubus.t
@@ -307,7 +307,6 @@ Check that NetModel.Intf provides expected output:
   dslite netdev
   dslite-dslite0
   dslite0
-  ep5g0
   eth0
   eth0
   eth1
@@ -447,7 +446,7 @@ Check that NetModel.Intf provides expected output:
   radio-wifi1
   resolver
   resolver
-  ssid netdev
+  ssid netdev netdev-bound
   ssid netdev netdev-bound
   ssid netdev netdev-bound
   ssid netdev netdev-bound
@@ -491,4 +490,5 @@ Check that NetModel.Intf provides expected output:
   wlan0.1
   wlan1
   wlan1
+  wlan1
   wlan1.1
diff --git a/.gitlab/tests/cram/turris-omnia/010-network.t b/.gitlab/tests/cram/turris-omnia/010-network.t
index f3fff41518..e7ec185c75 100644
--- a/.gitlab/tests/cram/turris-omnia/010-network.t
+++ b/.gitlab/tests/cram/turris-omnia/010-network.t
@@ -29,6 +29,6 @@ Check correct interface setup:
    teql0: <NOARP> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 100
    veth_gene_0@if3: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue master br-lan state UP mode DEFAULT group default qlen 1000
    wlan0.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
-   wlan0: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
+   wlan0: <BROADCAST,MULTICAST> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
    wlan1.1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
-   wlan1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000
+   wlan1: <BROADCAST,MULTICAST> mtu 1500 qdisc noqueue state DOWN mode DEFAULT group default qlen 1000