diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index d92978f5a6..58102ed371 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -2765,7 +2765,7 @@ wifi_list_aps (NMDeviceWifi *wifi,
                GArray *out_indices,
                const NMMetaAbstractInfo *const*tmpl,
                const char *bssid_user,
-               int rescan_cutoff)
+               gint64 rescan_cutoff)
 {
 	gboolean needs_rescan;
 	WifiListData *data;
@@ -2825,7 +2825,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
 	const NMMetaAbstractInfo *const*tmpl;
 	gs_unref_array GArray *out_indices = NULL;
 	int option;
-	int rescan_cutoff;
+	guint64 rescan_cutoff;
 
 	devices = nmc_get_devices_sorted (nmc->client);
 
@@ -2895,14 +2895,7 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv)
 		g_printerr (_("Unknown parameter: %s\n"), *argv);
 
 	if (rescan == NULL || strcmp (rescan, "auto") == 0) {
-		struct timespec tp;
-
-		if (clock_gettime (CLOCK_BOOTTIME, &tp) == -1) {
-			g_printerr (_("Failed to get CLOCK_BOOTTIME: %s\n"), strerror (errno));
-			rescan_cutoff = 0;
-		} else {
-			rescan_cutoff = MAX (tp.tv_sec - 30, 0);
-		}
+		rescan_cutoff = NM_MAX (nm_utils_get_timestamp_msec () - 30 * NM_UTILS_MSEC_PER_SECOND, 0);
 	} else if (strcmp (rescan, "no") == 0) {
 		rescan_cutoff = 0;
 	} else if (strcmp (rescan, "yes") == 0) {
diff --git a/clients/tests/test-client.check-on-disk/test_001-001.expected b/clients/tests/test-client.check-on-disk/test_001-001.expected
index 05483ea931..8762038812 100644
--- a/clients/tests/test-client.check-on-disk/test_001-001.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-001.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:755:test_001()/1
+location: clients/tests/test-client.py:752:test_001()/1
 cmd: $NMCLI 
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-002.expected b/clients/tests/test-client.check-on-disk/test_001-002.expected
index 9b0c896fc4..7d995122be 100644
--- a/clients/tests/test-client.check-on-disk/test_001-002.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-002.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:755:test_001()/2
+location: clients/tests/test-client.py:752:test_001()/2
 cmd: $NMCLI 
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-003.expected b/clients/tests/test-client.check-on-disk/test_001-003.expected
index 9a74222ee4..1378170e26 100644
--- a/clients/tests/test-client.check-on-disk/test_001-003.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-003.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:757:test_001()/3
+location: clients/tests/test-client.py:754:test_001()/3
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: C
 returncode: 10
diff --git a/clients/tests/test-client.check-on-disk/test_001-004.expected b/clients/tests/test-client.check-on-disk/test_001-004.expected
index 850155c564..3826df4538 100644
--- a/clients/tests/test-client.check-on-disk/test_001-004.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-004.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:757:test_001()/4
+location: clients/tests/test-client.py:754:test_001()/4
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 10
diff --git a/clients/tests/test-client.check-on-disk/test_001-005.expected b/clients/tests/test-client.check-on-disk/test_001-005.expected
index ae15bcc331..0ce8a62646 100644
--- a/clients/tests/test-client.check-on-disk/test_001-005.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-005.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:759:test_001()/5
+location: clients/tests/test-client.py:756:test_001()/5
 cmd: $NMCLI c s
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-006.expected b/clients/tests/test-client.check-on-disk/test_001-006.expected
index dc09ff75f1..52665c266d 100644
--- a/clients/tests/test-client.check-on-disk/test_001-006.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-006.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:759:test_001()/6
+location: clients/tests/test-client.py:756:test_001()/6
 cmd: $NMCLI c s
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-007.expected b/clients/tests/test-client.check-on-disk/test_001-007.expected
index 75436478ef..c5b269f0db 100644
--- a/clients/tests/test-client.check-on-disk/test_001-007.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-007.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:761:test_001()/7
+location: clients/tests/test-client.py:758:test_001()/7
 cmd: $NMCLI bogus s
 lang: C
 returncode: 2
diff --git a/clients/tests/test-client.check-on-disk/test_001-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected
index 8bdb38b7c9..b7f5f04d76 100644
--- a/clients/tests/test-client.check-on-disk/test_001-008.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-008.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:761:test_001()/8
+location: clients/tests/test-client.py:758:test_001()/8
 cmd: $NMCLI bogus s
 lang: pl_PL.UTF-8
 returncode: 2
diff --git a/clients/tests/test-client.check-on-disk/test_001-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected
index df3baaa13a..c762e51c2b 100644
--- a/clients/tests/test-client.check-on-disk/test_001-009.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-009.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/9
+location: clients/tests/test-client.py:761:test_001()/9
 cmd: $NMCLI general permissions
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-010.expected b/clients/tests/test-client.check-on-disk/test_001-010.expected
index 1772ba8130..677d7429b5 100644
--- a/clients/tests/test-client.check-on-disk/test_001-010.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-010.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/10
+location: clients/tests/test-client.py:761:test_001()/10
 cmd: $NMCLI general permissions
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected
index 321a648d02..757a19cb1f 100644
--- a/clients/tests/test-client.check-on-disk/test_001-011.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-011.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/11
+location: clients/tests/test-client.py:761:test_001()/11
 cmd: $NMCLI --pretty general permissions
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected
index 3a56019b3d..6cca955c70 100644
--- a/clients/tests/test-client.check-on-disk/test_001-012.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-012.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/12
+location: clients/tests/test-client.py:761:test_001()/12
 cmd: $NMCLI --pretty general permissions
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-013.expected b/clients/tests/test-client.check-on-disk/test_001-013.expected
index 0205329301..82241f0e69 100644
--- a/clients/tests/test-client.check-on-disk/test_001-013.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-013.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/13
+location: clients/tests/test-client.py:761:test_001()/13
 cmd: $NMCLI --terse general permissions
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-014.expected b/clients/tests/test-client.check-on-disk/test_001-014.expected
index d3c1db218a..f77108c97a 100644
--- a/clients/tests/test-client.check-on-disk/test_001-014.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-014.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/14
+location: clients/tests/test-client.py:761:test_001()/14
 cmd: $NMCLI --terse general permissions
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-015.expected b/clients/tests/test-client.check-on-disk/test_001-015.expected
index b0f6529626..a7dc531619 100644
--- a/clients/tests/test-client.check-on-disk/test_001-015.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-015.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/15
+location: clients/tests/test-client.py:761:test_001()/15
 cmd: $NMCLI --mode tabular general permissions
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-016.expected b/clients/tests/test-client.check-on-disk/test_001-016.expected
index 4415a5fff8..4bb5a26707 100644
--- a/clients/tests/test-client.check-on-disk/test_001-016.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-016.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/16
+location: clients/tests/test-client.py:761:test_001()/16
 cmd: $NMCLI --mode tabular general permissions
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-017.expected b/clients/tests/test-client.check-on-disk/test_001-017.expected
index da9fd96c8f..c6010f4d8d 100644
--- a/clients/tests/test-client.check-on-disk/test_001-017.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-017.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/17
+location: clients/tests/test-client.py:761:test_001()/17
 cmd: $NMCLI --mode tabular --pretty general permissions
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-018.expected b/clients/tests/test-client.check-on-disk/test_001-018.expected
index ad53315d17..6d594751aa 100644
--- a/clients/tests/test-client.check-on-disk/test_001-018.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-018.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/18
+location: clients/tests/test-client.py:761:test_001()/18
 cmd: $NMCLI --mode tabular --pretty general permissions
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-019.expected b/clients/tests/test-client.check-on-disk/test_001-019.expected
index 62822829ca..c2d8fa0ec7 100644
--- a/clients/tests/test-client.check-on-disk/test_001-019.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-019.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/19
+location: clients/tests/test-client.py:761:test_001()/19
 cmd: $NMCLI --mode tabular --terse general permissions
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-020.expected b/clients/tests/test-client.check-on-disk/test_001-020.expected
index 06be9b0b50..b64e923378 100644
--- a/clients/tests/test-client.check-on-disk/test_001-020.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-020.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/20
+location: clients/tests/test-client.py:761:test_001()/20
 cmd: $NMCLI --mode tabular --terse general permissions
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-021.expected b/clients/tests/test-client.check-on-disk/test_001-021.expected
index ed46ad7bdf..5320e86506 100644
--- a/clients/tests/test-client.check-on-disk/test_001-021.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-021.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/21
+location: clients/tests/test-client.py:761:test_001()/21
 cmd: $NMCLI --mode multiline general permissions
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-022.expected b/clients/tests/test-client.check-on-disk/test_001-022.expected
index 75b8b040c1..ba9c8e4d99 100644
--- a/clients/tests/test-client.check-on-disk/test_001-022.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-022.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/22
+location: clients/tests/test-client.py:761:test_001()/22
 cmd: $NMCLI --mode multiline general permissions
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-023.expected b/clients/tests/test-client.check-on-disk/test_001-023.expected
index 12934db66d..ffcc9cb8e2 100644
--- a/clients/tests/test-client.check-on-disk/test_001-023.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-023.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/23
+location: clients/tests/test-client.py:761:test_001()/23
 cmd: $NMCLI --mode multiline --pretty general permissions
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-024.expected b/clients/tests/test-client.check-on-disk/test_001-024.expected
index 1e1d979d2a..a14523d8ea 100644
--- a/clients/tests/test-client.check-on-disk/test_001-024.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-024.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/24
+location: clients/tests/test-client.py:761:test_001()/24
 cmd: $NMCLI --mode multiline --pretty general permissions
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-025.expected b/clients/tests/test-client.check-on-disk/test_001-025.expected
index 0135a5c2eb..1c8ee11f35 100644
--- a/clients/tests/test-client.check-on-disk/test_001-025.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-025.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/25
+location: clients/tests/test-client.py:761:test_001()/25
 cmd: $NMCLI --mode multiline --terse general permissions
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_001-026.expected b/clients/tests/test-client.check-on-disk/test_001-026.expected
index faa8e5b2d4..2c11a85db7 100644
--- a/clients/tests/test-client.check-on-disk/test_001-026.expected
+++ b/clients/tests/test-client.check-on-disk/test_001-026.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:764:test_001()/26
+location: clients/tests/test-client.py:761:test_001()/26
 cmd: $NMCLI --mode multiline --terse general permissions
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-001.expected b/clients/tests/test-client.check-on-disk/test_002-001.expected
index 70fe6961ba..c952c9c992 100644
--- a/clients/tests/test-client.check-on-disk/test_002-001.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-001.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:769:test_002()/1
+location: clients/tests/test-client.py:766:test_002()/1
 cmd: $NMCLI d
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-002.expected b/clients/tests/test-client.check-on-disk/test_002-002.expected
index 3177caf7c7..6b244d5eac 100644
--- a/clients/tests/test-client.check-on-disk/test_002-002.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-002.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:769:test_002()/2
+location: clients/tests/test-client.py:766:test_002()/2
 cmd: $NMCLI d
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-003.expected b/clients/tests/test-client.check-on-disk/test_002-003.expected
index 7dd5531201..f406aa70ae 100644
--- a/clients/tests/test-client.check-on-disk/test_002-003.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-003.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:771:test_002()/3
+location: clients/tests/test-client.py:768:test_002()/3
 cmd: $NMCLI -f all d
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-004.expected b/clients/tests/test-client.check-on-disk/test_002-004.expected
index b33ab8c3d7..b1cfa7ae84 100644
--- a/clients/tests/test-client.check-on-disk/test_002-004.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-004.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:771:test_002()/4
+location: clients/tests/test-client.py:768:test_002()/4
 cmd: $NMCLI -f all d
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-005.expected b/clients/tests/test-client.check-on-disk/test_002-005.expected
index 75eddf5993..144b39089c 100644
--- a/clients/tests/test-client.check-on-disk/test_002-005.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-005.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:773:test_002()/5
+location: clients/tests/test-client.py:770:test_002()/5
 cmd: $NMCLI 
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-006.expected b/clients/tests/test-client.check-on-disk/test_002-006.expected
index 3e31a151f2..f1a229bac6 100644
--- a/clients/tests/test-client.check-on-disk/test_002-006.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-006.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:773:test_002()/6
+location: clients/tests/test-client.py:770:test_002()/6
 cmd: $NMCLI 
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-007.expected b/clients/tests/test-client.check-on-disk/test_002-007.expected
index 54d7fda02f..e522a6bce4 100644
--- a/clients/tests/test-client.check-on-disk/test_002-007.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-007.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:775:test_002()/7
+location: clients/tests/test-client.py:772:test_002()/7
 cmd: $NMCLI -f AP -mode multiline d show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-008.expected b/clients/tests/test-client.check-on-disk/test_002-008.expected
index e1cf26e130..9fb89b1a83 100644
--- a/clients/tests/test-client.check-on-disk/test_002-008.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-008.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:775:test_002()/8
+location: clients/tests/test-client.py:772:test_002()/8
 cmd: $NMCLI -f AP -mode multiline d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-009.expected b/clients/tests/test-client.check-on-disk/test_002-009.expected
index 749e484cfa..6db902aac6 100644
--- a/clients/tests/test-client.check-on-disk/test_002-009.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-009.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:776:test_002()/9
+location: clients/tests/test-client.py:773:test_002()/9
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-010.expected b/clients/tests/test-client.check-on-disk/test_002-010.expected
index 1ca08eac07..fac540eace 100644
--- a/clients/tests/test-client.check-on-disk/test_002-010.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-010.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:776:test_002()/10
+location: clients/tests/test-client.py:773:test_002()/10
 cmd: $NMCLI -f AP -mode multiline -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected
index d5d5097011..1e7952d4fd 100644
--- a/clients/tests/test-client.check-on-disk/test_002-011.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-011.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:777:test_002()/11
+location: clients/tests/test-client.py:774:test_002()/11
 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected
index 79f68f1c67..8476e6934c 100644
--- a/clients/tests/test-client.check-on-disk/test_002-012.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-012.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:777:test_002()/12
+location: clients/tests/test-client.py:774:test_002()/12
 cmd: $NMCLI -f AP -mode multiline -t d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected
index ad49477ccd..58e2204883 100644
--- a/clients/tests/test-client.check-on-disk/test_002-013.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-013.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:778:test_002()/13
+location: clients/tests/test-client.py:775:test_002()/13
 cmd: $NMCLI -f AP -mode tabular d show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected
index 14af8ed750..6d8126d6f2 100644
--- a/clients/tests/test-client.check-on-disk/test_002-014.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-014.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:778:test_002()/14
+location: clients/tests/test-client.py:775:test_002()/14
 cmd: $NMCLI -f AP -mode tabular d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected
index 423ea2c6a3..3806f6b373 100644
--- a/clients/tests/test-client.check-on-disk/test_002-015.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-015.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:779:test_002()/15
+location: clients/tests/test-client.py:776:test_002()/15
 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected
index 27a0d4a642..8eab14576e 100644
--- a/clients/tests/test-client.check-on-disk/test_002-016.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-016.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:779:test_002()/16
+location: clients/tests/test-client.py:776:test_002()/16
 cmd: $NMCLI -f AP -mode tabular -p d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected
index dc1dd2a527..f0119718ea 100644
--- a/clients/tests/test-client.check-on-disk/test_002-017.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-017.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:780:test_002()/17
+location: clients/tests/test-client.py:777:test_002()/17
 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected
index 6308ae39dc..61528cb9c9 100644
--- a/clients/tests/test-client.check-on-disk/test_002-018.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-018.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:780:test_002()/18
+location: clients/tests/test-client.py:777:test_002()/18
 cmd: $NMCLI -f AP -mode tabular -t d show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected
index ecc50f9f18..a45f657ac0 100644
--- a/clients/tests/test-client.check-on-disk/test_002-019.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-019.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:782:test_002()/19
+location: clients/tests/test-client.py:779:test_002()/19
 cmd: $NMCLI -f ALL d wifi
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected
index 81164f55d2..cabc853dae 100644
--- a/clients/tests/test-client.check-on-disk/test_002-020.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-020.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:782:test_002()/20
+location: clients/tests/test-client.py:779:test_002()/20
 cmd: $NMCLI -f ALL d wifi
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected
index 85a6262629..fd5c1542c8 100644
--- a/clients/tests/test-client.check-on-disk/test_002-021.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-021.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:784:test_002()/21
+location: clients/tests/test-client.py:781:test_002()/21
 cmd: $NMCLI c
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected
index f0de2a1ae8..cea22e1d26 100644
--- a/clients/tests/test-client.check-on-disk/test_002-022.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-022.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:784:test_002()/22
+location: clients/tests/test-client.py:781:test_002()/22
 cmd: $NMCLI c
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected
index 7eefdc183a..60b138d338 100644
--- a/clients/tests/test-client.check-on-disk/test_002-023.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-023.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:786:test_002()/23
+location: clients/tests/test-client.py:783:test_002()/23
 cmd: $NMCLI c s con-1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_002-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected
index 576f00a9c3..2527453fd2 100644
--- a/clients/tests/test-client.check-on-disk/test_002-024.expected
+++ b/clients/tests/test-client.check-on-disk/test_002-024.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:786:test_002()/24
+location: clients/tests/test-client.py:783:test_002()/24
 cmd: $NMCLI c s con-1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-001.expected b/clients/tests/test-client.check-on-disk/test_003-001.expected
index 220608dac4..a83e8adf18 100644
--- a/clients/tests/test-client.check-on-disk/test_003-001.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-001.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:796:test_003()/1
+location: clients/tests/test-client.py:793:test_003()/1
 cmd: $NMCLI c add type ethernet ifname '*' con-name con-xx1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-002.expected b/clients/tests/test-client.check-on-disk/test_003-002.expected
index ba2a858b4f..fe5b3d79f1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-002.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-002.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:799:test_003()/2
+location: clients/tests/test-client.py:796:test_003()/2
 cmd: $NMCLI c s
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-003.expected b/clients/tests/test-client.check-on-disk/test_003-003.expected
index a6f1a6c9f3..ef70c51625 100644
--- a/clients/tests/test-client.check-on-disk/test_003-003.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-003.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:799:test_003()/3
+location: clients/tests/test-client.py:796:test_003()/3
 cmd: $NMCLI c s
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected
index 714ce08268..74844be802 100644
--- a/clients/tests/test-client.check-on-disk/test_003-004.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-004.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:804:test_003()/4
+location: clients/tests/test-client.py:801:test_003()/4
 cmd: $NMCLI c add type ethernet ifname '*'
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-005.expected b/clients/tests/test-client.check-on-disk/test_003-005.expected
index 1efd225f6b..1a116f0eac 100644
--- a/clients/tests/test-client.check-on-disk/test_003-005.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-005.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:807:test_003()/5
+location: clients/tests/test-client.py:804:test_003()/5
 cmd: $NMCLI c s
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-006.expected b/clients/tests/test-client.check-on-disk/test_003-006.expected
index 6c03d44359..592b92e3a3 100644
--- a/clients/tests/test-client.check-on-disk/test_003-006.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-006.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:807:test_003()/6
+location: clients/tests/test-client.py:804:test_003()/6
 cmd: $NMCLI c s
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-007.expected b/clients/tests/test-client.check-on-disk/test_003-007.expected
index 0bc3568ea4..44ad709740 100644
--- a/clients/tests/test-client.check-on-disk/test_003-007.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-007.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:810:test_003()/7
+location: clients/tests/test-client.py:807:test_003()/7
 cmd: $NMCLI -f ALL c s
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected
index 2e2bdf0493..d9933f37e7 100644
--- a/clients/tests/test-client.check-on-disk/test_003-008.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-008.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:810:test_003()/8
+location: clients/tests/test-client.py:807:test_003()/8
 cmd: $NMCLI -f ALL c s
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected
index 213a84081a..5eb0bcaefc 100644
--- a/clients/tests/test-client.check-on-disk/test_003-009.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-009.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:814:test_003()/9
+location: clients/tests/test-client.py:811:test_003()/9
 cmd: $NMCLI --complete-args -f ALL c s ''
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected
index 5aec69901e..97792be69c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-010.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-010.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:814:test_003()/10
+location: clients/tests/test-client.py:811:test_003()/10
 cmd: $NMCLI --complete-args -f ALL c s ''
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected
index 5435fc2eff..2e7928755b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-011.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-011.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:827:test_003()/11
+location: clients/tests/test-client.py:824:test_003()/11
 cmd: $NMCLI con up ethernet ifname eth0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-012.expected b/clients/tests/test-client.check-on-disk/test_003-012.expected
index 84f6d3e386..0902837e0c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-012.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-012.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:830:test_003()/12
+location: clients/tests/test-client.py:827:test_003()/12
 cmd: $NMCLI con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected
index 20d5fddff3..458cfde515 100644
--- a/clients/tests/test-client.check-on-disk/test_003-013.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-013.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:830:test_003()/13
+location: clients/tests/test-client.py:827:test_003()/13
 cmd: $NMCLI con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected
index 3ec9c97257..10a90feea1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-014.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-014.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:833:test_003()/14
+location: clients/tests/test-client.py:830:test_003()/14
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-015.expected b/clients/tests/test-client.check-on-disk/test_003-015.expected
index 1305e41ffa..ea80926ddb 100644
--- a/clients/tests/test-client.check-on-disk/test_003-015.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-015.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:833:test_003()/15
+location: clients/tests/test-client.py:830:test_003()/15
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-016.expected b/clients/tests/test-client.check-on-disk/test_003-016.expected
index 0d876a40a7..b68edc98d8 100644
--- a/clients/tests/test-client.check-on-disk/test_003-016.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-016.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:836:test_003()/16
+location: clients/tests/test-client.py:833:test_003()/16
 cmd: $NMCLI -f ALL con s -a
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-017.expected b/clients/tests/test-client.check-on-disk/test_003-017.expected
index ebbecb7740..aa621f28ba 100644
--- a/clients/tests/test-client.check-on-disk/test_003-017.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-017.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:836:test_003()/17
+location: clients/tests/test-client.py:833:test_003()/17
 cmd: $NMCLI -f ALL con s -a
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-018.expected b/clients/tests/test-client.check-on-disk/test_003-018.expected
index e67910bfbb..3d99a00051 100644
--- a/clients/tests/test-client.check-on-disk/test_003-018.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-018.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:839:test_003()/18
+location: clients/tests/test-client.py:836:test_003()/18
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected
index aad5005ad7..aabab1546c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-019.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-019.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:839:test_003()/19
+location: clients/tests/test-client.py:836:test_003()/19
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected
index 2aef21dd9f..5575cca52e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-020.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-020.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:842:test_003()/20
+location: clients/tests/test-client.py:839:test_003()/20
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-021.expected b/clients/tests/test-client.check-on-disk/test_003-021.expected
index 66a16f8f80..4ff536cc96 100644
--- a/clients/tests/test-client.check-on-disk/test_003-021.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-021.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:842:test_003()/21
+location: clients/tests/test-client.py:839:test_003()/21
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-022.expected b/clients/tests/test-client.check-on-disk/test_003-022.expected
index 66d220c02a..18c83c0a88 100644
--- a/clients/tests/test-client.check-on-disk/test_003-022.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-022.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:845:test_003()/22
+location: clients/tests/test-client.py:842:test_003()/22
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-023.expected b/clients/tests/test-client.check-on-disk/test_003-023.expected
index e1c17a655f..9479645049 100644
--- a/clients/tests/test-client.check-on-disk/test_003-023.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-023.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:845:test_003()/23
+location: clients/tests/test-client.py:842:test_003()/23
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-024.expected b/clients/tests/test-client.check-on-disk/test_003-024.expected
index 04040f2fa2..cf69887490 100644
--- a/clients/tests/test-client.check-on-disk/test_003-024.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-024.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:848:test_003()/24
+location: clients/tests/test-client.py:845:test_003()/24
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected
index 4ac2a3e362..8e0eef21a1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-025.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-025.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:848:test_003()/25
+location: clients/tests/test-client.py:845:test_003()/25
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected
index 3889b24c15..c6639a345d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-026.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-026.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:851:test_003()/26
+location: clients/tests/test-client.py:848:test_003()/26
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected
index cb93f0084d..ad84cdb1fe 100644
--- a/clients/tests/test-client.check-on-disk/test_003-027.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-027.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:851:test_003()/27
+location: clients/tests/test-client.py:848:test_003()/27
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected
index fabf145379..c3f04638d2 100644
--- a/clients/tests/test-client.check-on-disk/test_003-028.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-028.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:854:test_003()/28
+location: clients/tests/test-client.py:851:test_003()/28
 cmd: $NMCLI -f ALL dev s eth0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected
index 8fb46e9ab4..106886304c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-029.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-029.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:854:test_003()/29
+location: clients/tests/test-client.py:851:test_003()/29
 cmd: $NMCLI -f ALL dev s eth0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected
index f1cbde6948..b9b9ad23f1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-030.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-030.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:857:test_003()/30
+location: clients/tests/test-client.py:854:test_003()/30
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected
index 1b72213135..29485ead13 100644
--- a/clients/tests/test-client.check-on-disk/test_003-031.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-031.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:857:test_003()/31
+location: clients/tests/test-client.py:854:test_003()/31
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected
index 7d48972fc4..8ce56ad7eb 100644
--- a/clients/tests/test-client.check-on-disk/test_003-032.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-032.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:860:test_003()/32
+location: clients/tests/test-client.py:857:test_003()/32
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected
index 9097c18898..9b9ca5e1ea 100644
--- a/clients/tests/test-client.check-on-disk/test_003-033.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-033.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:860:test_003()/33
+location: clients/tests/test-client.py:857:test_003()/33
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-034.expected b/clients/tests/test-client.check-on-disk/test_003-034.expected
index 90ddd7950e..ab807e0d4a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-034.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-034.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:827:test_003()/34
+location: clients/tests/test-client.py:824:test_003()/34
 cmd: $NMCLI con up ethernet ifname eth1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-035.expected b/clients/tests/test-client.check-on-disk/test_003-035.expected
index 9bbb7bc86a..b1b6093256 100644
--- a/clients/tests/test-client.check-on-disk/test_003-035.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-035.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:830:test_003()/35
+location: clients/tests/test-client.py:827:test_003()/35
 cmd: $NMCLI con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-036.expected b/clients/tests/test-client.check-on-disk/test_003-036.expected
index a986a2f3cc..8cf42cf9bb 100644
--- a/clients/tests/test-client.check-on-disk/test_003-036.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-036.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:830:test_003()/36
+location: clients/tests/test-client.py:827:test_003()/36
 cmd: $NMCLI con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-037.expected b/clients/tests/test-client.check-on-disk/test_003-037.expected
index f1c9665df9..2eebd4a442 100644
--- a/clients/tests/test-client.check-on-disk/test_003-037.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-037.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:833:test_003()/37
+location: clients/tests/test-client.py:830:test_003()/37
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-038.expected b/clients/tests/test-client.check-on-disk/test_003-038.expected
index 252dd6c7d4..a6b4b45987 100644
--- a/clients/tests/test-client.check-on-disk/test_003-038.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-038.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:833:test_003()/38
+location: clients/tests/test-client.py:830:test_003()/38
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-039.expected b/clients/tests/test-client.check-on-disk/test_003-039.expected
index faa26ee053..337735b1f1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-039.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-039.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:836:test_003()/39
+location: clients/tests/test-client.py:833:test_003()/39
 cmd: $NMCLI -f ALL con s -a
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected
index e0e0403745..97be1db4c8 100644
--- a/clients/tests/test-client.check-on-disk/test_003-040.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-040.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:836:test_003()/40
+location: clients/tests/test-client.py:833:test_003()/40
 cmd: $NMCLI -f ALL con s -a
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected
index 3ddd18659b..1fa2aa6f1f 100644
--- a/clients/tests/test-client.check-on-disk/test_003-041.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-041.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:839:test_003()/41
+location: clients/tests/test-client.py:836:test_003()/41
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected
index 0a3bb7fca1..df90c8f530 100644
--- a/clients/tests/test-client.check-on-disk/test_003-042.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-042.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:839:test_003()/42
+location: clients/tests/test-client.py:836:test_003()/42
 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected
index d11eefe4a7..afbe5ad28c 100644
--- a/clients/tests/test-client.check-on-disk/test_003-043.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-043.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:842:test_003()/43
+location: clients/tests/test-client.py:839:test_003()/43
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected
index 6d57c4499d..260cab5394 100644
--- a/clients/tests/test-client.check-on-disk/test_003-044.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-044.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:842:test_003()/44
+location: clients/tests/test-client.py:839:test_003()/44
 cmd: $NMCLI -f UUID,NAME con s --active
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected
index 436284d526..bd8a830650 100644
--- a/clients/tests/test-client.check-on-disk/test_003-045.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-045.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:845:test_003()/45
+location: clients/tests/test-client.py:842:test_003()/45
 cmd: $NMCLI -f ALL con s ethernet
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected
index 8f0dcfa75a..a5dad0081b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-046.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-046.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:845:test_003()/46
+location: clients/tests/test-client.py:842:test_003()/46
 cmd: $NMCLI -f ALL con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected
index 1b80990c94..0e555c1023 100644
--- a/clients/tests/test-client.check-on-disk/test_003-047.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-047.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:848:test_003()/47
+location: clients/tests/test-client.py:845:test_003()/47
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected
index 3eda98c648..60f33d7172 100644
--- a/clients/tests/test-client.check-on-disk/test_003-048.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-048.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:848:test_003()/48
+location: clients/tests/test-client.py:845:test_003()/48
 cmd: $NMCLI -f GENERAL.STATE con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected
index 3cd73e5a9d..30f80a576e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-049.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-049.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:851:test_003()/49
+location: clients/tests/test-client.py:848:test_003()/49
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected
index 187ff13fc3..892e7a8bb0 100644
--- a/clients/tests/test-client.check-on-disk/test_003-050.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-050.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:851:test_003()/50
+location: clients/tests/test-client.py:848:test_003()/50
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected
index af822fb88b..2f2e7b11b8 100644
--- a/clients/tests/test-client.check-on-disk/test_003-051.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-051.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:854:test_003()/51
+location: clients/tests/test-client.py:851:test_003()/51
 cmd: $NMCLI -f ALL dev s eth0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected
index 118e15dd09..b9c637da5a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-052.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-052.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:854:test_003()/52
+location: clients/tests/test-client.py:851:test_003()/52
 cmd: $NMCLI -f ALL dev s eth0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected
index 57563e1343..70ff8521a8 100644
--- a/clients/tests/test-client.check-on-disk/test_003-053.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-053.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:857:test_003()/53
+location: clients/tests/test-client.py:854:test_003()/53
 cmd: $NMCLI -f ALL dev show eth0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected
index 219d57f719..9faf56e719 100644
--- a/clients/tests/test-client.check-on-disk/test_003-054.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-054.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:857:test_003()/54
+location: clients/tests/test-client.py:854:test_003()/54
 cmd: $NMCLI -f ALL dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected
index 5518745d2e..be42aa0c86 100644
--- a/clients/tests/test-client.check-on-disk/test_003-055.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-055.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:860:test_003()/55
+location: clients/tests/test-client.py:857:test_003()/55
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected
index 6d761c8ad0..021c75c59b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-056.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-056.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:860:test_003()/56
+location: clients/tests/test-client.py:857:test_003()/56
 cmd: $NMCLI -f ALL -t dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-057.expected b/clients/tests/test-client.check-on-disk/test_003-057.expected
index b3a2057193..7b57d8edf6 100644
--- a/clients/tests/test-client.check-on-disk/test_003-057.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-057.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:874:test_003()/57
+location: clients/tests/test-client.py:871:test_003()/57
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-058.expected b/clients/tests/test-client.check-on-disk/test_003-058.expected
index bf54edd1ad..1b07c9bb11 100644
--- a/clients/tests/test-client.check-on-disk/test_003-058.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-058.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:874:test_003()/58
+location: clients/tests/test-client.py:871:test_003()/58
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-059.expected b/clients/tests/test-client.check-on-disk/test_003-059.expected
index 6a0686fb94..11cc3843b7 100644
--- a/clients/tests/test-client.check-on-disk/test_003-059.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-059.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:877:test_003()/59
+location: clients/tests/test-client.py:874:test_003()/59
 cmd: $NMCLI -f UUID,TYPE con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-060.expected b/clients/tests/test-client.check-on-disk/test_003-060.expected
index 2672fc1c9a..aabea1f3da 100644
--- a/clients/tests/test-client.check-on-disk/test_003-060.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-060.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:877:test_003()/60
+location: clients/tests/test-client.py:874:test_003()/60
 cmd: $NMCLI -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-061.expected b/clients/tests/test-client.check-on-disk/test_003-061.expected
index 1c0c84e8ff..f6d8a47e26 100644
--- a/clients/tests/test-client.check-on-disk/test_003-061.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-061.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:880:test_003()/61
+location: clients/tests/test-client.py:877:test_003()/61
 cmd: $NMCLI -f UUID,TYPE --mode multiline con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-062.expected b/clients/tests/test-client.check-on-disk/test_003-062.expected
index 74ce9f7412..c668227dae 100644
--- a/clients/tests/test-client.check-on-disk/test_003-062.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-062.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:880:test_003()/62
+location: clients/tests/test-client.py:877:test_003()/62
 cmd: $NMCLI -f UUID,TYPE --mode multiline con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-063.expected b/clients/tests/test-client.check-on-disk/test_003-063.expected
index 60f04bcb7c..5daafcf4f0 100644
--- a/clients/tests/test-client.check-on-disk/test_003-063.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-063.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:883:test_003()/63
+location: clients/tests/test-client.py:880:test_003()/63
 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-064.expected b/clients/tests/test-client.check-on-disk/test_003-064.expected
index 1202c21e7c..d5456e0fb2 100644
--- a/clients/tests/test-client.check-on-disk/test_003-064.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-064.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:883:test_003()/64
+location: clients/tests/test-client.py:880:test_003()/64
 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-065.expected b/clients/tests/test-client.check-on-disk/test_003-065.expected
index 82cbe6c85f..e1e201727e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-065.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-065.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:886:test_003()/65
+location: clients/tests/test-client.py:883:test_003()/65
 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-066.expected b/clients/tests/test-client.check-on-disk/test_003-066.expected
index bd4e94353c..7855e17d4e 100644
--- a/clients/tests/test-client.check-on-disk/test_003-066.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-066.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:886:test_003()/66
+location: clients/tests/test-client.py:883:test_003()/66
 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-067.expected b/clients/tests/test-client.check-on-disk/test_003-067.expected
index a79e6eae46..3f210bcfd5 100644
--- a/clients/tests/test-client.check-on-disk/test_003-067.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-067.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:889:test_003()/67
+location: clients/tests/test-client.py:886:test_003()/67
 cmd: $NMCLI -f UUID,TYPE --mode tabular con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-068.expected b/clients/tests/test-client.check-on-disk/test_003-068.expected
index 3d0880843a..acc2f1783b 100644
--- a/clients/tests/test-client.check-on-disk/test_003-068.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-068.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:889:test_003()/68
+location: clients/tests/test-client.py:886:test_003()/68
 cmd: $NMCLI -f UUID,TYPE --mode tabular con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-069.expected b/clients/tests/test-client.check-on-disk/test_003-069.expected
index 788f5397d2..f60873908a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-069.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-069.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:892:test_003()/69
+location: clients/tests/test-client.py:889:test_003()/69
 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-070.expected b/clients/tests/test-client.check-on-disk/test_003-070.expected
index fb4b423cd6..93c8a80b45 100644
--- a/clients/tests/test-client.check-on-disk/test_003-070.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-070.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:892:test_003()/70
+location: clients/tests/test-client.py:889:test_003()/70
 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-071.expected b/clients/tests/test-client.check-on-disk/test_003-071.expected
index e22f072759..3fc1750ec1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-071.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-071.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:895:test_003()/71
+location: clients/tests/test-client.py:892:test_003()/71
 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-072.expected b/clients/tests/test-client.check-on-disk/test_003-072.expected
index b3c36a1e3c..be79082d15 100644
--- a/clients/tests/test-client.check-on-disk/test_003-072.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-072.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:895:test_003()/72
+location: clients/tests/test-client.py:892:test_003()/72
 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-073.expected b/clients/tests/test-client.check-on-disk/test_003-073.expected
index 43b32948c0..64b9611d11 100644
--- a/clients/tests/test-client.check-on-disk/test_003-073.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-073.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:898:test_003()/73
+location: clients/tests/test-client.py:895:test_003()/73
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-074.expected b/clients/tests/test-client.check-on-disk/test_003-074.expected
index 467b8a4ae2..a775fdbde9 100644
--- a/clients/tests/test-client.check-on-disk/test_003-074.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-074.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:898:test_003()/74
+location: clients/tests/test-client.py:895:test_003()/74
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-075.expected b/clients/tests/test-client.check-on-disk/test_003-075.expected
index d4ebbcad87..121cc2cc00 100644
--- a/clients/tests/test-client.check-on-disk/test_003-075.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-075.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:901:test_003()/75
+location: clients/tests/test-client.py:898:test_003()/75
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-076.expected b/clients/tests/test-client.check-on-disk/test_003-076.expected
index a22c75852f..334ef37cc7 100644
--- a/clients/tests/test-client.check-on-disk/test_003-076.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-076.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:901:test_003()/76
+location: clients/tests/test-client.py:898:test_003()/76
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected
index 28f8c47c08..cf08e7c414 100644
--- a/clients/tests/test-client.check-on-disk/test_003-077.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-077.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:904:test_003()/77
+location: clients/tests/test-client.py:901:test_003()/77
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected
index bd9de3cbd0..17ea80001a 100644
--- a/clients/tests/test-client.check-on-disk/test_003-078.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-078.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:904:test_003()/78
+location: clients/tests/test-client.py:901:test_003()/78
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-079.expected b/clients/tests/test-client.check-on-disk/test_003-079.expected
index f4967b7b44..4a682cd6e4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-079.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-079.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:874:test_003()/79
+location: clients/tests/test-client.py:871:test_003()/79
 cmd: $NMCLI -f ALL con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-080.expected b/clients/tests/test-client.check-on-disk/test_003-080.expected
index b9d844b446..b5b4762610 100644
--- a/clients/tests/test-client.check-on-disk/test_003-080.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-080.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:874:test_003()/80
+location: clients/tests/test-client.py:871:test_003()/80
 cmd: $NMCLI -f ALL con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-081.expected b/clients/tests/test-client.check-on-disk/test_003-081.expected
index be18146db2..8701206631 100644
--- a/clients/tests/test-client.check-on-disk/test_003-081.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-081.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:877:test_003()/81
+location: clients/tests/test-client.py:874:test_003()/81
 cmd: $NMCLI -f UUID,TYPE con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-082.expected b/clients/tests/test-client.check-on-disk/test_003-082.expected
index b4d9f7fb0d..1929f72dcc 100644
--- a/clients/tests/test-client.check-on-disk/test_003-082.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-082.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:877:test_003()/82
+location: clients/tests/test-client.py:874:test_003()/82
 cmd: $NMCLI -f UUID,TYPE con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-083.expected b/clients/tests/test-client.check-on-disk/test_003-083.expected
index 101b5b3364..ec76badfad 100644
--- a/clients/tests/test-client.check-on-disk/test_003-083.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-083.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:880:test_003()/83
+location: clients/tests/test-client.py:877:test_003()/83
 cmd: $NMCLI -f UUID,TYPE --mode multiline con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-084.expected b/clients/tests/test-client.check-on-disk/test_003-084.expected
index a05672b090..e3c9d78cee 100644
--- a/clients/tests/test-client.check-on-disk/test_003-084.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-084.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:880:test_003()/84
+location: clients/tests/test-client.py:877:test_003()/84
 cmd: $NMCLI -f UUID,TYPE --mode multiline con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-085.expected b/clients/tests/test-client.check-on-disk/test_003-085.expected
index 79b173d940..7a02730ee7 100644
--- a/clients/tests/test-client.check-on-disk/test_003-085.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-085.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:883:test_003()/85
+location: clients/tests/test-client.py:880:test_003()/85
 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-086.expected b/clients/tests/test-client.check-on-disk/test_003-086.expected
index fabe9f9f42..9f67f6cd49 100644
--- a/clients/tests/test-client.check-on-disk/test_003-086.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-086.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:883:test_003()/86
+location: clients/tests/test-client.py:880:test_003()/86
 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-087.expected b/clients/tests/test-client.check-on-disk/test_003-087.expected
index 1d5646a16d..f9e19176a6 100644
--- a/clients/tests/test-client.check-on-disk/test_003-087.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-087.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:886:test_003()/87
+location: clients/tests/test-client.py:883:test_003()/87
 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-088.expected b/clients/tests/test-client.check-on-disk/test_003-088.expected
index 9d657d21f6..cf53fad4a2 100644
--- a/clients/tests/test-client.check-on-disk/test_003-088.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-088.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:886:test_003()/88
+location: clients/tests/test-client.py:883:test_003()/88
 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-089.expected b/clients/tests/test-client.check-on-disk/test_003-089.expected
index 5a05d8c98b..2ab37338d5 100644
--- a/clients/tests/test-client.check-on-disk/test_003-089.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-089.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:889:test_003()/89
+location: clients/tests/test-client.py:886:test_003()/89
 cmd: $NMCLI -f UUID,TYPE --mode tabular con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-090.expected b/clients/tests/test-client.check-on-disk/test_003-090.expected
index 471cc00f54..ab2122212d 100644
--- a/clients/tests/test-client.check-on-disk/test_003-090.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-090.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:889:test_003()/90
+location: clients/tests/test-client.py:886:test_003()/90
 cmd: $NMCLI -f UUID,TYPE --mode tabular con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-091.expected b/clients/tests/test-client.check-on-disk/test_003-091.expected
index 5e2aa25e37..27e4804c32 100644
--- a/clients/tests/test-client.check-on-disk/test_003-091.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-091.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:892:test_003()/91
+location: clients/tests/test-client.py:889:test_003()/91
 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-092.expected b/clients/tests/test-client.check-on-disk/test_003-092.expected
index ecc1d40738..52510ea2bd 100644
--- a/clients/tests/test-client.check-on-disk/test_003-092.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-092.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:892:test_003()/92
+location: clients/tests/test-client.py:889:test_003()/92
 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-093.expected b/clients/tests/test-client.check-on-disk/test_003-093.expected
index 6ec06c77ef..6937741979 100644
--- a/clients/tests/test-client.check-on-disk/test_003-093.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-093.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:895:test_003()/93
+location: clients/tests/test-client.py:892:test_003()/93
 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-094.expected b/clients/tests/test-client.check-on-disk/test_003-094.expected
index 6312fcea21..231dc84c30 100644
--- a/clients/tests/test-client.check-on-disk/test_003-094.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-094.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:895:test_003()/94
+location: clients/tests/test-client.py:892:test_003()/94
 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-095.expected b/clients/tests/test-client.check-on-disk/test_003-095.expected
index f4d34276aa..1f441524aa 100644
--- a/clients/tests/test-client.check-on-disk/test_003-095.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-095.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:898:test_003()/95
+location: clients/tests/test-client.py:895:test_003()/95
 cmd: $NMCLI con s ethernet
 lang: C
 returncode: 10
diff --git a/clients/tests/test-client.check-on-disk/test_003-096.expected b/clients/tests/test-client.check-on-disk/test_003-096.expected
index 798b886a46..ef53f5c188 100644
--- a/clients/tests/test-client.check-on-disk/test_003-096.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-096.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:898:test_003()/96
+location: clients/tests/test-client.py:895:test_003()/96
 cmd: $NMCLI con s ethernet
 lang: pl_PL.UTF-8
 returncode: 10
diff --git a/clients/tests/test-client.check-on-disk/test_003-097.expected b/clients/tests/test-client.check-on-disk/test_003-097.expected
index a16b5b4590..7e47fd3690 100644
--- a/clients/tests/test-client.check-on-disk/test_003-097.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-097.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:901:test_003()/97
+location: clients/tests/test-client.py:898:test_003()/97
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-098.expected b/clients/tests/test-client.check-on-disk/test_003-098.expected
index ed31c6f116..b503ad4502 100644
--- a/clients/tests/test-client.check-on-disk/test_003-098.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-098.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:901:test_003()/98
+location: clients/tests/test-client.py:898:test_003()/98
 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-099.expected b/clients/tests/test-client.check-on-disk/test_003-099.expected
index b50f91d44f..b6a73bc9c1 100644
--- a/clients/tests/test-client.check-on-disk/test_003-099.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-099.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:904:test_003()/99
+location: clients/tests/test-client.py:901:test_003()/99
 cmd: $NMCLI -f all dev show eth0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_003-100.expected b/clients/tests/test-client.check-on-disk/test_003-100.expected
index 415435583f..2a214da9d4 100644
--- a/clients/tests/test-client.check-on-disk/test_003-100.expected
+++ b/clients/tests/test-client.check-on-disk/test_003-100.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:904:test_003()/100
+location: clients/tests/test-client.py:901:test_003()/100
 cmd: $NMCLI -f all dev show eth0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-001.expected b/clients/tests/test-client.check-on-disk/test_004-001.expected
index 8771a12f85..59406c6a50 100644
--- a/clients/tests/test-client.check-on-disk/test_004-001.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-001.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:914:test_004()/1
+location: clients/tests/test-client.py:911:test_004()/1
 cmd: $NMCLI c add type wifi ifname '*' ssid foobar con-name con-xx1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-002.expected b/clients/tests/test-client.check-on-disk/test_004-002.expected
index c5b0a3c853..551fbbf379 100644
--- a/clients/tests/test-client.check-on-disk/test_004-002.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-002.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:916:test_004()/2
+location: clients/tests/test-client.py:913:test_004()/2
 cmd: $NMCLI connection mod con-xx1 ip.gateway ''
 lang: C
 returncode: 2
diff --git a/clients/tests/test-client.check-on-disk/test_004-003.expected b/clients/tests/test-client.check-on-disk/test_004-003.expected
index f73eb3923a..b88303a740 100644
--- a/clients/tests/test-client.check-on-disk/test_004-003.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-003.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:917:test_004()/3
+location: clients/tests/test-client.py:914:test_004()/3
 cmd: $NMCLI connection mod con-xx1 ipv4.gateway 172.16.0.1
 lang: pl_PL.UTF-8
 returncode: 1
diff --git a/clients/tests/test-client.check-on-disk/test_004-004.expected b/clients/tests/test-client.check-on-disk/test_004-004.expected
index 32a8d19abd..786189b45b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-004.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-004.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:918:test_004()/4
+location: clients/tests/test-client.py:915:test_004()/4
 cmd: $NMCLI connection mod con-xx1 ipv6.gateway ::99
 lang: C
 returncode: 1
diff --git a/clients/tests/test-client.check-on-disk/test_004-005.expected b/clients/tests/test-client.check-on-disk/test_004-005.expected
index 55877aaf8e..35ac557cd0 100644
--- a/clients/tests/test-client.check-on-disk/test_004-005.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-005.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:919:test_004()/5
+location: clients/tests/test-client.py:916:test_004()/5
 cmd: $NMCLI connection mod con-xx1 802.abc ''
 lang: C
 returncode: 2
diff --git a/clients/tests/test-client.check-on-disk/test_004-006.expected b/clients/tests/test-client.check-on-disk/test_004-006.expected
index f0d908c436..16d6fbd967 100644
--- a/clients/tests/test-client.check-on-disk/test_004-006.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-006.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:920:test_004()/6
+location: clients/tests/test-client.py:917:test_004()/6
 cmd: $NMCLI connection mod con-xx1 802-11-wireless.band a
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-007.expected b/clients/tests/test-client.check-on-disk/test_004-007.expected
index d1e432a90d..390a5adb00 100644
--- a/clients/tests/test-client.check-on-disk/test_004-007.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-007.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:921:test_004()/7
+location: clients/tests/test-client.py:918:test_004()/7
 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-008.expected b/clients/tests/test-client.check-on-disk/test_004-008.expected
index ad9b5a40ed..c3a203b327 100644
--- a/clients/tests/test-client.check-on-disk/test_004-008.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-008.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:923:test_004()/8
+location: clients/tests/test-client.py:920:test_004()/8
 cmd: $NMCLI con s con-xx1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-009.expected b/clients/tests/test-client.check-on-disk/test_004-009.expected
index 86270c26f8..fa5425d5eb 100644
--- a/clients/tests/test-client.check-on-disk/test_004-009.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-009.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:923:test_004()/9
+location: clients/tests/test-client.py:920:test_004()/9
 cmd: $NMCLI con s con-xx1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-010.expected b/clients/tests/test-client.check-on-disk/test_004-010.expected
index a7fb6df04b..67767097d7 100644
--- a/clients/tests/test-client.check-on-disk/test_004-010.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-010.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:930:test_004()/10
+location: clients/tests/test-client.py:927:test_004()/10
 cmd: $NMCLI connection add type vpn con-name con-vpn-1 ifname '*' vpn-type openvpn vpn.data 'key1 = val1,   key2  = val2, key3=val3'
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-011.expected b/clients/tests/test-client.check-on-disk/test_004-011.expected
index b8c35832f8..e1a021301f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-011.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-011.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:933:test_004()/11
+location: clients/tests/test-client.py:930:test_004()/11
 cmd: $NMCLI con s
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-012.expected b/clients/tests/test-client.check-on-disk/test_004-012.expected
index f09d926a48..1cbf883772 100644
--- a/clients/tests/test-client.check-on-disk/test_004-012.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-012.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:933:test_004()/12
+location: clients/tests/test-client.py:930:test_004()/12
 cmd: $NMCLI con s
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-013.expected b/clients/tests/test-client.check-on-disk/test_004-013.expected
index fc7e3fb56f..21461acf4a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-013.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-013.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:935:test_004()/13
+location: clients/tests/test-client.py:932:test_004()/13
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-014.expected b/clients/tests/test-client.check-on-disk/test_004-014.expected
index ed160bebea..7bf49cc8fb 100644
--- a/clients/tests/test-client.check-on-disk/test_004-014.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-014.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:935:test_004()/14
+location: clients/tests/test-client.py:932:test_004()/14
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-015.expected b/clients/tests/test-client.check-on-disk/test_004-015.expected
index d813eba3a5..58120e7ad1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-015.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-015.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:937:test_004()/15
+location: clients/tests/test-client.py:934:test_004()/15
 cmd: $NMCLI con up con-xx1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-016.expected b/clients/tests/test-client.check-on-disk/test_004-016.expected
index 59e21a80ad..31e9dd6192 100644
--- a/clients/tests/test-client.check-on-disk/test_004-016.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-016.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:939:test_004()/16
+location: clients/tests/test-client.py:936:test_004()/16
 cmd: $NMCLI con s
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-017.expected b/clients/tests/test-client.check-on-disk/test_004-017.expected
index 140c4dd840..9f9df61ca6 100644
--- a/clients/tests/test-client.check-on-disk/test_004-017.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-017.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:939:test_004()/17
+location: clients/tests/test-client.py:936:test_004()/17
 cmd: $NMCLI con s
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-018.expected b/clients/tests/test-client.check-on-disk/test_004-018.expected
index 6deb680983..b023ae6aa9 100644
--- a/clients/tests/test-client.check-on-disk/test_004-018.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-018.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:941:test_004()/18
+location: clients/tests/test-client.py:938:test_004()/18
 cmd: $NMCLI con up con-vpn-1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-019.expected b/clients/tests/test-client.check-on-disk/test_004-019.expected
index 71847c33c7..23c25b7f67 100644
--- a/clients/tests/test-client.check-on-disk/test_004-019.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-019.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:943:test_004()/19
+location: clients/tests/test-client.py:940:test_004()/19
 cmd: $NMCLI con s
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-020.expected b/clients/tests/test-client.check-on-disk/test_004-020.expected
index d4c0b95aeb..68c7fad3e9 100644
--- a/clients/tests/test-client.check-on-disk/test_004-020.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-020.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:943:test_004()/20
+location: clients/tests/test-client.py:940:test_004()/20
 cmd: $NMCLI con s
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-021.expected b/clients/tests/test-client.check-on-disk/test_004-021.expected
index 5cc7aa7315..52d951c806 100644
--- a/clients/tests/test-client.check-on-disk/test_004-021.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-021.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:945:test_004()/21
+location: clients/tests/test-client.py:942:test_004()/21
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-022.expected b/clients/tests/test-client.check-on-disk/test_004-022.expected
index 17b3094e96..5064726320 100644
--- a/clients/tests/test-client.check-on-disk/test_004-022.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-022.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:945:test_004()/22
+location: clients/tests/test-client.py:942:test_004()/22
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-023.expected b/clients/tests/test-client.check-on-disk/test_004-023.expected
index 3093b84e79..8e94ab86e3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-023.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-023.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:954:test_004()/23
+location: clients/tests/test-client.py:951:test_004()/23
 cmd: $NMCLI con s con-vpn-1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-024.expected b/clients/tests/test-client.check-on-disk/test_004-024.expected
index b9548e1ef7..2787f17997 100644
--- a/clients/tests/test-client.check-on-disk/test_004-024.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-024.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:954:test_004()/24
+location: clients/tests/test-client.py:951:test_004()/24
 cmd: $NMCLI con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-025.expected b/clients/tests/test-client.check-on-disk/test_004-025.expected
index 99dbb3a014..e47e58fb46 100644
--- a/clients/tests/test-client.check-on-disk/test_004-025.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-025.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:956:test_004()/25
+location: clients/tests/test-client.py:953:test_004()/25
 cmd: $NMCLI -t con s con-vpn-1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-026.expected b/clients/tests/test-client.check-on-disk/test_004-026.expected
index ca14684e02..6fea759fd7 100644
--- a/clients/tests/test-client.check-on-disk/test_004-026.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-026.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:956:test_004()/26
+location: clients/tests/test-client.py:953:test_004()/26
 cmd: $NMCLI -t con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-027.expected b/clients/tests/test-client.check-on-disk/test_004-027.expected
index 7f40bec587..d91e406486 100644
--- a/clients/tests/test-client.check-on-disk/test_004-027.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-027.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:959:test_004()/27
+location: clients/tests/test-client.py:956:test_004()/27
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-028.expected b/clients/tests/test-client.check-on-disk/test_004-028.expected
index d044a6682d..41d3c1fdbd 100644
--- a/clients/tests/test-client.check-on-disk/test_004-028.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-028.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:959:test_004()/28
+location: clients/tests/test-client.py:956:test_004()/28
 cmd: $NMCLI -f ALL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-029.expected b/clients/tests/test-client.check-on-disk/test_004-029.expected
index 5be4a8c1b3..06924df3d4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-029.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-029.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:965:test_004()/29
+location: clients/tests/test-client.py:962:test_004()/29
 cmd: $NMCLI -f VPN con s con-vpn-1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-030.expected b/clients/tests/test-client.check-on-disk/test_004-030.expected
index b3017ce00c..5c785eae18 100644
--- a/clients/tests/test-client.check-on-disk/test_004-030.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-030.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:965:test_004()/30
+location: clients/tests/test-client.py:962:test_004()/30
 cmd: $NMCLI -f VPN con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-031.expected b/clients/tests/test-client.check-on-disk/test_004-031.expected
index 54471cff0e..916142dc55 100644
--- a/clients/tests/test-client.check-on-disk/test_004-031.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-031.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:968:test_004()/31
+location: clients/tests/test-client.py:965:test_004()/31
 cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-032.expected b/clients/tests/test-client.check-on-disk/test_004-032.expected
index 1c08c98a5c..1d16a406f0 100644
--- a/clients/tests/test-client.check-on-disk/test_004-032.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-032.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:968:test_004()/32
+location: clients/tests/test-client.py:965:test_004()/32
 cmd: $NMCLI -f GENERAL con s con-vpn-1
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-033.expected b/clients/tests/test-client.check-on-disk/test_004-033.expected
index 7325c535d7..52f0fcb293 100644
--- a/clients/tests/test-client.check-on-disk/test_004-033.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-033.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:971:test_004()/33
+location: clients/tests/test-client.py:968:test_004()/33
 cmd: $NMCLI dev show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-034.expected b/clients/tests/test-client.check-on-disk/test_004-034.expected
index d6e9e50340..d76c2219de 100644
--- a/clients/tests/test-client.check-on-disk/test_004-034.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-034.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:971:test_004()/34
+location: clients/tests/test-client.py:968:test_004()/34
 cmd: $NMCLI dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected
index efd113db24..be2917f33e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-035.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-035.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:974:test_004()/35
+location: clients/tests/test-client.py:971:test_004()/35
 cmd: $NMCLI -f all dev show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected
index a1e7e1a782..7b58b747a0 100644
--- a/clients/tests/test-client.check-on-disk/test_004-036.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-036.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:974:test_004()/36
+location: clients/tests/test-client.py:971:test_004()/36
 cmd: $NMCLI -f all dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-037.expected b/clients/tests/test-client.check-on-disk/test_004-037.expected
index 2fd8bd662d..a241b7cc7c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-037.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-037.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:977:test_004()/37
+location: clients/tests/test-client.py:974:test_004()/37
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-038.expected b/clients/tests/test-client.check-on-disk/test_004-038.expected
index 958a68c85a..01082f554d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-038.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-038.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:977:test_004()/38
+location: clients/tests/test-client.py:974:test_004()/38
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-039.expected b/clients/tests/test-client.check-on-disk/test_004-039.expected
index 363f4761ea..a5c17fb508 100644
--- a/clients/tests/test-client.check-on-disk/test_004-039.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-039.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:980:test_004()/39
+location: clients/tests/test-client.py:977:test_004()/39
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-040.expected b/clients/tests/test-client.check-on-disk/test_004-040.expected
index ba07e7aa75..ce0760f8a5 100644
--- a/clients/tests/test-client.check-on-disk/test_004-040.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-040.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:980:test_004()/40
+location: clients/tests/test-client.py:977:test_004()/40
 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-041.expected b/clients/tests/test-client.check-on-disk/test_004-041.expected
index 78e4ba6c5e..6ac14e5443 100644
--- a/clients/tests/test-client.check-on-disk/test_004-041.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-041.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:983:test_004()/41
+location: clients/tests/test-client.py:980:test_004()/41
 cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-042.expected b/clients/tests/test-client.check-on-disk/test_004-042.expected
index 66b35ed571..1d2b2b7310 100644
--- a/clients/tests/test-client.check-on-disk/test_004-042.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-042.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:983:test_004()/42
+location: clients/tests/test-client.py:980:test_004()/42
 cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-043.expected b/clients/tests/test-client.check-on-disk/test_004-043.expected
index ed27583245..45d5c4f98b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-043.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-043.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/43
+location: clients/tests/test-client.py:984:test_004()/43
 cmd: $NMCLI -f ALL device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-044.expected b/clients/tests/test-client.check-on-disk/test_004-044.expected
index 5f62ec409f..99e6fd3555 100644
--- a/clients/tests/test-client.check-on-disk/test_004-044.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-044.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/44
+location: clients/tests/test-client.py:984:test_004()/44
 cmd: $NMCLI -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-045.expected b/clients/tests/test-client.check-on-disk/test_004-045.expected
index 49a755e0af..94d8765e35 100644
--- a/clients/tests/test-client.check-on-disk/test_004-045.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-045.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/45
+location: clients/tests/test-client.py:986:test_004()/45
 cmd: $NMCLI -f COMMON device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-046.expected b/clients/tests/test-client.check-on-disk/test_004-046.expected
index 10ea2ef053..2ba69fe2a1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-046.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-046.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/46
+location: clients/tests/test-client.py:986:test_004()/46
 cmd: $NMCLI -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-047.expected b/clients/tests/test-client.check-on-disk/test_004-047.expected
index 3b9c408644..a7dc0a8091 100644
--- a/clients/tests/test-client.check-on-disk/test_004-047.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-047.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/47
+location: clients/tests/test-client.py:989:test_004()/47
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-048.expected b/clients/tests/test-client.check-on-disk/test_004-048.expected
index 692bb4d79a..1f81e9af44 100644
--- a/clients/tests/test-client.check-on-disk/test_004-048.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-048.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/48
+location: clients/tests/test-client.py:989:test_004()/48
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-049.expected b/clients/tests/test-client.check-on-disk/test_004-049.expected
index 90ef5d50ff..cd708d86a3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-049.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-049.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/49
+location: clients/tests/test-client.py:991:test_004()/49
 cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-050.expected b/clients/tests/test-client.check-on-disk/test_004-050.expected
index 176fb88c18..f12bbdeb3c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-050.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-050.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/50
+location: clients/tests/test-client.py:991:test_004()/50
 cmd: $NMCLI -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-051.expected b/clients/tests/test-client.check-on-disk/test_004-051.expected
index feea91a70d..f612088ea3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-051.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-051.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/51
+location: clients/tests/test-client.py:993:test_004()/51
 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-052.expected b/clients/tests/test-client.check-on-disk/test_004-052.expected
index c522fb3a66..9097d6b9d5 100644
--- a/clients/tests/test-client.check-on-disk/test_004-052.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-052.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/52
+location: clients/tests/test-client.py:993:test_004()/52
 cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-053.expected b/clients/tests/test-client.check-on-disk/test_004-053.expected
index bedf7b1976..a31c7b513a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-053.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-053.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/53
+location: clients/tests/test-client.py:996:test_004()/53
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-054.expected b/clients/tests/test-client.check-on-disk/test_004-054.expected
index 1039deaaae..ce17c99640 100644
--- a/clients/tests/test-client.check-on-disk/test_004-054.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-054.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/54
+location: clients/tests/test-client.py:996:test_004()/54
 cmd: $NMCLI -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-055.expected b/clients/tests/test-client.check-on-disk/test_004-055.expected
index 52ff6ac789..4dbf91d9b5 100644
--- a/clients/tests/test-client.check-on-disk/test_004-055.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-055.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/55
+location: clients/tests/test-client.py:998:test_004()/55
 cmd: $NMCLI -f ALL device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-056.expected b/clients/tests/test-client.check-on-disk/test_004-056.expected
index 51c0b26dde..d106ea7ff0 100644
--- a/clients/tests/test-client.check-on-disk/test_004-056.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-056.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/56
+location: clients/tests/test-client.py:998:test_004()/56
 cmd: $NMCLI -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-057.expected b/clients/tests/test-client.check-on-disk/test_004-057.expected
index e1d0698a32..5d1f25a6bd 100644
--- a/clients/tests/test-client.check-on-disk/test_004-057.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-057.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/57
+location: clients/tests/test-client.py:1000:test_004()/57
 cmd: $NMCLI -f COMMON device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-058.expected b/clients/tests/test-client.check-on-disk/test_004-058.expected
index 00dea8d24b..f3dfd3d75d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-058.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-058.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/58
+location: clients/tests/test-client.py:1000:test_004()/58
 cmd: $NMCLI -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-059.expected b/clients/tests/test-client.check-on-disk/test_004-059.expected
index 348cb5bd27..806db142a1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-059.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-059.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/59
+location: clients/tests/test-client.py:1002:test_004()/59
 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-060.expected b/clients/tests/test-client.check-on-disk/test_004-060.expected
index 10214d1b01..e9f76f7743 100644
--- a/clients/tests/test-client.check-on-disk/test_004-060.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-060.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/60
+location: clients/tests/test-client.py:1002:test_004()/60
 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-061.expected b/clients/tests/test-client.check-on-disk/test_004-061.expected
index cc3e3fc602..dcbd33b252 100644
--- a/clients/tests/test-client.check-on-disk/test_004-061.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-061.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/61
+location: clients/tests/test-client.py:984:test_004()/61
 cmd: $NMCLI --pretty -f ALL device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-062.expected b/clients/tests/test-client.check-on-disk/test_004-062.expected
index b655f0dcb9..eb76554b09 100644
--- a/clients/tests/test-client.check-on-disk/test_004-062.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-062.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/62
+location: clients/tests/test-client.py:984:test_004()/62
 cmd: $NMCLI --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-063.expected b/clients/tests/test-client.check-on-disk/test_004-063.expected
index 73cf942f5b..7117753e00 100644
--- a/clients/tests/test-client.check-on-disk/test_004-063.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-063.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/63
+location: clients/tests/test-client.py:986:test_004()/63
 cmd: $NMCLI --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-064.expected b/clients/tests/test-client.check-on-disk/test_004-064.expected
index ba3ccb0d14..1854e36460 100644
--- a/clients/tests/test-client.check-on-disk/test_004-064.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-064.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/64
+location: clients/tests/test-client.py:986:test_004()/64
 cmd: $NMCLI --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-065.expected b/clients/tests/test-client.check-on-disk/test_004-065.expected
index 7aa1971c4d..90d8fcd0d9 100644
--- a/clients/tests/test-client.check-on-disk/test_004-065.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-065.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/65
+location: clients/tests/test-client.py:989:test_004()/65
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-066.expected b/clients/tests/test-client.check-on-disk/test_004-066.expected
index 992842738a..a59f00ab77 100644
--- a/clients/tests/test-client.check-on-disk/test_004-066.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-066.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/66
+location: clients/tests/test-client.py:989:test_004()/66
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-067.expected b/clients/tests/test-client.check-on-disk/test_004-067.expected
index 690021d59c..280d8da116 100644
--- a/clients/tests/test-client.check-on-disk/test_004-067.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-067.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/67
+location: clients/tests/test-client.py:991:test_004()/67
 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-068.expected b/clients/tests/test-client.check-on-disk/test_004-068.expected
index 0d1446e112..a89b9cd3e9 100644
--- a/clients/tests/test-client.check-on-disk/test_004-068.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-068.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/68
+location: clients/tests/test-client.py:991:test_004()/68
 cmd: $NMCLI --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-069.expected b/clients/tests/test-client.check-on-disk/test_004-069.expected
index a1d8c61f18..04b8e2d75e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-069.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-069.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/69
+location: clients/tests/test-client.py:993:test_004()/69
 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-070.expected b/clients/tests/test-client.check-on-disk/test_004-070.expected
index 8c6d1e02fb..35551dae89 100644
--- a/clients/tests/test-client.check-on-disk/test_004-070.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-070.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/70
+location: clients/tests/test-client.py:993:test_004()/70
 cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-071.expected b/clients/tests/test-client.check-on-disk/test_004-071.expected
index 04f2e45fa7..40bdc2c4cb 100644
--- a/clients/tests/test-client.check-on-disk/test_004-071.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-071.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/71
+location: clients/tests/test-client.py:996:test_004()/71
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-072.expected b/clients/tests/test-client.check-on-disk/test_004-072.expected
index c17f133746..36b40d5c04 100644
--- a/clients/tests/test-client.check-on-disk/test_004-072.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-072.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/72
+location: clients/tests/test-client.py:996:test_004()/72
 cmd: $NMCLI --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-073.expected b/clients/tests/test-client.check-on-disk/test_004-073.expected
index 1ccc53c218..2adc6c9d8a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-073.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-073.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/73
+location: clients/tests/test-client.py:998:test_004()/73
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-074.expected b/clients/tests/test-client.check-on-disk/test_004-074.expected
index 078b83a210..6965edd576 100644
--- a/clients/tests/test-client.check-on-disk/test_004-074.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-074.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/74
+location: clients/tests/test-client.py:998:test_004()/74
 cmd: $NMCLI --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-075.expected b/clients/tests/test-client.check-on-disk/test_004-075.expected
index b1326a2261..5830a48188 100644
--- a/clients/tests/test-client.check-on-disk/test_004-075.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-075.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/75
+location: clients/tests/test-client.py:1000:test_004()/75
 cmd: $NMCLI --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-076.expected b/clients/tests/test-client.check-on-disk/test_004-076.expected
index 223b0af5a8..37321ce751 100644
--- a/clients/tests/test-client.check-on-disk/test_004-076.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-076.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/76
+location: clients/tests/test-client.py:1000:test_004()/76
 cmd: $NMCLI --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-077.expected b/clients/tests/test-client.check-on-disk/test_004-077.expected
index c3ec751926..c3ba0db717 100644
--- a/clients/tests/test-client.check-on-disk/test_004-077.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-077.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/77
+location: clients/tests/test-client.py:1002:test_004()/77
 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-078.expected b/clients/tests/test-client.check-on-disk/test_004-078.expected
index 258583ebb2..65ff189b76 100644
--- a/clients/tests/test-client.check-on-disk/test_004-078.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-078.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/78
+location: clients/tests/test-client.py:1002:test_004()/78
 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-079.expected b/clients/tests/test-client.check-on-disk/test_004-079.expected
index b752a9f57f..f7dca46917 100644
--- a/clients/tests/test-client.check-on-disk/test_004-079.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-079.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/79
+location: clients/tests/test-client.py:984:test_004()/79
 cmd: $NMCLI --terse -f ALL device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-080.expected b/clients/tests/test-client.check-on-disk/test_004-080.expected
index 0a3d3eb89a..6efa34b1c3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-080.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-080.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/80
+location: clients/tests/test-client.py:984:test_004()/80
 cmd: $NMCLI --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-081.expected b/clients/tests/test-client.check-on-disk/test_004-081.expected
index 1caa36bb83..f4401bf99c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-081.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-081.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/81
+location: clients/tests/test-client.py:986:test_004()/81
 cmd: $NMCLI --terse -f COMMON device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-082.expected b/clients/tests/test-client.check-on-disk/test_004-082.expected
index 846abf89d3..0554165f3a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-082.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-082.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/82
+location: clients/tests/test-client.py:986:test_004()/82
 cmd: $NMCLI --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-083.expected b/clients/tests/test-client.check-on-disk/test_004-083.expected
index dcccfdcc6e..4d818c0377 100644
--- a/clients/tests/test-client.check-on-disk/test_004-083.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-083.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/83
+location: clients/tests/test-client.py:989:test_004()/83
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-084.expected b/clients/tests/test-client.check-on-disk/test_004-084.expected
index 623b55c53f..73f41c6f1a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-084.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-084.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/84
+location: clients/tests/test-client.py:989:test_004()/84
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-085.expected b/clients/tests/test-client.check-on-disk/test_004-085.expected
index 62ee3ab369..b9c3a91cf3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-085.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-085.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/85
+location: clients/tests/test-client.py:991:test_004()/85
 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-086.expected b/clients/tests/test-client.check-on-disk/test_004-086.expected
index 06b1e53d3d..353001b41b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-086.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-086.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/86
+location: clients/tests/test-client.py:991:test_004()/86
 cmd: $NMCLI --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-087.expected b/clients/tests/test-client.check-on-disk/test_004-087.expected
index a07e684195..ab8c0fa230 100644
--- a/clients/tests/test-client.check-on-disk/test_004-087.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-087.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/87
+location: clients/tests/test-client.py:993:test_004()/87
 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-088.expected b/clients/tests/test-client.check-on-disk/test_004-088.expected
index 496bca5272..bb049d20a1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-088.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-088.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/88
+location: clients/tests/test-client.py:993:test_004()/88
 cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-089.expected b/clients/tests/test-client.check-on-disk/test_004-089.expected
index 2c0dc48eca..3a365df96a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-089.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-089.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/89
+location: clients/tests/test-client.py:996:test_004()/89
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-090.expected b/clients/tests/test-client.check-on-disk/test_004-090.expected
index 61158cc37f..fcd8759a72 100644
--- a/clients/tests/test-client.check-on-disk/test_004-090.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-090.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/90
+location: clients/tests/test-client.py:996:test_004()/90
 cmd: $NMCLI --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-091.expected b/clients/tests/test-client.check-on-disk/test_004-091.expected
index defcec34ba..72d685f471 100644
--- a/clients/tests/test-client.check-on-disk/test_004-091.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-091.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/91
+location: clients/tests/test-client.py:998:test_004()/91
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-092.expected b/clients/tests/test-client.check-on-disk/test_004-092.expected
index 038ece7fbc..6f5fc2758a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-092.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-092.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/92
+location: clients/tests/test-client.py:998:test_004()/92
 cmd: $NMCLI --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-093.expected b/clients/tests/test-client.check-on-disk/test_004-093.expected
index e2f60bd4ef..4f50347ed5 100644
--- a/clients/tests/test-client.check-on-disk/test_004-093.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-093.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/93
+location: clients/tests/test-client.py:1000:test_004()/93
 cmd: $NMCLI --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-094.expected b/clients/tests/test-client.check-on-disk/test_004-094.expected
index c5d03f83fb..19fd92bd00 100644
--- a/clients/tests/test-client.check-on-disk/test_004-094.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-094.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/94
+location: clients/tests/test-client.py:1000:test_004()/94
 cmd: $NMCLI --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-095.expected b/clients/tests/test-client.check-on-disk/test_004-095.expected
index 321f1dea3e..5f49d79649 100644
--- a/clients/tests/test-client.check-on-disk/test_004-095.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-095.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/95
+location: clients/tests/test-client.py:1002:test_004()/95
 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-096.expected b/clients/tests/test-client.check-on-disk/test_004-096.expected
index 6e144c2e52..2c46d66a39 100644
--- a/clients/tests/test-client.check-on-disk/test_004-096.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-096.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/96
+location: clients/tests/test-client.py:1002:test_004()/96
 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-097.expected b/clients/tests/test-client.check-on-disk/test_004-097.expected
index 4bcefb3ddb..780cc13207 100644
--- a/clients/tests/test-client.check-on-disk/test_004-097.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-097.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/97
+location: clients/tests/test-client.py:984:test_004()/97
 cmd: $NMCLI --mode tabular -f ALL device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-098.expected b/clients/tests/test-client.check-on-disk/test_004-098.expected
index 9cbe1fe477..a73f3c3b04 100644
--- a/clients/tests/test-client.check-on-disk/test_004-098.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-098.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/98
+location: clients/tests/test-client.py:984:test_004()/98
 cmd: $NMCLI --mode tabular -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-099.expected b/clients/tests/test-client.check-on-disk/test_004-099.expected
index 7893806290..556fe66e30 100644
--- a/clients/tests/test-client.check-on-disk/test_004-099.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-099.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/99
+location: clients/tests/test-client.py:986:test_004()/99
 cmd: $NMCLI --mode tabular -f COMMON device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-100.expected b/clients/tests/test-client.check-on-disk/test_004-100.expected
index 6b4ff41100..ee2333c2dc 100644
--- a/clients/tests/test-client.check-on-disk/test_004-100.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-100.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/100
+location: clients/tests/test-client.py:986:test_004()/100
 cmd: $NMCLI --mode tabular -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-101.expected b/clients/tests/test-client.check-on-disk/test_004-101.expected
index dcb97a21b9..650df5dfed 100644
--- a/clients/tests/test-client.check-on-disk/test_004-101.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-101.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/101
+location: clients/tests/test-client.py:989:test_004()/101
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-102.expected b/clients/tests/test-client.check-on-disk/test_004-102.expected
index 4b9d3698bf..7119e041b3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-102.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-102.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/102
+location: clients/tests/test-client.py:989:test_004()/102
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-103.expected b/clients/tests/test-client.check-on-disk/test_004-103.expected
index 6dd136dde6..3192bad607 100644
--- a/clients/tests/test-client.check-on-disk/test_004-103.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-103.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/103
+location: clients/tests/test-client.py:991:test_004()/103
 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-104.expected b/clients/tests/test-client.check-on-disk/test_004-104.expected
index 42a29d3091..ce3e7650d3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-104.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-104.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/104
+location: clients/tests/test-client.py:991:test_004()/104
 cmd: $NMCLI --mode tabular -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-105.expected b/clients/tests/test-client.check-on-disk/test_004-105.expected
index 0b1df3006c..1894b9bf41 100644
--- a/clients/tests/test-client.check-on-disk/test_004-105.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-105.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/105
+location: clients/tests/test-client.py:993:test_004()/105
 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-106.expected b/clients/tests/test-client.check-on-disk/test_004-106.expected
index 87980dd283..ebcec5a361 100644
--- a/clients/tests/test-client.check-on-disk/test_004-106.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-106.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/106
+location: clients/tests/test-client.py:993:test_004()/106
 cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-107.expected b/clients/tests/test-client.check-on-disk/test_004-107.expected
index 56420817a3..48a961f240 100644
--- a/clients/tests/test-client.check-on-disk/test_004-107.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-107.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/107
+location: clients/tests/test-client.py:996:test_004()/107
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-108.expected b/clients/tests/test-client.check-on-disk/test_004-108.expected
index afc5556f30..53080dbfc2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-108.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-108.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/108
+location: clients/tests/test-client.py:996:test_004()/108
 cmd: $NMCLI --mode tabular -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-109.expected b/clients/tests/test-client.check-on-disk/test_004-109.expected
index 1b4871b42d..32398b7fc3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-109.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-109.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/109
+location: clients/tests/test-client.py:998:test_004()/109
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-110.expected b/clients/tests/test-client.check-on-disk/test_004-110.expected
index 2936005605..ee54183e06 100644
--- a/clients/tests/test-client.check-on-disk/test_004-110.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-110.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/110
+location: clients/tests/test-client.py:998:test_004()/110
 cmd: $NMCLI --mode tabular -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-111.expected b/clients/tests/test-client.check-on-disk/test_004-111.expected
index 70b39bf234..3e3a4a0948 100644
--- a/clients/tests/test-client.check-on-disk/test_004-111.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-111.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/111
+location: clients/tests/test-client.py:1000:test_004()/111
 cmd: $NMCLI --mode tabular -f COMMON device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-112.expected b/clients/tests/test-client.check-on-disk/test_004-112.expected
index f1f4bc0792..cd8fbc74f0 100644
--- a/clients/tests/test-client.check-on-disk/test_004-112.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-112.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/112
+location: clients/tests/test-client.py:1000:test_004()/112
 cmd: $NMCLI --mode tabular -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-113.expected b/clients/tests/test-client.check-on-disk/test_004-113.expected
index 61a8effd22..ca0d2c76cf 100644
--- a/clients/tests/test-client.check-on-disk/test_004-113.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-113.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/113
+location: clients/tests/test-client.py:1002:test_004()/113
 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-114.expected b/clients/tests/test-client.check-on-disk/test_004-114.expected
index cbdf17e52b..2fe34bc51a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-114.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-114.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/114
+location: clients/tests/test-client.py:1002:test_004()/114
 cmd: $NMCLI --mode tabular -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-115.expected b/clients/tests/test-client.check-on-disk/test_004-115.expected
index ed33302de7..f35200a7fe 100644
--- a/clients/tests/test-client.check-on-disk/test_004-115.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-115.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/115
+location: clients/tests/test-client.py:984:test_004()/115
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-116.expected b/clients/tests/test-client.check-on-disk/test_004-116.expected
index ceb74f1e12..b5dd64029e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-116.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-116.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/116
+location: clients/tests/test-client.py:984:test_004()/116
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-117.expected b/clients/tests/test-client.check-on-disk/test_004-117.expected
index 5383aeac1e..d47102041f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-117.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-117.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/117
+location: clients/tests/test-client.py:986:test_004()/117
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-118.expected b/clients/tests/test-client.check-on-disk/test_004-118.expected
index 966e39ee48..7abe6c4760 100644
--- a/clients/tests/test-client.check-on-disk/test_004-118.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-118.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/118
+location: clients/tests/test-client.py:986:test_004()/118
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-119.expected b/clients/tests/test-client.check-on-disk/test_004-119.expected
index 95393cabe0..e0adcfccbd 100644
--- a/clients/tests/test-client.check-on-disk/test_004-119.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-119.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/119
+location: clients/tests/test-client.py:989:test_004()/119
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-120.expected b/clients/tests/test-client.check-on-disk/test_004-120.expected
index 5b0a852b0d..5e7f5eb1a4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-120.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-120.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/120
+location: clients/tests/test-client.py:989:test_004()/120
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-121.expected b/clients/tests/test-client.check-on-disk/test_004-121.expected
index 90875169c2..70ce9ba9b7 100644
--- a/clients/tests/test-client.check-on-disk/test_004-121.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-121.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/121
+location: clients/tests/test-client.py:991:test_004()/121
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-122.expected b/clients/tests/test-client.check-on-disk/test_004-122.expected
index af6dc4fffd..19ab8aa1fe 100644
--- a/clients/tests/test-client.check-on-disk/test_004-122.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-122.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/122
+location: clients/tests/test-client.py:991:test_004()/122
 cmd: $NMCLI --mode tabular --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-123.expected b/clients/tests/test-client.check-on-disk/test_004-123.expected
index 8878173aba..ab5a4e7971 100644
--- a/clients/tests/test-client.check-on-disk/test_004-123.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-123.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/123
+location: clients/tests/test-client.py:993:test_004()/123
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-124.expected b/clients/tests/test-client.check-on-disk/test_004-124.expected
index 9d0d4ddb94..6ca1cfce31 100644
--- a/clients/tests/test-client.check-on-disk/test_004-124.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-124.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/124
+location: clients/tests/test-client.py:993:test_004()/124
 cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-125.expected b/clients/tests/test-client.check-on-disk/test_004-125.expected
index 90e61e991e..f412a3d875 100644
--- a/clients/tests/test-client.check-on-disk/test_004-125.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-125.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/125
+location: clients/tests/test-client.py:996:test_004()/125
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-126.expected b/clients/tests/test-client.check-on-disk/test_004-126.expected
index 4ae9567d47..58cb91aa49 100644
--- a/clients/tests/test-client.check-on-disk/test_004-126.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-126.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/126
+location: clients/tests/test-client.py:996:test_004()/126
 cmd: $NMCLI --mode tabular --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-127.expected b/clients/tests/test-client.check-on-disk/test_004-127.expected
index 9856b027f9..03585d9013 100644
--- a/clients/tests/test-client.check-on-disk/test_004-127.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-127.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/127
+location: clients/tests/test-client.py:998:test_004()/127
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-128.expected b/clients/tests/test-client.check-on-disk/test_004-128.expected
index 4a49d9d72f..be50cc17b6 100644
--- a/clients/tests/test-client.check-on-disk/test_004-128.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-128.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/128
+location: clients/tests/test-client.py:998:test_004()/128
 cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-129.expected b/clients/tests/test-client.check-on-disk/test_004-129.expected
index 29bb34ed2a..a9695c823a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-129.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-129.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/129
+location: clients/tests/test-client.py:1000:test_004()/129
 cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-130.expected b/clients/tests/test-client.check-on-disk/test_004-130.expected
index 6e4b4bc2e0..5ded3e2b1d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-130.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-130.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/130
+location: clients/tests/test-client.py:1000:test_004()/130
 cmd: $NMCLI --mode tabular --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-131.expected b/clients/tests/test-client.check-on-disk/test_004-131.expected
index 38f0e05b78..7c7e20c4c5 100644
--- a/clients/tests/test-client.check-on-disk/test_004-131.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-131.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/131
+location: clients/tests/test-client.py:1002:test_004()/131
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-132.expected b/clients/tests/test-client.check-on-disk/test_004-132.expected
index eed2a14550..e3f6d26250 100644
--- a/clients/tests/test-client.check-on-disk/test_004-132.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-132.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/132
+location: clients/tests/test-client.py:1002:test_004()/132
 cmd: $NMCLI --mode tabular --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-133.expected b/clients/tests/test-client.check-on-disk/test_004-133.expected
index d5d9510bf7..48a5c30f0b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-133.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-133.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/133
+location: clients/tests/test-client.py:984:test_004()/133
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-134.expected b/clients/tests/test-client.check-on-disk/test_004-134.expected
index 5b67347241..3d07f6b682 100644
--- a/clients/tests/test-client.check-on-disk/test_004-134.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-134.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/134
+location: clients/tests/test-client.py:984:test_004()/134
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-135.expected b/clients/tests/test-client.check-on-disk/test_004-135.expected
index 4b24a7e284..0ca4d34038 100644
--- a/clients/tests/test-client.check-on-disk/test_004-135.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-135.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/135
+location: clients/tests/test-client.py:986:test_004()/135
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-136.expected b/clients/tests/test-client.check-on-disk/test_004-136.expected
index f96a3947a1..cebd2975e7 100644
--- a/clients/tests/test-client.check-on-disk/test_004-136.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-136.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/136
+location: clients/tests/test-client.py:986:test_004()/136
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-137.expected b/clients/tests/test-client.check-on-disk/test_004-137.expected
index 915024683a..91db6a4690 100644
--- a/clients/tests/test-client.check-on-disk/test_004-137.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-137.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/137
+location: clients/tests/test-client.py:989:test_004()/137
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-138.expected b/clients/tests/test-client.check-on-disk/test_004-138.expected
index cd47ab0596..e3b0734d4b 100644
--- a/clients/tests/test-client.check-on-disk/test_004-138.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-138.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/138
+location: clients/tests/test-client.py:989:test_004()/138
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-139.expected b/clients/tests/test-client.check-on-disk/test_004-139.expected
index 6a01791e72..0d77bad4fb 100644
--- a/clients/tests/test-client.check-on-disk/test_004-139.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-139.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/139
+location: clients/tests/test-client.py:991:test_004()/139
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-140.expected b/clients/tests/test-client.check-on-disk/test_004-140.expected
index d2af7ee6a3..453e468549 100644
--- a/clients/tests/test-client.check-on-disk/test_004-140.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-140.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/140
+location: clients/tests/test-client.py:991:test_004()/140
 cmd: $NMCLI --mode tabular --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-141.expected b/clients/tests/test-client.check-on-disk/test_004-141.expected
index 69bcf78bca..07347eb883 100644
--- a/clients/tests/test-client.check-on-disk/test_004-141.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-141.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/141
+location: clients/tests/test-client.py:993:test_004()/141
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-142.expected b/clients/tests/test-client.check-on-disk/test_004-142.expected
index 2a24301337..ea204e7cbf 100644
--- a/clients/tests/test-client.check-on-disk/test_004-142.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-142.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/142
+location: clients/tests/test-client.py:993:test_004()/142
 cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-143.expected b/clients/tests/test-client.check-on-disk/test_004-143.expected
index aa6c281073..e389a5a9d6 100644
--- a/clients/tests/test-client.check-on-disk/test_004-143.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-143.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/143
+location: clients/tests/test-client.py:996:test_004()/143
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-144.expected b/clients/tests/test-client.check-on-disk/test_004-144.expected
index e205144c9a..566be37829 100644
--- a/clients/tests/test-client.check-on-disk/test_004-144.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-144.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/144
+location: clients/tests/test-client.py:996:test_004()/144
 cmd: $NMCLI --mode tabular --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-145.expected b/clients/tests/test-client.check-on-disk/test_004-145.expected
index 195041be5a..ff8735b098 100644
--- a/clients/tests/test-client.check-on-disk/test_004-145.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-145.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/145
+location: clients/tests/test-client.py:998:test_004()/145
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-146.expected b/clients/tests/test-client.check-on-disk/test_004-146.expected
index 7e29a812e5..4110981fa3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-146.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-146.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/146
+location: clients/tests/test-client.py:998:test_004()/146
 cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-147.expected b/clients/tests/test-client.check-on-disk/test_004-147.expected
index fd2e802cdb..ec43aefbe5 100644
--- a/clients/tests/test-client.check-on-disk/test_004-147.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-147.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/147
+location: clients/tests/test-client.py:1000:test_004()/147
 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-148.expected b/clients/tests/test-client.check-on-disk/test_004-148.expected
index 9dbc0c5e2f..79e266d3a0 100644
--- a/clients/tests/test-client.check-on-disk/test_004-148.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-148.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/148
+location: clients/tests/test-client.py:1000:test_004()/148
 cmd: $NMCLI --mode tabular --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-149.expected b/clients/tests/test-client.check-on-disk/test_004-149.expected
index be196d2b86..f762f005c6 100644
--- a/clients/tests/test-client.check-on-disk/test_004-149.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-149.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/149
+location: clients/tests/test-client.py:1002:test_004()/149
 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-150.expected b/clients/tests/test-client.check-on-disk/test_004-150.expected
index 411ece63e2..68b97c695c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-150.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-150.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/150
+location: clients/tests/test-client.py:1002:test_004()/150
 cmd: $NMCLI --mode tabular --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-151.expected b/clients/tests/test-client.check-on-disk/test_004-151.expected
index 464742abb9..81040467d3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-151.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-151.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/151
+location: clients/tests/test-client.py:984:test_004()/151
 cmd: $NMCLI --mode multiline -f ALL device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-152.expected b/clients/tests/test-client.check-on-disk/test_004-152.expected
index 076b9ebd93..20fd995709 100644
--- a/clients/tests/test-client.check-on-disk/test_004-152.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-152.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/152
+location: clients/tests/test-client.py:984:test_004()/152
 cmd: $NMCLI --mode multiline -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-153.expected b/clients/tests/test-client.check-on-disk/test_004-153.expected
index 160ff3d9dd..2f536c690d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-153.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-153.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/153
+location: clients/tests/test-client.py:986:test_004()/153
 cmd: $NMCLI --mode multiline -f COMMON device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-154.expected b/clients/tests/test-client.check-on-disk/test_004-154.expected
index 2a8cb8a03d..03dd63d2d2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-154.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-154.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/154
+location: clients/tests/test-client.py:986:test_004()/154
 cmd: $NMCLI --mode multiline -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-155.expected b/clients/tests/test-client.check-on-disk/test_004-155.expected
index c577deef45..2eae8f16f3 100644
--- a/clients/tests/test-client.check-on-disk/test_004-155.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-155.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/155
+location: clients/tests/test-client.py:989:test_004()/155
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-156.expected b/clients/tests/test-client.check-on-disk/test_004-156.expected
index dd4af1e6cb..3de2d74036 100644
--- a/clients/tests/test-client.check-on-disk/test_004-156.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-156.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/156
+location: clients/tests/test-client.py:989:test_004()/156
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-157.expected b/clients/tests/test-client.check-on-disk/test_004-157.expected
index 0dff859493..6bde4e05e1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-157.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-157.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/157
+location: clients/tests/test-client.py:991:test_004()/157
 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-158.expected b/clients/tests/test-client.check-on-disk/test_004-158.expected
index bcb5c685fd..4dda764aaa 100644
--- a/clients/tests/test-client.check-on-disk/test_004-158.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-158.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/158
+location: clients/tests/test-client.py:991:test_004()/158
 cmd: $NMCLI --mode multiline -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-159.expected b/clients/tests/test-client.check-on-disk/test_004-159.expected
index 096b15cf47..ab27a85c5e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-159.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-159.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/159
+location: clients/tests/test-client.py:993:test_004()/159
 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-160.expected b/clients/tests/test-client.check-on-disk/test_004-160.expected
index c2a66ca433..7b86148d69 100644
--- a/clients/tests/test-client.check-on-disk/test_004-160.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-160.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/160
+location: clients/tests/test-client.py:993:test_004()/160
 cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-161.expected b/clients/tests/test-client.check-on-disk/test_004-161.expected
index 3efbf7b222..144e13e043 100644
--- a/clients/tests/test-client.check-on-disk/test_004-161.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-161.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/161
+location: clients/tests/test-client.py:996:test_004()/161
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-162.expected b/clients/tests/test-client.check-on-disk/test_004-162.expected
index 094c7361b3..c494d83743 100644
--- a/clients/tests/test-client.check-on-disk/test_004-162.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-162.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/162
+location: clients/tests/test-client.py:996:test_004()/162
 cmd: $NMCLI --mode multiline -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-163.expected b/clients/tests/test-client.check-on-disk/test_004-163.expected
index 97071700c6..342e916ed2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-163.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-163.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/163
+location: clients/tests/test-client.py:998:test_004()/163
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-164.expected b/clients/tests/test-client.check-on-disk/test_004-164.expected
index 0d7d4a94e2..bd7da288f9 100644
--- a/clients/tests/test-client.check-on-disk/test_004-164.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-164.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/164
+location: clients/tests/test-client.py:998:test_004()/164
 cmd: $NMCLI --mode multiline -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-165.expected b/clients/tests/test-client.check-on-disk/test_004-165.expected
index 835ee788d5..b1c15fa7e1 100644
--- a/clients/tests/test-client.check-on-disk/test_004-165.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-165.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/165
+location: clients/tests/test-client.py:1000:test_004()/165
 cmd: $NMCLI --mode multiline -f COMMON device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-166.expected b/clients/tests/test-client.check-on-disk/test_004-166.expected
index 1cf58666f9..798a3c7280 100644
--- a/clients/tests/test-client.check-on-disk/test_004-166.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-166.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/166
+location: clients/tests/test-client.py:1000:test_004()/166
 cmd: $NMCLI --mode multiline -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-167.expected b/clients/tests/test-client.check-on-disk/test_004-167.expected
index 9b0da5af58..47d0a820c4 100644
--- a/clients/tests/test-client.check-on-disk/test_004-167.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-167.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/167
+location: clients/tests/test-client.py:1002:test_004()/167
 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-168.expected b/clients/tests/test-client.check-on-disk/test_004-168.expected
index f069b3379d..0066041a6c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-168.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-168.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/168
+location: clients/tests/test-client.py:1002:test_004()/168
 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-169.expected b/clients/tests/test-client.check-on-disk/test_004-169.expected
index f0910a637b..8154f557a2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-169.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-169.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/169
+location: clients/tests/test-client.py:984:test_004()/169
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-170.expected b/clients/tests/test-client.check-on-disk/test_004-170.expected
index a831f2d07c..f9e7f80edc 100644
--- a/clients/tests/test-client.check-on-disk/test_004-170.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-170.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/170
+location: clients/tests/test-client.py:984:test_004()/170
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-171.expected b/clients/tests/test-client.check-on-disk/test_004-171.expected
index 078d09d933..3f8b9ff3d8 100644
--- a/clients/tests/test-client.check-on-disk/test_004-171.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-171.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/171
+location: clients/tests/test-client.py:986:test_004()/171
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-172.expected b/clients/tests/test-client.check-on-disk/test_004-172.expected
index c84e585af0..c4589f478a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-172.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-172.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/172
+location: clients/tests/test-client.py:986:test_004()/172
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-173.expected b/clients/tests/test-client.check-on-disk/test_004-173.expected
index b8f66d367c..d365b53659 100644
--- a/clients/tests/test-client.check-on-disk/test_004-173.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-173.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/173
+location: clients/tests/test-client.py:989:test_004()/173
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-174.expected b/clients/tests/test-client.check-on-disk/test_004-174.expected
index 6c064b1f5b..359d92a6f2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-174.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-174.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/174
+location: clients/tests/test-client.py:989:test_004()/174
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-175.expected b/clients/tests/test-client.check-on-disk/test_004-175.expected
index 10895c8471..26f6204eed 100644
--- a/clients/tests/test-client.check-on-disk/test_004-175.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-175.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/175
+location: clients/tests/test-client.py:991:test_004()/175
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-176.expected b/clients/tests/test-client.check-on-disk/test_004-176.expected
index e010dab7b6..eff16cb866 100644
--- a/clients/tests/test-client.check-on-disk/test_004-176.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-176.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/176
+location: clients/tests/test-client.py:991:test_004()/176
 cmd: $NMCLI --mode multiline --pretty -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-177.expected b/clients/tests/test-client.check-on-disk/test_004-177.expected
index 48558f752b..7b8b90007e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-177.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-177.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/177
+location: clients/tests/test-client.py:993:test_004()/177
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-178.expected b/clients/tests/test-client.check-on-disk/test_004-178.expected
index 475ec97a00..2597d07395 100644
--- a/clients/tests/test-client.check-on-disk/test_004-178.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-178.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/178
+location: clients/tests/test-client.py:993:test_004()/178
 cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-179.expected b/clients/tests/test-client.check-on-disk/test_004-179.expected
index a5490d5082..26bc0af22f 100644
--- a/clients/tests/test-client.check-on-disk/test_004-179.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-179.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/179
+location: clients/tests/test-client.py:996:test_004()/179
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-180.expected b/clients/tests/test-client.check-on-disk/test_004-180.expected
index 4121d31946..b2a131978a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-180.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-180.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/180
+location: clients/tests/test-client.py:996:test_004()/180
 cmd: $NMCLI --mode multiline --pretty -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-181.expected b/clients/tests/test-client.check-on-disk/test_004-181.expected
index b06035abf6..3b18e5b67e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-181.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-181.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/181
+location: clients/tests/test-client.py:998:test_004()/181
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-182.expected b/clients/tests/test-client.check-on-disk/test_004-182.expected
index ba3faf8d73..66d96e741e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-182.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-182.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/182
+location: clients/tests/test-client.py:998:test_004()/182
 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-183.expected b/clients/tests/test-client.check-on-disk/test_004-183.expected
index 47e6409534..ac5627ed43 100644
--- a/clients/tests/test-client.check-on-disk/test_004-183.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-183.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/183
+location: clients/tests/test-client.py:1000:test_004()/183
 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-184.expected b/clients/tests/test-client.check-on-disk/test_004-184.expected
index dce0b55313..a7d2dfa2fc 100644
--- a/clients/tests/test-client.check-on-disk/test_004-184.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-184.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/184
+location: clients/tests/test-client.py:1000:test_004()/184
 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-185.expected b/clients/tests/test-client.check-on-disk/test_004-185.expected
index 10507b66c4..ead7bffe83 100644
--- a/clients/tests/test-client.check-on-disk/test_004-185.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-185.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/185
+location: clients/tests/test-client.py:1002:test_004()/185
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-186.expected b/clients/tests/test-client.check-on-disk/test_004-186.expected
index ff2cd4ba34..f09d09c60d 100644
--- a/clients/tests/test-client.check-on-disk/test_004-186.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-186.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/186
+location: clients/tests/test-client.py:1002:test_004()/186
 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-187.expected b/clients/tests/test-client.check-on-disk/test_004-187.expected
index 994b3d7a98..4feaad4ff6 100644
--- a/clients/tests/test-client.check-on-disk/test_004-187.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-187.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/187
+location: clients/tests/test-client.py:984:test_004()/187
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-188.expected b/clients/tests/test-client.check-on-disk/test_004-188.expected
index 9490da52fa..d4dfac8b9e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-188.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-188.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:987:test_004()/188
+location: clients/tests/test-client.py:984:test_004()/188
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-189.expected b/clients/tests/test-client.check-on-disk/test_004-189.expected
index 1923d77bd0..e707c55029 100644
--- a/clients/tests/test-client.check-on-disk/test_004-189.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-189.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/189
+location: clients/tests/test-client.py:986:test_004()/189
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-190.expected b/clients/tests/test-client.check-on-disk/test_004-190.expected
index f6ff2dcee7..720cd91db2 100644
--- a/clients/tests/test-client.check-on-disk/test_004-190.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-190.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:989:test_004()/190
+location: clients/tests/test-client.py:986:test_004()/190
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-191.expected b/clients/tests/test-client.check-on-disk/test_004-191.expected
index ff93bf42d7..ab3f13b5bd 100644
--- a/clients/tests/test-client.check-on-disk/test_004-191.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-191.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/191
+location: clients/tests/test-client.py:989:test_004()/191
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-192.expected b/clients/tests/test-client.check-on-disk/test_004-192.expected
index 3b98fb8e76..d044881733 100644
--- a/clients/tests/test-client.check-on-disk/test_004-192.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-192.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:992:test_004()/192
+location: clients/tests/test-client.py:989:test_004()/192
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-193.expected b/clients/tests/test-client.check-on-disk/test_004-193.expected
index dec360ccf2..18ace0c55a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-193.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-193.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/193
+location: clients/tests/test-client.py:991:test_004()/193
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-194.expected b/clients/tests/test-client.check-on-disk/test_004-194.expected
index d60131cf35..1604a8bfd9 100644
--- a/clients/tests/test-client.check-on-disk/test_004-194.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-194.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:994:test_004()/194
+location: clients/tests/test-client.py:991:test_004()/194
 cmd: $NMCLI --mode multiline --terse -f ALL device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-195.expected b/clients/tests/test-client.check-on-disk/test_004-195.expected
index 0b720ed395..89f90be606 100644
--- a/clients/tests/test-client.check-on-disk/test_004-195.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-195.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/195
+location: clients/tests/test-client.py:993:test_004()/195
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-196.expected b/clients/tests/test-client.check-on-disk/test_004-196.expected
index 75798065cf..d2f2803c02 100644
--- a/clients/tests/test-client.check-on-disk/test_004-196.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-196.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:996:test_004()/196
+location: clients/tests/test-client.py:993:test_004()/196
 cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-197.expected b/clients/tests/test-client.check-on-disk/test_004-197.expected
index 86ae727019..2c0e1a2e77 100644
--- a/clients/tests/test-client.check-on-disk/test_004-197.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-197.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/197
+location: clients/tests/test-client.py:996:test_004()/197
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-198.expected b/clients/tests/test-client.check-on-disk/test_004-198.expected
index 8c8501cb96..b639cf8152 100644
--- a/clients/tests/test-client.check-on-disk/test_004-198.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-198.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:999:test_004()/198
+location: clients/tests/test-client.py:996:test_004()/198
 cmd: $NMCLI --mode multiline --terse -f NAME,SSID,SSID-HEX,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,BARS,SECURITY,WPA-FLAGS,RSN-FLAGS,DEVICE,ACTIVE,IN-USE,DBUS-PATH device wifi list bssid C0:E2:BE:E8:EF:B6
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-199.expected b/clients/tests/test-client.check-on-disk/test_004-199.expected
index d4a69a04d3..01bbbc726c 100644
--- a/clients/tests/test-client.check-on-disk/test_004-199.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-199.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/199
+location: clients/tests/test-client.py:998:test_004()/199
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-200.expected b/clients/tests/test-client.check-on-disk/test_004-200.expected
index 0b3ddaa2fd..331d875b3a 100644
--- a/clients/tests/test-client.check-on-disk/test_004-200.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-200.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1001:test_004()/200
+location: clients/tests/test-client.py:998:test_004()/200
 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-201.expected b/clients/tests/test-client.check-on-disk/test_004-201.expected
index 030273e296..4584e5022e 100644
--- a/clients/tests/test-client.check-on-disk/test_004-201.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-201.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/201
+location: clients/tests/test-client.py:1000:test_004()/201
 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-202.expected b/clients/tests/test-client.check-on-disk/test_004-202.expected
index 1113a46ea4..053e07f949 100644
--- a/clients/tests/test-client.check-on-disk/test_004-202.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-202.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1003:test_004()/202
+location: clients/tests/test-client.py:1000:test_004()/202
 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-203.expected b/clients/tests/test-client.check-on-disk/test_004-203.expected
index c9d8ca14ed..1eb7293249 100644
--- a/clients/tests/test-client.check-on-disk/test_004-203.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-203.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/203
+location: clients/tests/test-client.py:1002:test_004()/203
 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: C
 returncode: 0
diff --git a/clients/tests/test-client.check-on-disk/test_004-204.expected b/clients/tests/test-client.check-on-disk/test_004-204.expected
index ad38961658..e062a79969 100644
--- a/clients/tests/test-client.check-on-disk/test_004-204.expected
+++ b/clients/tests/test-client.check-on-disk/test_004-204.expected
@@ -1,4 +1,4 @@
-location: clients/tests/test-client.py:1005:test_004()/204
+location: clients/tests/test-client.py:1002:test_004()/204
 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0
 lang: pl_PL.UTF-8
 returncode: 0
diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py
index b9a2d0c44a..74225ccfab 100755
--- a/clients/tests/test-client.py
+++ b/clients/tests/test-client.py
@@ -118,9 +118,6 @@ class PathConfiguration:
 
 ###############################################################################
 
-os.sys.path.append(os.path.abspath(PathConfiguration.top_srcdir() + '/examples/python'))
-import nmex
-
 dbus_session_inited = False
 
 _DEFAULT_ARG = object()
@@ -164,11 +161,11 @@ class Util:
             return p.wait(timeout)
         if timeout is None:
             return p.wait()
-        start = nmex.nm_boot_time_ns()
+        start = NM.utils_get_timestamp_msec()
         while True:
             if p.poll() is not None:
                 return p.returncode
-            if start + (timeout * 1000000000) < nmex.nm_boot_time_ns():
+            if start + (timeout * 1000) < NM.utils_get_timestamp_msec():
                 raise Exception("timeout expired")
             time.sleep(0.05)
 
@@ -306,7 +303,7 @@ class NMStubServer:
                              stdin = subprocess.PIPE,
                              env = env)
 
