diff --git a/debian/control b/debian/control
index 730e8ec9..251b24ec 100644
--- a/debian/control
+++ b/debian/control
@@ -53,6 +53,7 @@ Depends: libqt5network5,
          libqt5bluetooth5,
          logrotate,
          avahi-daemon,
+         bluez,
          guh-translations,
          libguh1 (= ${binary:Version}),
          ${shlibs:Depends},
diff --git a/tests/auto/api.json b/tests/auto/api.json
index 579e4969..2d0ca455 100644
--- a/tests/auto/api.json
+++ b/tests/auto/api.json
@@ -41,17 +41,10 @@
                 "cloudError": "$ref:CloudError"
             }
         },
-        "Cloud.Disable": {
-            "description": "Disable the cloud connection.",
-            "params": {
-            },
-            "returns": {
-                "cloudError": "$ref:CloudError"
-            }
-        },
         "Cloud.Enable": {
-            "description": "Enable the cloud connection.",
+            "description": "Enable or disable the cloud connection.",
             "params": {
+                "enable": "Bool"
             },
             "returns": {
                 "cloudError": "$ref:CloudError"
@@ -474,6 +467,7 @@
         "NetworkManager.ConnectWifiNetwork": {
             "description": "Connect to the wifi network with the given ssid and password.",
             "params": {
+                "interface": "String",
                 "o:password": "String",
                 "ssid": "String"
             },
@@ -481,6 +475,15 @@
                 "networkManagerError": "$ref:NetworkManagerError"
             }
         },
+        "NetworkManager.DisconnectInterface": {
+            "description": "Disconnect the given network interface. The interface will remain disconnected until the user connect it again.",
+            "params": {
+                "interface": "String"
+            },
+            "returns": {
+                "networkManagerError": "$ref:NetworkManagerError"
+            }
+        },
         "NetworkManager.EnableNetworking": {
             "description": "Enable or disable networking in the NetworkManager.",
             "params": {
@@ -505,8 +508,11 @@
             },
             "returns": {
                 "networkManagerError": "$ref:NetworkManagerError",
-                "o:networkDevices": [
-                    "$ref:NetworkDevice"
+                "wiredNetworkDevices": [
+                    "$ref:WiredNetworkDevice"
+                ],
+                "wirelessNetworkDevices": [
+                    "$ref:WirelessNetworkDevice"
                 ]
             }
         },
@@ -524,8 +530,9 @@
             }
         },
         "NetworkManager.GetWirelessAccessPoints": {
-            "description": "Get the current list of wireless network access points.",
+            "description": "Get the current list of wireless network access points for the given interface. The interface has to be a WirelessNetworkDevice.",
             "params": {
+                "interface": "String"
             },
             "returns": {
                 "networkManagerError": "$ref:NetworkManagerError",
@@ -537,6 +544,7 @@
         "NetworkManager.ScanWifiNetworks": {
             "description": "Start a wifi scan for searching new networks.",
             "params": {
+                "interface": "String"
             },
             "returns": {
                 "networkManagerError": "$ref:NetworkManagerError"
@@ -765,24 +773,6 @@
                 "logEntry": "$ref:LogEntry"
             }
         },
-        "NetworkManager.NetworkDeviceAdded": {
-            "description": "Emitted whenever a new NetworkDevice was added.",
-            "params": {
-                "networkDevice": "$ref:NetworkDevice"
-            }
-        },
-        "NetworkManager.NetworkDeviceChanged": {
-            "description": "Emitted whenever a NetworkDevice has changed.",
-            "params": {
-                "networkDevice": "$ref:NetworkDevice"
-            }
-        },
-        "NetworkManager.NetworkDeviceRemoved": {
-            "description": "Emitted whenever a NetworkDevice was removed.",
-            "params": {
-                "networkDevice": "$ref:NetworkDevice"
-            }
-        },
         "NetworkManager.NetworkStatusChanged": {
             "description": "Emitted whenever a status of a NetworkManager changes.",
             "params": {
@@ -793,6 +783,42 @@
                 }
             }
         },
+        "NetworkManager.WiredNetworkDeviceAdded": {
+            "description": "Emitted whenever a new WiredNetworkDevice was added.",
+            "params": {
+                "wiredNetworkDevice": "$ref:WiredNetworkDevice"
+            }
+        },
+        "NetworkManager.WiredNetworkDeviceChanged": {
+            "description": "Emitted whenever the given WiredNetworkDevice has changed.",
+            "params": {
+                "wiredNetworkDevice": "$ref:WiredNetworkDevice"
+            }
+        },
+        "NetworkManager.WiredNetworkDeviceRemoved": {
+            "description": "Emitted whenever a WiredNetworkDevice was removed.",
+            "params": {
+                "interface": "String"
+            }
+        },
+        "NetworkManager.WirelessNetworkDeviceAdded": {
+            "description": "Emitted whenever a new WirelessNetworkDevice was added.",
+            "params": {
+                "wirelessNetworkDevice": "$ref:WirelessNetworkDevice"
+            }
+        },
+        "NetworkManager.WirelessNetworkDeviceChanged": {
+            "description": "Emitted whenever the given WirelessNetworkDevice has changed.",
+            "params": {
+                "wirelessNetworkDevice": "$ref:WirelessNetworkDevice"
+            }
+        },
+        "NetworkManager.WirelessNetworkDeviceRemoved": {
+            "description": "Emitted whenever a WirelessNetworkDevice was removed.",
+            "params": {
+                "interface": "String"
+            }
+        },
         "Rules.RuleActiveChanged": {
             "description": "Emitted whenever the active state of a Rule changed.",
             "params": {
@@ -1082,15 +1108,13 @@
             "LoggingSourceStates",
             "LoggingSourceRules"
         ],
-        "NetworkDevice": {
-            "name": "String",
-            "type": "String"
-        },
         "NetworkManagerError": [
             "NetworkManagerErrorNoError",
             "NetworkManagerErrorUnknownError",
             "NetworkManagerErrorWirelessNotAvailable",
             "NetworkManagerErrorAccessPointNotFound",
+            "NetworkManagerErrorNetworkInterfaceNotFound",
+            "NetworkManagerErrorInvalidNetworkDeviceType",
             "NetworkManagerErrorWirelessNetworkingDisabled",
             "NetworkManagerErrorWirelessConnectionFailed",
             "NetworkManagerErrorNetworkingDisabled",
@@ -1338,11 +1362,25 @@
             "id": "Uuid",
             "name": "String"
         },
+        "WiredNetworkDevice": {
+            "bitRate": "String",
+            "interface": "String",
+            "macAddress": "String",
+            "pluggedIn": "Bool",
+            "state": "$ref:NetworkDeviceState"
+        },
         "WirelessAccessPoint": {
             "frequency": "Double",
             "macAddress": "String",
             "signalStrength": "Int",
             "ssid": "String"
+        },
+        "WirelessNetworkDevice": {
+            "bitRate": "String",
+            "interface": "String",
+            "macAddress": "String",
+            "o:currentAccessPoint": "$ref:WirelessAccessPoint",
+            "state": "$ref:NetworkDeviceState"
         }
     }
 }