-        start = nmex.nm_boot_time_ns()
+        start = NM.utils_get_timestamp_msec()
         while True:
             if p.poll() is not None:
                 p.stdin.close()
@@ -316,7 +313,7 @@ class NMStubServer:
             nmobj = self._conn_get_main_object(self._conn)
             if nmobj is not None:
                 break
-            if (nmex.nm_boot_time_ns() - start) / 1000000 >= 2000:
+            if (NM.utils_get_timestamp_msec() - start) >= 2000:
                 p.stdin.close()
                 p.kill()
                 Util.popen_wait(p, 1000)
diff --git a/examples/python/gi/checkpoint.py b/examples/python/gi/checkpoint.py
index 7c36cdba57..50e7c33532 100755
--- a/examples/python/gi/checkpoint.py
+++ b/examples/python/gi/checkpoint.py
@@ -19,8 +19,6 @@ gi.require_version('NM', '1.0')
 from gi.repository import GLib, NM
 
 import os
-os.sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
-import nmex
 
 ###############################################################################
 
@@ -162,7 +160,7 @@ def do_adjust_rollback_timeout(client):
     client.checkpoint_adjust_rollback_timeout(path, add_timeout, None, adjust_rollback_timeout_cb, None)
 
 def do_show(client):
-    ts = nmex.nm_boot_time_ms()
+    ts = NM.utils_get_timestamp_msec()
     for c in client.get_checkpoints():
         show(c, ts)
 
diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
index af6e8c7ff3..130385455c 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml
@@ -99,12 +99,12 @@
     <!--
         LastScan:
 
-        The timestamp (in CLOCK_BOOTTIME seconds) for the last finished network scan.
+        The timestamp (in CLOCK_BOOTTIME milliseconds) for the last finished network scan.
         A value of -1 means the device never scanned for access points.
 
         Since: 1.12
     -->
-    <property name="LastScan" type="i" access="read"/>
+    <property name="LastScan" type="x" access="read"/>
 
     <!--
         PropertiesChanged:
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index eb705cbe0a..b700c7f5fd 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -6223,6 +6223,40 @@ nm_utils_format_variant_attributes (GHashTable *attributes,
 
 /*****************************************************************************/
 
+/*
+ * nm_utils_get_timestamp_msec():
+ *
+ * Gets current time in milliseconds of CLOCK_BOOTTIME.
+ *
+ * Returns: time in milliseconds
+ *
+ * Since: 1.12
+ */
+gint64
+nm_utils_get_timestamp_msec (void)
+{
+	struct timespec ts;
+
+	if (clock_gettime (CLOCK_BOOTTIME, &ts) != -1)
+		goto success;
+
+	if (errno == EINVAL) {
+		/* The fallback to CLOCK_MONOTONIC is taken only if we're running on a
+		 * criminally old kernel, prior to 2.6.39 (released on 18 May, 2011).
+		 * That happens during buildcheck on old builders, we don't expect to
+		 * be actually runs on kernels that old. */
+		if (clock_gettime (CLOCK_MONOTONIC, &ts) != -1)
+			goto success;
+	}
+
+	g_return_val_if_reached (-1);
+
+success:
+	return (((gint64) ts.tv_sec) * 1000) + (ts.tv_nsec / 1000000);
+}
+
+/*****************************************************************************/
+
 /**
  * nm_utils_version:
  *
diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
index 1f645a8042..7024586967 100644
--- a/libnm-core/nm-utils.h
+++ b/libnm-core/nm-utils.h
@@ -248,6 +248,11 @@ NMTCTfilter *nm_utils_tc_tfilter_from_str  (const char *str, GError **error);
 NM_AVAILABLE_IN_1_12
 char *nm_utils_tc_tfilter_to_str           (NMTCTfilter *tfilter, GError **error);
 
+/*****************************************************************************/
+
+NM_AVAILABLE_IN_1_12
+gint64 nm_utils_get_timestamp_msec         (void);
+
 G_END_DECLS
 
 #endif /* __NM_UTILS_H__ */
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index f17cc46e88..5011906c65 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -1366,5 +1366,6 @@ global:
 	nm_setting_wireless_get_wake_on_wlan;
 	nm_setting_wireless_wake_on_wlan_get_type;
 	nm_settings_connection_flags_get_type;
+	nm_utils_get_timestamp_msec;
 	nm_vpn_service_plugin_shutdown;
 } libnm_1_10_0;
diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c
index 153a71048a..ce15d087f4 100644
--- a/libnm/nm-checkpoint.c
+++ b/libnm/nm-checkpoint.c
@@ -70,8 +70,10 @@ nm_checkpoint_get_devices (NMCheckpoint *checkpoint)
  * nm_checkpoint_get_created:
  * @checkpoint: a #NMCheckpoint
  *
- * Gets the timestamp (in CLOCK_BOOTTIME milliseconds)
- * of checkpoint creation.
+ * Gets the timestamp (in CLOCK_BOOTTIME milliseconds) of checkpoint creation.
+ *
+ * Use nm_utils_get_timestamp_msec() to obtain current time value suitable for
+ * comparing to this value.
  *
  * Returns: the timestamp of checkpoint creation.
  *
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index 851983f46c..848e297cca 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -59,7 +59,7 @@ typedef struct {
 	NMAccessPoint *active_ap;
 	NMDeviceWifiCapabilities wireless_caps;
 	GPtrArray *aps;
-	gint last_scan;
+	gint64 last_scan;
 
 	RequestScanInfo *scan_info;
 } NMDeviceWifiPrivate;
@@ -273,19 +273,22 @@ nm_device_wifi_get_access_point_by_path (NMDeviceWifi *device,
  * nm_device_wifi_get_last_scan:
  * @device: a #NMDeviceWifi
  *
- * Returns the timestamp (in CLOCK_BOOTTIME seconds) for the last finished
+ * Returns the timestamp (in CLOCK_BOOTTIME milliseconds) for the last finished
  * network scan. A value of -1 means the device never scanned for access points.
  *
+ * Use nm_utils_get_timestamp_msec() to obtain current time value suitable for
+ * comparing to this value.
+ *
  * Returns: the last scan time in seconds
  *
  * Since: 1.12
  **/
-gint
+gint64
 nm_device_wifi_get_last_scan (NMDeviceWifi *device)
 {
-        g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), -1);
+	g_return_val_if_fail (NM_IS_DEVICE_WIFI (device), -1);
 
-        return NM_DEVICE_WIFI_GET_PRIVATE (device)->last_scan;
+	return NM_DEVICE_WIFI_GET_PRIVATE (device)->last_scan;
 }
 
 static GVariant *
@@ -721,7 +724,7 @@ get_property (GObject *object,
 		g_value_take_boxed (value, _nm_utils_copy_object_array (nm_device_wifi_get_access_points (self)));
 		break;
 	case PROP_LAST_SCAN:
-		g_value_set_int (value, nm_device_wifi_get_last_scan (self));
+		g_value_set_int64 (value, nm_device_wifi_get_last_scan (self));
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -935,10 +938,10 @@ nm_device_wifi_class_init (NMDeviceWifiClass *wifi_class)
 	 **/
 	g_object_class_install_property
 	        (object_class, PROP_LAST_SCAN,
-	         g_param_spec_int (NM_DEVICE_WIFI_LAST_SCAN, "", "",
-	                           -1, G_MAXINT, -1,
-	                           G_PARAM_READABLE |
-	                           G_PARAM_STATIC_STRINGS));
+	         g_param_spec_int64 (NM_DEVICE_WIFI_LAST_SCAN, "", "",
+	                             -1, G_MAXINT64, -1,
+	                             G_PARAM_READABLE |
+	                             G_PARAM_STATIC_STRINGS));
 
 	/* signals */
 
diff --git a/libnm/nm-device-wifi.h b/libnm/nm-device-wifi.h
index 9885438f02..8448acfea7 100644
--- a/libnm/nm-device-wifi.h
+++ b/libnm/nm-device-wifi.h
@@ -78,8 +78,8 @@ NMAccessPoint *          nm_device_wifi_get_access_point_by_path (NMDeviceWifi *
 
 const GPtrArray *        nm_device_wifi_get_access_points        (NMDeviceWifi *device);
 
-NM_AVAILABLE_IN_1_2
-gint                     nm_device_wifi_get_last_scan            (NMDeviceWifi *device);
+NM_AVAILABLE_IN_1_12
+gint64                   nm_device_wifi_get_last_scan            (NMDeviceWifi *device);
 
 gboolean                 nm_device_wifi_request_scan             (NMDeviceWifi *device,
                                                                   GCancellable *cancellable,
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index f162b15dc0..da2fbb79c0 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -900,9 +900,9 @@ demarshal_generic (NMObject *object,
 	else if (pspec->value_type == G_TYPE_UINT)
 		HANDLE_TYPE (G_VARIANT_TYPE_UINT32, guint, g_variant_get_uint32);
 	else if (pspec->value_type == G_TYPE_INT64)
-		HANDLE_TYPE (G_VARIANT_TYPE_INT64, gint, g_variant_get_int64);
+		HANDLE_TYPE (G_VARIANT_TYPE_INT64, gint64, g_variant_get_int64);
 	else if (pspec->value_type == G_TYPE_UINT64)
-		HANDLE_TYPE (G_VARIANT_TYPE_UINT64, guint, g_variant_get_uint64);
+		HANDLE_TYPE (G_VARIANT_TYPE_UINT64, guint64, g_variant_get_uint64);
 	else if (pspec->value_type == G_TYPE_LONG)
 		HANDLE_TYPE (G_VARIANT_TYPE_INT64, glong, g_variant_get_int64);
 	else if (pspec->value_type == G_TYPE_ULONG)
diff --git a/shared/nm-utils/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h
index 4b081630cf..588552375e 100644
--- a/shared/nm-utils/nm-shared-utils.h
+++ b/shared/nm-utils/nm-shared-utils.h
@@ -520,8 +520,9 @@ void _nm_utils_strv_sort (const char **strv, gssize len);
 
 /*****************************************************************************/
 
-#define NM_UTILS_NS_PER_SECOND  ((gint64) 1000000000)
-#define NM_UTILS_NS_PER_MSEC    ((gint64) 1000000)
+#define NM_UTILS_NS_PER_SECOND   ((gint64) 1000000000)
+#define NM_UTILS_NS_PER_MSEC     ((gint64) 1000000)
+#define NM_UTILS_MSEC_PER_SECOND ((gint64) 1000)
 #define NM_UTILS_NS_TO_MSEC_CEIL(nsec)      (((nsec) + (NM_UTILS_NS_PER_MSEC - 1)) / NM_UTILS_NS_PER_MSEC)
 
 /*****************************************************************************/
diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c
index 58bafb81d4..d28fcdbdc7 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/devices/wifi/nm-device-iwd.c
@@ -80,7 +80,7 @@ typedef struct {
 	bool            can_connect:1;
 	bool            scanning:1;
 	bool            scan_requested:1;
-	gint32          last_scan;
+	gint64          last_scan;
 } NMDeviceIwdPrivate;
 
 struct _NMDeviceIwd {
@@ -865,7 +865,7 @@ scan_cb (GObject *source, GAsyncResult *res, gpointer user_data)
 
 	priv = NM_DEVICE_IWD_GET_PRIVATE (self);
 	priv->scan_requested = FALSE;
-	priv->last_scan = nm_utils_get_monotonic_timestamp_s ();
+	priv->last_scan = nm_utils_get_monotonic_timestamp_ms ();
 	_notify (self, PROP_LAST_SCAN);
 
 	/* On success, priv->scanning becomes true right before or right
@@ -1535,10 +1535,10 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_boolean (value, priv->scanning);
 		break;
 	case PROP_LAST_SCAN:
-		g_value_set_int (value,
-		                 priv->last_scan > 0
-		                     ? (gint) nm_utils_monotonic_timestamp_as_boottime (priv->last_scan, NM_UTILS_NS_PER_SECOND)
-		                     : -1);
+		g_value_set_int64 (value,
+		                   priv->last_scan > 0
+		                       ? nm_utils_monotonic_timestamp_as_boottime (priv->last_scan, NM_UTILS_NS_PER_MSEC)
+		                       : (gint64) -1);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -1920,9 +1920,9 @@ nm_device_iwd_class_init (NMDeviceIwdClass *klass)
 	                          G_PARAM_STATIC_STRINGS);
 
 	obj_properties[PROP_LAST_SCAN] =
-	    g_param_spec_int (NM_DEVICE_IWD_LAST_SCAN, "", "",
-	                      -1, G_MAXINT, -1,
-	                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+	    g_param_spec_int64 (NM_DEVICE_IWD_LAST_SCAN, "", "",
+	                        -1, G_MAXINT64, -1,
+	                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index bcb0e5471f..1a86e13bf6 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -97,8 +97,8 @@ typedef struct {
 	bool              ssid_found:1;
 	bool              is_scanning:1;
 
-	gint32            last_scan;
-	gint32            scheduled_scan_time;
+	gint64            last_scan; /* milliseconds */
+	gint32            scheduled_scan_time; /* seconds */
 	guint8            scan_interval; /* seconds */
 	guint             pending_scan_id;
 	guint             ap_dump_id;
@@ -1127,7 +1127,7 @@ _nm_device_wifi_request_scan (NMDeviceWifi *self,
 {
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 	NMDevice *device = NM_DEVICE (self);
-	gint32 last_scan;
+	gint64 last_scan;
 
 	if (   !priv->enabled
 	    || !priv->sup_iface
@@ -1148,8 +1148,8 @@ _nm_device_wifi_request_scan (NMDeviceWifi *self,
 		return;
 	}
 
-	last_scan = nm_supplicant_interface_get_last_scan_time (priv->sup_iface);
-	if (last_scan && (nm_utils_get_monotonic_timestamp_s () - last_scan) < 10) {
+	last_scan = nm_supplicant_interface_get_last_scan (priv->sup_iface);
+	if (last_scan && (nm_utils_get_monotonic_timestamp_ms () - last_scan) < 10 * NM_UTILS_MSEC_PER_SECOND) {
 		g_dbus_method_invocation_return_error_literal (invocation,
 		                                               NM_DEVICE_ERROR,
 		                                               NM_DEVICE_ERROR_NOT_ALLOWED,
@@ -1423,7 +1423,7 @@ supplicant_iface_scan_done_cb (NMSupplicantInterface *iface,
 
 	_LOGD (LOGD_WIFI, "wifi-scan: scan-done callback: %s", success ? "successful" : "failed");
 
-	priv->last_scan = nm_utils_get_monotonic_timestamp_s ();
+	priv->last_scan = nm_utils_get_monotonic_timestamp_ms ();
 	_notify (self, PROP_LAST_SCAN);
 	schedule_scan (self, success);
 
@@ -1447,9 +1447,9 @@ ap_list_dump (gpointer user_data)
 		NMWifiAP *ap;
 		gint32 now_s = nm_utils_get_monotonic_timestamp_s ();
 
-		_LOGD (LOGD_WIFI_SCAN, "APs: [now:%u last:%u next:%u]",
+		_LOGD (LOGD_WIFI_SCAN, "APs: [now:%u last:%" G_GINT64_FORMAT " next:%u]",
 		       now_s,
-		       priv->last_scan,
+		       priv->last_scan / NM_UTILS_MSEC_PER_SECOND,
 		       priv->scheduled_scan_time);
 		c_list_for_each_entry (ap, &priv->aps_lst_head, aps_lst)
 			_ap_dump (self, LOGL_DEBUG, ap, "dump", now_s);
@@ -3185,10 +3185,10 @@ get_property (GObject *object, guint prop_id,
 		g_value_set_boolean (value, priv->is_scanning);
 		break;
 	case PROP_LAST_SCAN:
-		g_value_set_int (value,
-		                 priv->last_scan > 0
-		                     ? (gint) nm_utils_monotonic_timestamp_as_boottime (priv->last_scan, NM_UTILS_NS_PER_SECOND)
-		                     : -1);
+		g_value_set_int64 (value,
+		                   priv->last_scan > 0
+		                       ? nm_utils_monotonic_timestamp_as_boottime (priv->last_scan, NM_UTILS_NS_PER_MSEC)
+		                       : (gint64) -1);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -3369,9 +3369,9 @@ nm_device_wifi_class_init (NMDeviceWifiClass *klass)
 	                          G_PARAM_STATIC_STRINGS);
 
 	obj_properties[PROP_LAST_SCAN] =
-	    g_param_spec_int (NM_DEVICE_WIFI_LAST_SCAN, "", "",
-	                      -1, G_MAXINT, -1,
-	                       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
+	    g_param_spec_int64 (NM_DEVICE_WIFI_LAST_SCAN, "", "",
+	                        -1, G_MAXINT64, -1,
+	                         G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
 
 	g_object_class_install_properties (object_class, _PROPERTY_ENUMS_LAST, obj_properties);
 
diff --git a/src/devices/wifi/nm-wifi-common.c b/src/devices/wifi/nm-wifi-common.c
index 0030b32dff..8e079d1151 100644
--- a/src/devices/wifi/nm-wifi-common.c
+++ b/src/devices/wifi/nm-wifi-common.c
@@ -200,7 +200,7 @@ const NMDBusInterfaceInfoExtended nm_interface_info_device_wireless = {
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("AccessPoints",         "ao", NM_DEVICE_WIFI_ACCESS_POINTS),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("ActiveAccessPoint",    "o",  NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT),
 			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE_L ("WirelessCapabilities", "u",  NM_DEVICE_WIFI_CAPABILITIES),
-			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE   ("LastScan",             "i",  NM_DEVICE_WIFI_LAST_SCAN),
+			NM_DEFINE_DBUS_PROPERTY_INFO_EXTENDED_READABLE   ("LastScan",             "x",  NM_DEVICE_WIFI_LAST_SCAN),
 		),
 	),
 	.legacy_property_changed = TRUE,
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index 3511b151e4..71e6a35ac5 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -129,7 +129,7 @@ typedef struct {
 	GHashTable *   bss_proxies;
 	char *         current_bss;
 
-	gint32         last_scan; /* timestamp as returned by nm_utils_get_monotonic_timestamp_s() */
+	gint64         last_scan; /* timestamp as returned by nm_utils_get_monotonic_timestamp_ms() */
 
 } NMSupplicantInterfacePrivate;
 
@@ -209,7 +209,7 @@ bss_proxy_properties_changed_cb (GDBusProxy *proxy,
 	NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
 
 	if (priv->scanning)
-		priv->last_scan = nm_utils_get_monotonic_timestamp_s ();
+		priv->last_scan = nm_utils_get_monotonic_timestamp_ms ();
 
 	g_signal_emit (self, signals[BSS_UPDATED], 0,
 	               g_dbus_proxy_get_object_path (proxy),
@@ -344,7 +344,7 @@ set_state (NMSupplicantInterface *self, NMSupplicantInterfaceState new_state)
 
 	if (   priv->state == NM_SUPPLICANT_INTERFACE_STATE_SCANNING
 	    || old_state == NM_SUPPLICANT_INTERFACE_STATE_SCANNING)
-		priv->last_scan = nm_utils_get_monotonic_timestamp_s ();
+		priv->last_scan = nm_utils_get_monotonic_timestamp_ms ();
 
 	/* Disconnect reason is no longer relevant when not in the DISCONNECTED state */
 	if (priv->state != NM_SUPPLICANT_INTERFACE_STATE_DISCONNECTED)
@@ -406,7 +406,7 @@ set_scanning (NMSupplicantInterface *self, gboolean new_scanning)
 
 		/* Cache time of last scan completion */
 		if (priv->scanning == FALSE)
-			priv->last_scan = nm_utils_get_monotonic_timestamp_s ();
+			priv->last_scan = nm_utils_get_monotonic_timestamp_ms ();
 
 		_notify (self, PROP_SCANNING);
 	}
@@ -438,8 +438,8 @@ nm_supplicant_interface_get_current_bss (NMSupplicantInterface *self)
 	return priv->state >= NM_SUPPLICANT_INTERFACE_STATE_READY ? priv->current_bss : NULL;
 }
 
-gint32
-nm_supplicant_interface_get_last_scan_time (NMSupplicantInterface *self)
+gint64
+nm_supplicant_interface_get_last_scan (NMSupplicantInterface *self)
 {
 	return NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self)->last_scan;
 }
@@ -987,7 +987,7 @@ wpas_iface_scan_done (GDBusProxy *proxy,
 	NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
 
 	/* Cache last scan completed time */
-	priv->last_scan = nm_utils_get_monotonic_timestamp_s ();
+	priv->last_scan = nm_utils_get_monotonic_timestamp_ms ();
 	priv->scan_done_success |= success;
 	scan_done_emit_signal (self);
 }
@@ -1002,7 +1002,7 @@ wpas_iface_bss_added (GDBusProxy *proxy,
 	NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (self);
 
 	if (priv->scanning)
-		priv->last_scan = nm_utils_get_monotonic_timestamp_s ();
+		priv->last_scan = nm_utils_get_monotonic_timestamp_ms ();
 
 	bss_add_new (self, path);
 }
diff --git a/src/supplicant/nm-supplicant-interface.h b/src/supplicant/nm-supplicant-interface.h
index f32ad8dda2..31272b3c11 100644
--- a/src/supplicant/nm-supplicant-interface.h
+++ b/src/supplicant/nm-supplicant-interface.h
@@ -110,7 +110,7 @@ gboolean nm_supplicant_interface_get_scanning (NMSupplicantInterface *self);
 
 const char *nm_supplicant_interface_get_current_bss (NMSupplicantInterface *self);
 
-gint32 nm_supplicant_interface_get_last_scan_time (NMSupplicantInterface *self);
+gint64 nm_supplicant_interface_get_last_scan (NMSupplicantInterface *self);
 
 const char *nm_supplicant_interface_get_ifname (NMSupplicantInterface *self);
 
diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py
index e866e0a617..ab63b60a83 100755
--- a/tools/test-networkmanager-service.py
+++ b/tools/test-networkmanager-service.py
@@ -924,7 +924,7 @@ class WifiDevice(Device):
             PRP_WIFI_WIRELESS_CAPABILITIES: dbus.UInt32(0xFF),
             PRP_WIFI_ACCESS_POINTS:         ExportedObj.to_path_array(self.aps),
             PRP_WIFI_ACTIVE_ACCESS_POINT:   ExportedObj.to_path(None),
-            PRP_WIFI_LAST_SCAN:             dbus.Int32(0x70000000),
+            PRP_WIFI_LAST_SCAN:             NM.utils_get_timestamp_msec(),
         }
 
         self.dbus_interface_add(IFACE_WIFI, props, WifiDevice.PropertiesChanged)