Merge ~morphis/snappy-hwe-snaps/+git/engineering-tests:reorganize-tests into ~snappy-hwe-team/snappy-hwe-snaps/+git/engineering-tests:master

[Simon Fels]

Reorganize tests into separate functional providers.

This splits the existing test cases into different functional (per snap for now) providers to allow other QA snaps to easily reuse those.

This also fixes up a few syntax errors in the test cases which lead to not working tests which were introduced from former merge proposals.

[System Enablement Bot (system-enablement-ci-bot)]

FAILED: Continuous integration, rev:fd348c84be38346b9ea1f6198f93ae5f5129ddcc
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/431/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/339/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/431/rebuild

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve (code)

[Simon Fels (morphis)]

@Jim: can you top-approve?

diff --git a/bin/run-bluez-tests b/bin/run-bluez-tests
index 459c80d..fa2d908 100755
--- a/bin/run-bluez-tests
+++ b/bin/run-bluez-tests
@@ -1,5 +1,5 @@
 #!/bin/sh
 export PATH="$PATH:$SNAP/usr/sbin"
 exec python3 $(which plainbox) \
-	run -i '2016.com.canonical.system-enablement::bluez.*' \
+	run -i '2016.com.canonical.bluez::bluez.*' \
 	"$@"
diff --git a/bin/run-modem-manager-tests b/bin/run-modem-manager-tests
index c2d5832..02fea4b 100755
--- a/bin/run-modem-manager-tests
+++ b/bin/run-modem-manager-tests
@@ -1,5 +1,5 @@
 #!/bin/sh
 export PATH="$PATH:$SNAP/usr/sbin"
 exec python3 $(which plainbox) \
-	run -i '2016.com.canonical.system-enablement::modem_manager.*' \
+	run -i '2016.com.canonical.modem-manager::modem_manager.*' \
 	"$@"
diff --git a/bin/run-network-manager-tests b/bin/run-network-manager-tests
index 9d76ecb..7f90af1 100755
--- a/bin/run-network-manager-tests
+++ b/bin/run-network-manager-tests
@@ -1,5 +1,5 @@
 #!/bin/sh
 export PATH="$PATH:$SNAP/usr/sbin"
 exec python3 $(which plainbox) \
-	run -i '2016.com.canonical.system-enablement::network_manager.*' \
+	run -i '2016.com.canonical.network-manager::network_manager.*' \
 	"$@"
diff --git a/bin/run-pulseaudio-tests b/bin/run-pulseaudio-tests
index 40036f5..4e0b088 100755
--- a/bin/run-pulseaudio-tests
+++ b/bin/run-pulseaudio-tests
@@ -1,5 +1,5 @@
 #!/bin/sh
 export PATH="$PATH:$SNAP/usr/sbin"
 exec python3 $(which plainbox) \
-	run -i '2016.com.canonical.system-enablement::pulseaudio.*' \
+	run -i '2016.com.canonical.pulseaudio::pulseaudio.*' \
 	"$@"
diff --git a/bin/run-tpm-tests b/bin/run-tpm-tests
new file mode 100755
index 0000000..ea48ca1
--- /dev/null
+++ b/bin/run-tpm-tests
@@ -0,0 +1,5 @@
+#!/bin/sh
+export PATH="$PATH:$SNAP/usr/sbin"
+exec python3 $(which plainbox) \
+	run -i '2016.com.canonical.tpm::tpm.*' \
+	"$@"
diff --git a/bin/run-tpm1.2-tests b/bin/run-tpm1.2-tests
deleted file mode 100755
index afdfd53..0000000
--- a/bin/run-tpm1.2-tests
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-export PATH="$PATH:$SNAP/usr/sbin"
-exec python3 $(which plainbox) \
-	run -i '2016.com.canonical.system-enablement::tpm1.2.*' \
-	"$@"
diff --git a/bin/run-wifi-ap-tests b/bin/run-wifi-ap-tests
index 010fed7..0d7dce0 100755
--- a/bin/run-wifi-ap-tests
+++ b/bin/run-wifi-ap-tests
@@ -1,5 +1,5 @@
 #!/bin/sh
 export PATH="$PATH:$SNAP/usr/sbin"
 exec python3 $(which plainbox) \
-	run -i '2016.com.canonical.system-enablement::wifi_ap.*' \
+	run -i '2016.com.canonical.wifi-ap::wifi_ap.*' \
 	"$@"
diff --git a/bin/run-wireless-tools-tests b/bin/run-wireless-tools-tests
index 29cd139..69f5769 100755
--- a/bin/run-wireless-tools-tests
+++ b/bin/run-wireless-tools-tests
@@ -1,5 +1,5 @@
 #!/bin/sh
 export PATH="$PATH:$SNAP/usr/sbin"
 exec python3 $(which plainbox) \
-	run -i '2016.com.canonical.system-enablement::wireless-tools.*' \
+	run -i '2016.com.canonical.wireless-tools::wireless-tools.*' \
 	"$@"
diff --git a/bluez/manage.py b/bluez/manage.py
new file mode 100755
index 0000000..78b0dbd
--- /dev/null
+++ b/bluez/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+from plainbox.provider_manager import setup, N_
+
+setup(
+    name='plainbox-provider-bluez',
+    namespace='2016.com.canonical.bluez',
+    version="1.0",
+    description=N_("Plainbox provider for the BlueZ snap"),
+    gettext_domain="2016_com_canonical_bluez",
+)
diff --git a/bluez/units/bluez.pxu b/bluez/units/bluez.pxu
new file mode 100644
index 0000000..682bb31
--- /dev/null
+++ b/bluez/units/bluez.pxu
@@ -0,0 +1,155 @@
+# Copyright 2016 Canonical Ltd.
+# All rights reserved.
+#
+# Written by:
+#   Jim Hodapp <[e-mail]>
+
+unit: category
+id: bluez
+_name: Bluez
+
+id: bluez/setup/ensure_interface_connection_setup
+category_id: bluez
+_description: Ensure that the bluez interface is connected
+plugin: manual
+_steps:
+  1. Connect required bluez slot/plug
+  .
+    $ sudo snap connect bluez:client bluez:service
+  .
+_verification:
+  Verify that you see the following when running snap interfaces bluez:
+  bluez:service  bluez:client
+
+id: bluez/scan/get_all
+category_id: bluez
+plugin: manual
+depends: bluez/setup/ensure_interface_connection_setup
+_summary: All Bluetooth devices in range are listed
+_purpose:
+ Check if all powered on devices that are within range as listed.
+_steps:
+  1. Execute the following command to retrieve the list of all Bluetooth devices:
+  .
+    $ /snap/bin/bluez.bluetoothctl
+    [bluetooth]# scan on
+  .
+_verification:
+  Your expected Bluetooth device(s) is/are shown in the output list such as:
+    [NEW] Device 04:52:C7:0D:0C:03 QC 35s
+
+id: bluez/connection/pair_and_connect
+category_id: bluez
+plugin: manual
+depends: bluez/setup/ensure_interface_connection_setup
+_summary: A Bluetooth device of choice is paired and connected
+_purpose:
+ Check if your Bluetooth device of choice can be paired to the host system.
+_steps:
+  1. Execute the following command to pair and connect your device to the host
+     system using the address listed in the previous scan test:
+  .
+    [bluetooth]# pair <device_address>
+    [bluetooth]# connect <device_address>
+  .
+_verification:
+  You should see output similar to the following:
+  Attempting to pair with 04:52:C7:0D:0C:03
+    [CHG] Device 04:52:C7:0D:0C:03 Connected: yes
+    [CHG] Device 04:52:C7:0D:0C:03 Modalias: bluetooth:v009Ep400Cd0106
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00000000-deca-fade-deca-deafdecacaff
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001101-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001108-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110b-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110c-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110e-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000111e-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001200-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 ServicesResolved: yes
+    [CHG] Device 04:52:C7:0D:0C:03 Paired: yes
+    Pairing successful
+    [CHG] Device 04:52:C7:0D:0C:03 ServicesResolved: no
+    [CHG] Device 04:52:C7:0D:0C:03 Connected: no
+    Attempting to connect to 04:52:C7:0D:0C:03
+    [CHG] Device 04:52:C7:0D:0C:03 Connected: yes
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00000000-deca-fade-deca-deafdecacaff
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001101-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001108-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110b-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110c-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110e-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000111e-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000112f-0000-1000-8000-00805f9b34fb
+    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001200-0000-1000-8000-00805f9b34fb
+    Connection successful
+    [CHG] Device 04:52:C7:0D:0C:03 ServicesResolved: yes
+
+id: bluez/audio/a2dp_ubuntu_classic
+category_id: bluez
+plugin: manual
+depends: bluez/connection/pair_and_connect
+_summary: Stream audio to Bluetooth headset
+_purpose:
+ Verify that you can stream music to a Bluetooth headset via A2DP on Ubuntu
+ Classic. Note: Skip this test if not running Ubuntu Classic.
+_steps:
+  1. Follow the previous tests to list, pair and connect your headset.
+     Navigate to the Sound panel in System Settings, select your headset device
+     in the Output tab, and make sure that Mode is set to A2DP. Then press the
+     Test Sound button and test each speaker.
+_verification:
+  Verify that you can hear the test sound "Front left", "Front right" in each
+  speaker respectively.
+
+id: bluez/audio/a2dp_disconnect
+category_id: bluez
+plugin: manual
+depends: bluez/audio/a2dp_ubuntu_classic
+_summary: Disconnect Bluetooth headset
+_purpose:
+ Verify that you can disconnect Bluetooth headset while streaming and audio
+ playback switches back to the device's primary speaker.
+_steps:
+  1. Follow the previous tests to start streaming audio to the headset via
+     A2DP. Then execute the following command to disconnect the headset from
+     active A2DP streaming:
+  .
+    [<device_name>]# disconnect <device_address>
+_verification:
+  Verify that you see output similar to the following:
+    Attempting to disconnect from 04:52:C7:0D:0C:03
+    [CHG] Device 04:52:C7:0D:0C:03 ServicesResolved: no
+    Successful disconnected
+    [CHG] Device 04:52:C7:0D:0C:03 Connected: no
+    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Key: 0x0110
+    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x40
+    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x0c
+    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x02
+    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x41
+    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x00
+    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x61
+    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x71
+    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0xcd
+    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x92
+    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x6c
+
+id: bluez/connection/pair_and_connect_hid
+category_id: bluez
+plugin: manual
+depends: bluez/setup/ensure_interface_connection_setup
+_summary: A Bluetooth HID device (e.g. keyboard, mouse) is connected and paired
+_purpose:
+ Check if your Bluetooth HID device of choice (e.g. keyboard, mouse) can be
+ paired to the host system.
+_steps:
+  1. Execute the following command to pair and connect your HID device to the
+     host system:
+  .
+    [bluetooth]# scan on
+    [bluetooth]# pair <device_address>
+    [bluetooth]# connect <device_address>
+  .
+_verification:
+  Open a text editor and make sure you can type text from the HID keyboard
+  into the text box. If testing a mouse, ensure that the cursor moves when
+  moving your HID mouse.
diff --git a/modem-manager/manage.py b/modem-manager/manage.py
new file mode 100755
index 0000000..8570bb9
--- /dev/null
+++ b/modem-manager/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+from plainbox.provider_manager import setup, N_
+
+setup(
+    name='plainbox-provider-modem-manager',
+    namespace='2016.com.canonical.modem-manager',
+    version="1.0",
+    description=N_("Plainbox provider for the ModemManager snap"),
+    gettext_domain="2016_com_canonical_modem_manager",
+)
diff --git a/modem-manager/units/modem-manager.pxu b/modem-manager/units/modem-manager.pxu
new file mode 100644
index 0000000..02da607
--- /dev/null
+++ b/modem-manager/units/modem-manager.pxu
@@ -0,0 +1,79 @@
+# Copyright 2016 Canonical Ltd.
+# All rights reserved.
+#
+# Written by:
+#   Jim Hodapp <[e-mail]>
+
+unit: category
+id: modem_manager
+_name: Modem Manager
+
+id: modem_manager/setup/ensure_interface_connection_setup
+category_id: modem_manager
+_description: Ensure that the modem-manager interface is connected
+plugin: manual
+_steps:
+  1. Connect required modem-manager slot/plug
+  .
+    $ sudo snap connect modem-manager:mmcli modem-manager:service
+    $ sudo snap connect network-manager:nmcli network-manager:service
+    $ sudo snap connect network-manager:modem-manager modem-manager:service
+    $ sudo snap connect network-manager:ppp ubuntu-core:ppp
+  .
+_verification:
+  Verify that you see the following when running snap interfaces:
+  modem-manager:service    modem-manager:mmcli,network-manager:modem-manager
+  network-manager:service  network-manager:nmcli
+  :ppp                     network-manager
+
+id: modem_manager/modems/get_all
+category_id: modem_manager
+plugin: manual
+depends: modem_manager/setup/ensure_interface_connection_setup
+_summary: All active modem configuration items are listed
+_purpose:
+ Check if the modem shows up as being recognized by modem-manager.
+_steps:
+  1. Execute the following command to retrieve the list of all detected modems:
+  .
+    $ /snap/bin/modem-manager.mmcli -L
+_verification:
+  Your expected modem is shown in the output list.
+
+id: modem_manager/modems/get_info
+category_id: modem_manager
+plugin: manual
+depends: modem_manager/setup/ensure_interface_connection_setup
+_summary: All modem information listed
+_purpose:
+ Check if the modem details can be listed.
+_steps:
+  1. Execute the following command to retrieve the list of all detected modems.
+  Note, the modem number is listed from the previous test:
+  .
+    $ /snap/bin/modem-manager.mmcli -m <modem_number>
+_verification:
+  Your desired modem detail is listed.
+
+id: modem_manager/modems/connect
+category_id: modem_manager
+plugin: manual
+depends: modem_manager/setup/ensure_interface_connection_setup
+_summary: Connect to a listed modem
+_purpose:
+ Connect to a listed modem and verify connection status
+_steps:
+  1. Execute the following commands to connect to a particular modem.
+     Note, replace <interface> with something like "ttyACM3" (look in /dev).
+     You may also find it as the primary port when issuing the command:
+     /snap/bin/network-manager.nmcli -m <modem_number>
+     Also, replace <op_apn> by looking up the APN string for your cell provider
+     at http://www.apn-settings.com (e.g. "fast.t-mobile.com" for T-Mobile 4G).
+     Finally, not that "gsmconn" is an arbitrary connection name and can be set
+     to anything that makes sense for the connection type.
+  .
+    $ /snap/bin/network-manager.nmcli c add type gsm ifname <interface> con-name
+      gsmconn apn <op_apn>
+    $ /snap/bin/network-manager.nmcli r wwan on
+_verification:
+  Verify that you have a modem connection by pinging www.ubuntu.com.
diff --git a/network-manager/manage.py b/network-manager/manage.py
new file mode 100755
index 0000000..86969f2
--- /dev/null
+++ b/network-manager/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+from plainbox.provider_manager import setup, N_
+
+setup(
+    name='plainbox-provider-network-manager',
+    namespace='2016.com.canonical.network-manager',
+    version="1.0",
+    description=N_("Plainbox provider for the NetworkManager snap"),
+    gettext_domain="2016_com_canonical_network_manager",
+)
diff --git a/network-manager/units/network-manager.pxu b/network-manager/units/network-manager.pxu
new file mode 100644
index 0000000..6921aa7
--- /dev/null
+++ b/network-manager/units/network-manager.pxu
@@ -0,0 +1,255 @@
+# Copyright 2016 Canonical Ltd.
+# All rights reserved.
+#
+# Written by:
+#   Lorn Potter <[e-mail]>
+#   Simon Fels <[e-mail]>
+
+unit: category
+id: network_manager
+_name: Network Manager
+
+id: network_manager/ethernet/all_ports_detected
+category_id: network_manager
+plugin: manual
+_summary: NetworkManager should detect all available ethernet ports
+_purpose:
+ NetworkManager should detect all available ethernet ports by default
+ on a system and list them as usable devices.
+_steps:
+ 1. List all available ethernet ports
+    $ ifconfig -a | grep -E '$eth'
+    $ ifconfig -a | grep -E '$en'
+ 2. List all ethernet ports NetworkManager knows about
+    $ network-manager.nmcli d
+_verification:
+ Both steps should show the same list of ethernet network interfaces.
+
+id: network_manager/ethernet/auto_connected
+category_id: network_manager
+plugin: manual
+_summary: NetworkManager should auto-connect any ethernet port with a link
+_purpose:
+ When a cable is plugged into an ethernet port NetworkManager should try
+ to automatically connect the port.
+ .
+ NOTE: This test assumes that the cable you plug into the port is connected
+ to a network which offers a DHCP server.
+_steps:
+ 1. Ensure that there is no connection for the port you want to use for
+    testing. Using a serial console to perform this test is recommended.
+ 2. Drop any existing connections listed by
+    $ network-manager.nmcli c show
+    which are meant for the ethernet port of the device with
+    $ network-manager.nmcli c delete <UUID>
+ 3. Plug the cable into the ethernet port.
+_verification:
+ The ethernet port should be automatically connected by NetworkManager. This
+ can be verified with
+ $ network-manager.nmcli d | grep <ethernet device name>
+ eth0        ethernet  connected  <connection name>
+ Please note that the <connection name> can be different as its
+ automatically selected by NetworkManager. It can be "Wired Connection 1"
+ for example.
+
+id: network_manager/ethernet/auto_connect_existing_connection
+category_id: network_manager
+plugin: manual
+_summary: Cable plug/unplug should give an existing connection
+_purpose:
+ When a cable is unplugged and plugged again the ethernet port should
+ be automatically reconnected.
+_steps:
+ 1. Check if the ethernet port is currently connected
+    $ network-manager.nmcli d
+ 2. Unplug the cable from the ethernet port and check the connection
+    $ network-manager.nmcli d
+ 3. Plug the cable again and check the connection status.
+_verification:
+ Before the cable is unplugged the ethernet port should be marked
+ as connected. Once the cable is removed the connection status
+ should switch to unconnected. When plugged back in, it should be marked
+ again as connected.
+
+id: network_manager/ethernet/unmanaged
+category_id: network_manager
+plugin: manual
+depends: network_manager/setup/ensure_interface_connection_setup
+_summary: Check if ethernet device is unmanaged.
+_purpose:
+ Check if the ethernet device is not managed by Network Manager.
+ .
+ NOTE: This only applies to device where ethernet is not managed by
+ NetworkManager. Check if /etc/netplan/00-default-nm-renderer.yaml
+ exists. If it does not, then NetworkManager doesn't touch any
+ ethernet connection.
+_steps:
+  1. Execute the following command to retrieve the list of all detected connections.
+  Note, the AP number is listed from the previous test:
+  .
+    $ /snap/bin/network-manager.nmcli d | grep en
+_verification:
+   The network device is listed as 'unmanaged', as an example:
+    enxb827ebf6b919  ethernet  unmanaged     --
+
+id: network_manager/connections/get_all
+category_id: network_manager
+plugin: manual
+depends: network_manager/setup/ensure_interface_connection_setup
+_summary: All active AP configuration items are listed
+_purpose:
+ Check if the AP shows up as being recognized by Network Manager.
+_steps:
+  1. Execute the following command to retrieve the list of all detected connections:
+  .
+    $ /snap/bin/network-manager.nmcli d wifi list
+_verification:
+  Your expected AP is shown in the output list for example:
+  pool1          Infra  6     54 Mbit/s  75      ***   WPA2
+
+id: network_manager/connections/agent
+category_id: network_manager
+plugin: manual
+depends: network_manager/setup/ensure_interface_connection_setup
+_summary: Register for secret agent
+_purpose:
+ Register for Network Manager's secret agent and verify status
+_steps:
+  1. Execute the following command to register secret agent:
+  .
+    $ /snap/bin/network-manager.nmcli a
+_verification:
+  Output should be similiar to this:
+  nmcli successfully registered as a Network Manager's secret agent.
+  nmcli successfully registered as a polkit agent.
+
+id: network_manager/connections/connect
+category_id: network_manager
+plugin: manual
+depends: network_manager/setup/ensure_interface_connection_setup
+_summary: Connect to a listed AP
+_purpose:
+ Connect to a listed AP and verify connection status
+_steps:
+  1. Execute the following commands to connect to a particular AP.
+  .
+    $ /snap/bin/network-manager.nmcli dev wifi con "yourssid" password "yourpassword"
+    Note, replace yourssid with the ssid if the AP you will connect to, and replace yourpassword
+    with the actual password/passphrase.
+_verification:
+  Verify that you have a AP connection by issuing this command:
+  $ ifconfig | grep -A 2 wl
+  .
+  verifying that the interface has an IP address with output similiar to this:
+  wlp5s0    Link encap:Ethernet  HWaddr 70:77:81:33:92:6b
+            inet addr:10.0.0.108  Bcast:10.0.0.255  Mask:255.255.255.0
+            inet6 addr: 2001:8003:6501:2000:c1b3:3359:d2a3:f2d1/64 Scope:Global
+
+id: network_manager/connections/get_info
+category_id: network_manager
+plugin: manual
+depends: network_manager/setup/ensure_interface_connection_setup
+_summary: All AP information listed
+_purpose:
+ Check if the AP details can be listed.
+_steps:
+  1. Execute the following command to retrieve the list of all detected connections.
+  Note, the AP ssid is listed from the previous test:
+  .
+    $ /snap/bin/network-manager.nmcli -p -f general,ip4,ip6 c show <AP_SSID>
+_verification:
+  Your desired AP detail is listed and has ip4/ip6 address.
+    ===============================================================================
+        Activate connection details (1554e3b2-76e6-4adc-b986-215b7393f8d9)
+    ===============================================================================
+    GENERAL.NAME:                           pool1
+    GENERAL.UUID:                           1554e3b2-76e6-4adc-b986-215b7393f8d9
+    GENERAL.DEVICES:                        wlp5s0
+    GENERAL.STATE:                          activated
+    GENERAL.DEFAULT:                        no
+    GENERAL.DEFAULT6:                       no
+    GENERAL.VPN:                            no
+    GENERAL.ZONE:                           --
+    GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
+    GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/3
+    GENERAL.SPEC-OBJECT:                    /org/freedesktop/NetworkManager/AccessPoint/0
+    GENERAL.MASTER-PATH:                    --
+    -------------------------------------------------------------------------------
+    IP4.ADDRESS[1]:                         10.0.0.108/24
+    IP4.GATEWAY:                            10.0.0.138
+    IP4.DNS[1]:                             10.0.0.138
+    IP4.DOMAIN[1]:                          gateway
+    -------------------------------------------------------------------------------
+    IP6.ADDRESS[1]:                         2001:8003:6501:2000:c1b3:3359:d2a3:f2d1/64
+    IP6.ADDRESS[2]:                         2001:8003:6501:2000:7277:81ff:fe33:926b/64
+    IP6.ADDRESS[3]:                         fe80::7277:81ff:fe33:926b/64
+    IP6.GATEWAY:                            fe80::e2b9:e5ff:fe5a:91b0
+    IP6.DNS[1]:                             2001:8003:6501:2000::1
+    IP6.DOMAIN[1]:                          gateway
+    -------------------------------------------------------------------------------
+
+id: network_manager/ethernet/uses_global_wol
+category_id: network_manager
+plugin: manual
+_summary: Ethernet connections are using global wake-on-lan setting
+_purpose:
+  Check if an ethernet connection created by NetworkManager automatically uses the
+  global default for wake-on-lan.
+  .
+  NOTE: This requires a system which is configured to not use netplan to
+  generate connections for NetworkManager. On such a system an ethernet
+  connection will always have wake-on-lan disabled as netplan does this
+  by default if not explicitly stated in the netplan configuration.
+_steps:
+  1. Find connection UUID for the ethernet port
+    $ network-manager.nmcli c show | grep eth0
+  2. Verify the connection uses the global wake-on-lan setting
+    $ network-manager.nmcli -m multiline -f 802-3-ethernet.wake-on-lan c show <UUID>
+_verification:
+  The output should look like this:
+  .
+  802-3-ethernet.wake-on-lan:             1 (default)
+
+id: network_manager/ethernet/has_wol_enabled_by_default
+category_id: network_manager
+plugin: manual
+_summary: Ethernet port has wake-on-lan enabled by default
+_purpose:
+  Check if the actual ethernet device has wake-on-lan correctly enabled when
+  its connection is maintained by NetworkManager.
+_steps:
+  1. Install the se-test-tools snap
+    $ snap install --devmode --edge se-test-tools
+  2. Check the ethernet port for the wake-on-lan setting (eth0 in this case)
+    $ sudo se-test-tools.ethtool eth0
+_verification:
+  The output should be similar to this:
+  Settings for eth0:
+   [...]
+   Supports Wake-on: pumbg
+   Wake-on: g
+   [...]
+  .
+  The relevant line is the "Wake-on:" one. It should have the value "g"
+  set which marks the port as waking up on the magic packet.
+
+id: network_manager/ethernet/wakes_up_with_wol
+category_id: network_manager
+plugin: manual
+_summary: Wake on LAN configured by NetworkManager can wake up the device
+_purpose:
+ Check that another system can wake up from S5 the SUT using the connected ethernet port.
+_steps:
+ 1. Ensure there is an ethernet cable attached to one of the ports and it's configured via
+    NetworkManager. Check with
+    $ network-manager.nmcli d | grep eth0
+ 2. Note the MAC address of the the eth0 port
+    $ ifconfig eth0
+ 3. Power off the system by running
+    $ sudo poweroff
+ 4. From another computer on the same network run the following command:
+    $ wakeonlan {mac}
+    If wakeonlan tool is not installed run:
+    $ sudo apt install wakeonlan
+_verification:
+  Did the SUT wake up from S5?
diff --git a/pulseaudio/manage.py b/pulseaudio/manage.py
new file mode 100755
index 0000000..5e7f5ce
--- /dev/null
+++ b/pulseaudio/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+from plainbox.provider_manager import setup, N_
+
+setup(
+    name='plainbox-provider-pulseaudio',
+    namespace='2016.com.canonical.pulseaudio',
+    version="1.0",
+    description=N_("Plainbox provider for the PulseAudio snap"),
+    gettext_domain="2016_com_canonical_pulseaudio",
+)
diff --git a/pulseaudio/units/pulseaudio.pxu b/pulseaudio/units/pulseaudio.pxu
new file mode 100644
index 0000000..3b304e7
--- /dev/null
+++ b/pulseaudio/units/pulseaudio.pxu
@@ -0,0 +1,80 @@
+# Copyright 2016 Canonical Ltd.
+# All rights reserved.
+#
+# Written by:
+#   Konrad Zapalowicz <[e-mail]>
+
+unit: category
+id: pulseaudio
+_name: PulseAudio
+
+id: pulseaudio/setup/ensure_interface_connection_setup
+category_id: pulseaudio
+_description: Ensure that the pulseaudio interface is auto-connected
+plugin: manual
+_steps:
+  1. List the interfaces
+  .
+    $ snap interfaces
+  .
+_verification:
+  Verify that you see the following:
+  pulseaudio:service pulseaudio:client
+
+id: pulseaudio/pactl/ensure-modules-are-listed
+category_id: pulseaudio
+_description: Ensure that the correct modules are loaded
+plugin: manual
+depends: pulseaudio/setup/ensure_interface_connection_setup 
+_steps:
+  1. List the loaded modules
+  .
+    $ pactl list short
+  .
+_verification:
+  Verify that you see output similar to following:
+    0       module-device-restore
+    1       module-stream-restore
+    2       module-card-restore
+    3       module-augment-properties
+    4       module-switch-on-port-available
+    5       module-udev-detect
+    ...
+    80      protocol-native.c       pactl
+    0       alsa_card.pci-0000_00_1b.0      module-alsa-card.c
+  .
+  Verify that amongs the other the following modules are listed:
+    module-device-restore
+    module-stream-restore
+    module-card-restore
+    module-switch-on-port-available
+    module-rescue-streams
+    module-always-sink
+
+id: pulseaudio/parecord/ensure-audio-can-be-recorded
+category_id: pulseaudio
+_description: Ensure that it is possible to record audio
+plugin: manual
+depends: pulseaudio/setup/ensure_interface_connection_setup 
+_steps:
+  1. Record an audio .wav file
+  .
+    $ parecord ~/record.wav
+  .
+_verification:
+  Verify that the record.wav file has been created and it's size is
+  greater than zero. Verify that the recorded file can be played and
+  it is possible to hear the audio.
+
+id: pulseaudio/paplay/ensure-audio-can-be-played
+category_id: pulseaudio
+_description: Ensure that it is possible to play auio files
+plugin: manual
+depends: pulseaudio/setup/ensure_interface_connection_setup 
+_steps:
+  1. Play an audio .wav file
+  .
+    $ paplay ~/file.wav
+  .
+_verification:
+  Verify that the audio is hearable through the speakers.
diff --git a/snapcraft.yaml b/snapcraft.yaml
index af4f8c5..f7599e4 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -21,8 +21,8 @@ apps:
     command: bin/run-network-manager-tests
   modem-manager:
     command: bin/run-modem-manager-tests
-  tpm1-2:
-    command: bin/run-tpm1.2-tests
+  tpm:
+    command: bin/run-tpm-tests
   wifi-ap:
     command: bin/run-wifi-ap-tests
   wireless-tools:
@@ -47,9 +47,33 @@ parts:
       - libxslt1-dev
       - zlib1g-dev
       - build-essential
-  se-plainbox-provider:
+  bluez:
+    plugin: plainbox-provider
+    source: ./bluez
+    after: [plainbox-local]
+  modem-manager:
+    plugin: plainbox-provider
+    source: ./modem-manager
+    after: [plainbox-local]
+  network-manager:
+    plugin: plainbox-provider
+    source: ./network-manager
+    after: [plainbox-local]
+  pulseaudio:
+    plugin: plainbox-provider
+    source: ./pulseaudio
+    after: [plainbox-local]
+  tpm:
+    plugin: plainbox-provider
+    source: ./tpm
+    after: [plainbox-local]
+  wifi-ap:
+    plugin: plainbox-provider
+    source: ./wifi-ap
+    after: [plainbox-local]
+  wireless-tools:
     plugin: plainbox-provider
-    source: ./tests
+    source: ./wireless-tools
     after: [plainbox-local]
   launchers:
     plugin: dump
diff --git a/tests/manage.py b/tests/manage.py
deleted file mode 100755
index d60bca0..0000000
--- a/tests/manage.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python3
-from plainbox.provider_manager import setup, N_
-
-
-setup(
-    name='plainbox-provider-system-enablement',
-    namespace='2016.com.canonical.system-enablement',
-    version="1.0",
-    description=N_("Plainbox provider for the System Enablement team"),
-    gettext_domain="2016_com_canonical_system_enablement",
-)
diff --git a/tests/units/bluez.pxu b/tests/units/bluez.pxu
deleted file mode 100644
index 682bb31..0000000
--- a/tests/units/bluez.pxu
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-# All rights reserved.
-#
-# Written by:
-#   Jim Hodapp <[e-mail]>
-
-unit: category
-id: bluez
-_name: Bluez
-
-id: bluez/setup/ensure_interface_connection_setup
-category_id: bluez
-_description: Ensure that the bluez interface is connected
-plugin: manual
-_steps:
-  1. Connect required bluez slot/plug
-  .
-    $ sudo snap connect bluez:client bluez:service
-  .
-_verification:
-  Verify that you see the following when running snap interfaces bluez:
-  bluez:service  bluez:client
-
-id: bluez/scan/get_all
-category_id: bluez
-plugin: manual
-depends: bluez/setup/ensure_interface_connection_setup
-_summary: All Bluetooth devices in range are listed
-_purpose:
- Check if all powered on devices that are within range as listed.
-_steps:
-  1. Execute the following command to retrieve the list of all Bluetooth devices:
-  .
-    $ /snap/bin/bluez.bluetoothctl
-    [bluetooth]# scan on
-  .
-_verification:
-  Your expected Bluetooth device(s) is/are shown in the output list such as:
-    [NEW] Device 04:52:C7:0D:0C:03 QC 35s
-
-id: bluez/connection/pair_and_connect
-category_id: bluez
-plugin: manual
-depends: bluez/setup/ensure_interface_connection_setup
-_summary: A Bluetooth device of choice is paired and connected
-_purpose:
- Check if your Bluetooth device of choice can be paired to the host system.
-_steps:
-  1. Execute the following command to pair and connect your device to the host
-     system using the address listed in the previous scan test:
-  .
-    [bluetooth]# pair <device_address>
-    [bluetooth]# connect <device_address>
-  .
-_verification:
-  You should see output similar to the following:
-  Attempting to pair with 04:52:C7:0D:0C:03
-    [CHG] Device 04:52:C7:0D:0C:03 Connected: yes
-    [CHG] Device 04:52:C7:0D:0C:03 Modalias: bluetooth:v009Ep400Cd0106
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00000000-deca-fade-deca-deafdecacaff
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001101-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001108-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110b-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110c-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110e-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000111e-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001200-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 ServicesResolved: yes
-    [CHG] Device 04:52:C7:0D:0C:03 Paired: yes
-    Pairing successful
-    [CHG] Device 04:52:C7:0D:0C:03 ServicesResolved: no
-    [CHG] Device 04:52:C7:0D:0C:03 Connected: no
-    Attempting to connect to 04:52:C7:0D:0C:03
-    [CHG] Device 04:52:C7:0D:0C:03 Connected: yes
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00000000-deca-fade-deca-deafdecacaff
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001101-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001108-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110b-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110c-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000110e-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000111e-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 0000112f-0000-1000-8000-00805f9b34fb
-    [CHG] Device 04:52:C7:0D:0C:03 UUIDs: 00001200-0000-1000-8000-00805f9b34fb
-    Connection successful
-    [CHG] Device 04:52:C7:0D:0C:03 ServicesResolved: yes
-
-id: bluez/audio/a2dp_ubuntu_classic
-category_id: bluez
-plugin: manual
-depends: bluez/connection/pair_and_connect
-_summary: Stream audio to Bluetooth headset
-_purpose:
- Verify that you can stream music to a Bluetooth headset via A2DP on Ubuntu
- Classic. Note: Skip this test if not running Ubuntu Classic.
-_steps:
-  1. Follow the previous tests to list, pair and connect your headset.
-     Navigate to the Sound panel in System Settings, select your headset device
-     in the Output tab, and make sure that Mode is set to A2DP. Then press the
-     Test Sound button and test each speaker.
-_verification:
-  Verify that you can hear the test sound "Front left", "Front right" in each
-  speaker respectively.
-
-id: bluez/audio/a2dp_disconnect
-category_id: bluez
-plugin: manual
-depends: bluez/audio/a2dp_ubuntu_classic
-_summary: Disconnect Bluetooth headset
-_purpose:
- Verify that you can disconnect Bluetooth headset while streaming and audio
- playback switches back to the device's primary speaker.
-_steps:
-  1. Follow the previous tests to start streaming audio to the headset via
-     A2DP. Then execute the following command to disconnect the headset from
-     active A2DP streaming:
-  .
-    [<device_name>]# disconnect <device_address>
-_verification:
-  Verify that you see output similar to the following:
-    Attempting to disconnect from 04:52:C7:0D:0C:03
-    [CHG] Device 04:52:C7:0D:0C:03 ServicesResolved: no
-    Successful disconnected
-    [CHG] Device 04:52:C7:0D:0C:03 Connected: no
-    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Key: 0x0110
-    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x40
-    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x0c
-    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x02
-    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x41
-    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x00
-    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x61
-    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x71
-    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0xcd
-    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x92
-    [CHG] Device 04:52:C7:0D:0C:03 ManufacturerData Value: 0x6c
-
-id: bluez/connection/pair_and_connect_hid
-category_id: bluez
-plugin: manual
-depends: bluez/setup/ensure_interface_connection_setup
-_summary: A Bluetooth HID device (e.g. keyboard, mouse) is connected and paired
-_purpose:
- Check if your Bluetooth HID device of choice (e.g. keyboard, mouse) can be
- paired to the host system.
-_steps:
-  1. Execute the following command to pair and connect your HID device to the
-     host system:
-  .
-    [bluetooth]# scan on
-    [bluetooth]# pair <device_address>
-    [bluetooth]# connect <device_address>
-  .
-_verification:
-  Open a text editor and make sure you can type text from the HID keyboard
-  into the text box. If testing a mouse, ensure that the cursor moves when
-  moving your HID mouse.
diff --git a/tests/units/modem-manager.pxu b/tests/units/modem-manager.pxu
deleted file mode 100644
index 02da607..0000000
--- a/tests/units/modem-manager.pxu
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-# All rights reserved.
-#
-# Written by:
-#   Jim Hodapp <[e-mail]>
-
-unit: category
-id: modem_manager
-_name: Modem Manager
-
-id: modem_manager/setup/ensure_interface_connection_setup
-category_id: modem_manager
-_description: Ensure that the modem-manager interface is connected
-plugin: manual
-_steps:
-  1. Connect required modem-manager slot/plug
-  .
-    $ sudo snap connect modem-manager:mmcli modem-manager:service
-    $ sudo snap connect network-manager:nmcli network-manager:service
-    $ sudo snap connect network-manager:modem-manager modem-manager:service
-    $ sudo snap connect network-manager:ppp ubuntu-core:ppp
-  .
-_verification:
-  Verify that you see the following when running snap interfaces:
-  modem-manager:service    modem-manager:mmcli,network-manager:modem-manager
-  network-manager:service  network-manager:nmcli
-  :ppp                     network-manager
-
-id: modem_manager/modems/get_all
-category_id: modem_manager
-plugin: manual
-depends: modem_manager/setup/ensure_interface_connection_setup
-_summary: All active modem configuration items are listed
-_purpose:
- Check if the modem shows up as being recognized by modem-manager.
-_steps:
-  1. Execute the following command to retrieve the list of all detected modems:
-  .
-    $ /snap/bin/modem-manager.mmcli -L
-_verification:
-  Your expected modem is shown in the output list.
-
-id: modem_manager/modems/get_info
-category_id: modem_manager
-plugin: manual
-depends: modem_manager/setup/ensure_interface_connection_setup
-_summary: All modem information listed
-_purpose:
- Check if the modem details can be listed.
-_steps:
-  1. Execute the following command to retrieve the list of all detected modems.
-  Note, the modem number is listed from the previous test:
-  .
-    $ /snap/bin/modem-manager.mmcli -m <modem_number>
-_verification:
-  Your desired modem detail is listed.
-
-id: modem_manager/modems/connect
-category_id: modem_manager
-plugin: manual
-depends: modem_manager/setup/ensure_interface_connection_setup
-_summary: Connect to a listed modem
-_purpose:
- Connect to a listed modem and verify connection status
-_steps:
-  1. Execute the following commands to connect to a particular modem.
-     Note, replace <interface> with something like "ttyACM3" (look in /dev).
-     You may also find it as the primary port when issuing the command:
-     /snap/bin/network-manager.nmcli -m <modem_number>
-     Also, replace <op_apn> by looking up the APN string for your cell provider
-     at http://www.apn-settings.com (e.g. "fast.t-mobile.com" for T-Mobile 4G).
-     Finally, not that "gsmconn" is an arbitrary connection name and can be set
-     to anything that makes sense for the connection type.
-  .
-    $ /snap/bin/network-manager.nmcli c add type gsm ifname <interface> con-name
-      gsmconn apn <op_apn>
-    $ /snap/bin/network-manager.nmcli r wwan on
-_verification:
-  Verify that you have a modem connection by pinging www.ubuntu.com.
diff --git a/tests/units/network-manager.pxu b/tests/units/network-manager.pxu
deleted file mode 100644
index 6921aa7..0000000
--- a/tests/units/network-manager.pxu
+++ /dev/null
@@ -1,255 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-# All rights reserved.
-#
-# Written by:
-#   Lorn Potter <[e-mail]>
-#   Simon Fels <[e-mail]>
-
-unit: category
-id: network_manager
-_name: Network Manager
-
-id: network_manager/ethernet/all_ports_detected
-category_id: network_manager
-plugin: manual
-_summary: NetworkManager should detect all available ethernet ports
-_purpose:
- NetworkManager should detect all available ethernet ports by default
- on a system and list them as usable devices.
-_steps:
- 1. List all available ethernet ports
-    $ ifconfig -a | grep -E '$eth'
-    $ ifconfig -a | grep -E '$en'
- 2. List all ethernet ports NetworkManager knows about
-    $ network-manager.nmcli d
-_verification:
- Both steps should show the same list of ethernet network interfaces.
-
-id: network_manager/ethernet/auto_connected
-category_id: network_manager
-plugin: manual
-_summary: NetworkManager should auto-connect any ethernet port with a link
-_purpose:
- When a cable is plugged into an ethernet port NetworkManager should try
- to automatically connect the port.
- .
- NOTE: This test assumes that the cable you plug into the port is connected
- to a network which offers a DHCP server.
-_steps:
- 1. Ensure that there is no connection for the port you want to use for
-    testing. Using a serial console to perform this test is recommended.
- 2. Drop any existing connections listed by
-    $ network-manager.nmcli c show
-    which are meant for the ethernet port of the device with
-    $ network-manager.nmcli c delete <UUID>
- 3. Plug the cable into the ethernet port.
-_verification:
- The ethernet port should be automatically connected by NetworkManager. This
- can be verified with
- $ network-manager.nmcli d | grep <ethernet device name>
- eth0        ethernet  connected  <connection name>
- Please note that the <connection name> can be different as its
- automatically selected by NetworkManager. It can be "Wired Connection 1"
- for example.
-
-id: network_manager/ethernet/auto_connect_existing_connection
-category_id: network_manager
-plugin: manual
-_summary: Cable plug/unplug should give an existing connection
-_purpose:
- When a cable is unplugged and plugged again the ethernet port should
- be automatically reconnected.
-_steps:
- 1. Check if the ethernet port is currently connected
-    $ network-manager.nmcli d
- 2. Unplug the cable from the ethernet port and check the connection
-    $ network-manager.nmcli d
- 3. Plug the cable again and check the connection status.
-_verification:
- Before the cable is unplugged the ethernet port should be marked
- as connected. Once the cable is removed the connection status
- should switch to unconnected. When plugged back in, it should be marked
- again as connected.
-
-id: network_manager/ethernet/unmanaged
-category_id: network_manager
-plugin: manual
-depends: network_manager/setup/ensure_interface_connection_setup
-_summary: Check if ethernet device is unmanaged.
-_purpose:
- Check if the ethernet device is not managed by Network Manager.
- .
- NOTE: This only applies to device where ethernet is not managed by
- NetworkManager. Check if /etc/netplan/00-default-nm-renderer.yaml
- exists. If it does not, then NetworkManager doesn't touch any
- ethernet connection.
-_steps:
-  1. Execute the following command to retrieve the list of all detected connections.
-  Note, the AP number is listed from the previous test:
-  .
-    $ /snap/bin/network-manager.nmcli d | grep en
-_verification:
-   The network device is listed as 'unmanaged', as an example:
-    enxb827ebf6b919  ethernet  unmanaged     --
-
-id: network_manager/connections/get_all
-category_id: network_manager
-plugin: manual
-depends: network_manager/setup/ensure_interface_connection_setup
-_summary: All active AP configuration items are listed
-_purpose:
- Check if the AP shows up as being recognized by Network Manager.
-_steps:
-  1. Execute the following command to retrieve the list of all detected connections:
-  .
-    $ /snap/bin/network-manager.nmcli d wifi list
-_verification:
-  Your expected AP is shown in the output list for example:
-  pool1          Infra  6     54 Mbit/s  75      ***   WPA2
-
-id: network_manager/connections/agent
-category_id: network_manager
-plugin: manual
-depends: network_manager/setup/ensure_interface_connection_setup
-_summary: Register for secret agent
-_purpose:
- Register for Network Manager's secret agent and verify status
-_steps:
-  1. Execute the following command to register secret agent:
-  .
-    $ /snap/bin/network-manager.nmcli a
-_verification:
-  Output should be similiar to this:
-  nmcli successfully registered as a Network Manager's secret agent.
-  nmcli successfully registered as a polkit agent.
-
-id: network_manager/connections/connect
-category_id: network_manager
-plugin: manual
-depends: network_manager/setup/ensure_interface_connection_setup
-_summary: Connect to a listed AP
-_purpose:
- Connect to a listed AP and verify connection status
-_steps:
-  1. Execute the following commands to connect to a particular AP.
-  .
-    $ /snap/bin/network-manager.nmcli dev wifi con "yourssid" password "yourpassword"
-    Note, replace yourssid with the ssid if the AP you will connect to, and replace yourpassword
-    with the actual password/passphrase.
-_verification:
-  Verify that you have a AP connection by issuing this command:
-  $ ifconfig | grep -A 2 wl
-  .
-  verifying that the interface has an IP address with output similiar to this:
-  wlp5s0    Link encap:Ethernet  HWaddr 70:77:81:33:92:6b
-            inet addr:10.0.0.108  Bcast:10.0.0.255  Mask:255.255.255.0
-            inet6 addr: 2001:8003:6501:2000:c1b3:3359:d2a3:f2d1/64 Scope:Global
-
-id: network_manager/connections/get_info
-category_id: network_manager
-plugin: manual
-depends: network_manager/setup/ensure_interface_connection_setup
-_summary: All AP information listed
-_purpose:
- Check if the AP details can be listed.
-_steps:
-  1. Execute the following command to retrieve the list of all detected connections.
-  Note, the AP ssid is listed from the previous test:
-  .
-    $ /snap/bin/network-manager.nmcli -p -f general,ip4,ip6 c show <AP_SSID>
-_verification:
-  Your desired AP detail is listed and has ip4/ip6 address.
-    ===============================================================================
-        Activate connection details (1554e3b2-76e6-4adc-b986-215b7393f8d9)
-    ===============================================================================
-    GENERAL.NAME:                           pool1
-    GENERAL.UUID:                           1554e3b2-76e6-4adc-b986-215b7393f8d9
-    GENERAL.DEVICES:                        wlp5s0
-    GENERAL.STATE:                          activated
-    GENERAL.DEFAULT:                        no
-    GENERAL.DEFAULT6:                       no
-    GENERAL.VPN:                            no
-    GENERAL.ZONE:                           --
-    GENERAL.DBUS-PATH:                      /org/freedesktop/NetworkManager/ActiveConnection/2
-    GENERAL.CON-PATH:                       /org/freedesktop/NetworkManager/Settings/3
-    GENERAL.SPEC-OBJECT:                    /org/freedesktop/NetworkManager/AccessPoint/0
-    GENERAL.MASTER-PATH:                    --
-    -------------------------------------------------------------------------------
-    IP4.ADDRESS[1]:                         10.0.0.108/24
-    IP4.GATEWAY:                            10.0.0.138
-    IP4.DNS[1]:                             10.0.0.138
-    IP4.DOMAIN[1]:                          gateway
-    -------------------------------------------------------------------------------
-    IP6.ADDRESS[1]:                         2001:8003:6501:2000:c1b3:3359:d2a3:f2d1/64
-    IP6.ADDRESS[2]:                         2001:8003:6501:2000:7277:81ff:fe33:926b/64
-    IP6.ADDRESS[3]:                         fe80::7277:81ff:fe33:926b/64
-    IP6.GATEWAY:                            fe80::e2b9:e5ff:fe5a:91b0
-    IP6.DNS[1]:                             2001:8003:6501:2000::1
-    IP6.DOMAIN[1]:                          gateway
-    -------------------------------------------------------------------------------
-
-id: network_manager/ethernet/uses_global_wol
-category_id: network_manager
-plugin: manual
-_summary: Ethernet connections are using global wake-on-lan setting
-_purpose:
-  Check if an ethernet connection created by NetworkManager automatically uses the
-  global default for wake-on-lan.
-  .
-  NOTE: This requires a system which is configured to not use netplan to
-  generate connections for NetworkManager. On such a system an ethernet
-  connection will always have wake-on-lan disabled as netplan does this
-  by default if not explicitly stated in the netplan configuration.
-_steps:
-  1. Find connection UUID for the ethernet port
-    $ network-manager.nmcli c show | grep eth0
-  2. Verify the connection uses the global wake-on-lan setting
-    $ network-manager.nmcli -m multiline -f 802-3-ethernet.wake-on-lan c show <UUID>
-_verification:
-  The output should look like this:
-  .
-  802-3-ethernet.wake-on-lan:             1 (default)
-
-id: network_manager/ethernet/has_wol_enabled_by_default
-category_id: network_manager
-plugin: manual
-_summary: Ethernet port has wake-on-lan enabled by default
-_purpose:
-  Check if the actual ethernet device has wake-on-lan correctly enabled when
-  its connection is maintained by NetworkManager.
-_steps:
-  1. Install the se-test-tools snap
-    $ snap install --devmode --edge se-test-tools
-  2. Check the ethernet port for the wake-on-lan setting (eth0 in this case)
-    $ sudo se-test-tools.ethtool eth0
-_verification:
-  The output should be similar to this:
-  Settings for eth0:
-   [...]
-   Supports Wake-on: pumbg
-   Wake-on: g
-   [...]
-  .
-  The relevant line is the "Wake-on:" one. It should have the value "g"
-  set which marks the port as waking up on the magic packet.
-
-id: network_manager/ethernet/wakes_up_with_wol
-category_id: network_manager
-plugin: manual
-_summary: Wake on LAN configured by NetworkManager can wake up the device
-_purpose:
- Check that another system can wake up from S5 the SUT using the connected ethernet port.
-_steps:
- 1. Ensure there is an ethernet cable attached to one of the ports and it's configured via
-    NetworkManager. Check with
-    $ network-manager.nmcli d | grep eth0
- 2. Note the MAC address of the the eth0 port
-    $ ifconfig eth0
- 3. Power off the system by running
-    $ sudo poweroff
- 4. From another computer on the same network run the following command:
-    $ wakeonlan {mac}
-    If wakeonlan tool is not installed run:
-    $ sudo apt install wakeonlan
-_verification:
-  Did the SUT wake up from S5?
diff --git a/tests/units/pulseaudio.pxu b/tests/units/pulseaudio.pxu
deleted file mode 100644
index aeb81ab..0000000
--- a/tests/units/pulseaudio.pxu
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-# All rights reserved.
-#
-# Written by:
-#   Konrad Zapalowicz <[e-mail]>
-
-unit: category
-id: pulseaudio
-_name: PulseAudio
-
-id: pulseaudio/setup/ensure_interface_connection_setup
-category_id: pulseaudio
-_description: Ensure that the pulseaudio interface is auto-connected
-plugin: manual
-_steps:
-  1. List the interfaces
-  .
-    $ snap interfaces
-  .
-_verification:
-  Verify that you see the following:
-  pulseaudio:service pulseaudio:client
-
-id: pulseaudio/pactl/ensure-modules-are-listed
-category_id: pulseaudio
-_description: Ensure that the correct modules are loaded
-plugin: manual
-depends: pulseaudio/setup/ensure_interface_connection_setup 
-_steps:
-  1. List the loaded modules
-  .
-    $ pactl list short
-  .
-_verification:
-  Verify that you see output similar to following:
-    0       module-device-restore
-    1       module-stream-restore
-    2       module-card-restore
-    3       module-augment-properties
-    4       module-switch-on-port-available
-    5       module-udev-detect
-    ...
-    80      protocol-native.c       pactl
-    0       alsa_card.pci-0000_00_1b.0      module-alsa-card.c
-
-  Verify that amongs the other the following modules are listed:
-    module-device-restore
-    module-stream-restore
-    module-card-restore
-    module-switch-on-port-available
-    module-rescue-streams
-    module-always-sink
-
-id: pulseaudio/parecord/ensure-audio-can-be-recorded
-category_id: pulseaudio
-_description: Ensure that it is possible to record audio
-plugin: manual
-depends: pulseaudio/setup/ensure_interface_connection_setup 
-_steps:
-  1. Record an audio .wav file
-  .
-    $ parecord ~/record.wav
-  .
-_verification:
-  Verify that the record.wav file has been created and it's size is
-  greater than zero. Verify that the recorded file can be played and
-  it is possible to hear the audio.
-
-id: pulseaudio/paplay/ensure-audio-can-be-played
-category_id: pulseaudio
-_description: Ensure that it is possible to play auio files
-plugin: manual
-depends: pulseaudio/setup/ensure_interface_connection_setup 
-_steps:
-  1. Play an audio .wav file
-  .
-    $ paplay ~/file.wav
-  .
-_verification:
-  Verify that the audio is hearable through the speakers.
diff --git a/tests/units/tpm1.2.pxu b/tests/units/tpm1.2.pxu
deleted file mode 100644
index c5c18b8..0000000
--- a/tests/units/tpm1.2.pxu
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-# All rights reserved.
-#
-# Written by:
-#   Scott Sweeny <[e-mail]>
-
-unit: category
-id: tpm1.2
-_name: TPM 1.2
-
-id: tpm1.2/setup/ensure_interface_connection_setup
-category_id: tpm1.2
-_description: Ensure that the tpm1.2 interfaces are connected
-plugin: manual
-_steps:
-  1. Connect required tpm1.2 slots/plugs
-  .
-     $ sudo snap connect tpm:network ubuntu-core:network
-     $ sudo snap connect tpm:network-bind ubuntu-core:network-bind
-     $ sudo snap connect tpm:tpm ubuntu-core:tpm
-  .
-_verification:
-  Verify that you see the following when running snap interfaces:
-  :network                 tpm
-  :network-bind            tpm
-  :tpm                     tpm
-
-id: tpm1.2/setup/get_version
-category_id: tpm1.2
-plugin: manual
-depends: tpm1.2/setup/ensure_interface_connection_setup
-_summary: Can get version information from the TPM chip
-_purpose:
-  Check that basic communication with the TPM chip is working and that version
-  information can be retrieved with the expected command.
-_steps:
-  1. Execute the following command to show the TPM version:
-  .
-     $ /snap/bin/tpm.version
-_verification:
-  Output is similar to below with all fields showing data:
-  .
-  �z  TPM 1.2 Version Info:
-    Chip Version:        1.2.5.81
-    Spec Level:          2
-    Errata Revision:     3
-    TPM Vendor ID:       WEC
-    Vendor Specific data: 0000
-    TPM Version:         01010000
-    Manufacturer Info:   57454300
-
-id: tpm1.2/setup/self_test
-category_id: tpm1.2
-plugin: manual
-depends: tpm1.2/setup/ensure_interface_connection_setup
-_summary: TPM self test runs successfully
-_purpose:
-  Check that the TPM self test runs successfully and returns no errors.
-_steps:
-  1. Execute the following command to run the TPM self test:
-  .
-    $ /snap/bin/tpm.selftest
-_verification:
-  Output is similar to below (actual values are not important) and no
-  error messages are shown:
-  .
-  TPM Test Results: 
-        ff010205 51ffffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff
-        ffffffff ffffffff ffffffff ffff0000 00000000 00000000 00000000 00000000
-        00000000 00000000 00000000 00000000 00000000 00000000 00000000 0000
-
-
-id: tpm1.2/configuration/take_ownership
-category_id: tpm1.2
-plugin: manual
-depends: tpm1.2/setup/ensure_interface_connection_setup
-_summary: Taking ownership of the device is possible
-_purpose:
-  Check that you are able to take ownership of the device using TPM commands.
-_steps:
-  1.Execute the following command to take ownership of the TPM chip: 
-  .
-     $ /snap/bin/tpm.takeownership
-  .
-_verification:
-  Verify that you are prompted for both the owner key and the SRK (storage
-  root key) and that no errors are returned.
-  . 
-  NOTE: This command will only work if it has not been run before. You can
-  reset the TPM with:
-  .
-    $ /snap/bin/tpm.clear
-  .
-  Which will invalidate all existing keys and passwords and disable the chip.
-  Once this is done you must re-enable the TPM from the device's BIOS before
-  it can be used.
-
-id: tpm1.2/crypto/show_public_key
-category_id: tpm1.2
-plugin: manual
-depends: tpm1.2/setup/ensure_interface_connection_setup
-_summary: Showing the public endorsement key succeeds
-_purpose:
-   Check to make sure that the endorsement key pair exists and the public key
-   can be queried.
-_steps:
-  1. Execute the following command to see the public key:
-  .
-     $ /snap/bin/tpm.getpubek
-  .
-  You may see an error similar to:
-  .
-    Tspi_TPM_GetPubEndorsementKey failed: 0x00000008 - layer=tpm, code=0008 (8), The TPM target command has been disabled
-  .
-  This can be safely ignored as long as the public key data is displayed.
-_verification:
-  Verify that the public key data is shown, for example:
-  .
-  Public Endorsement Key:
-  Version:   01010000
-  Usage:     0x0002 (Unknown)
-  Flags:     0x00000000 (!VOLATILE, !MIGRATABLE, !REDIRECTION)
-  AuthUsage: 0x00 (Never)
-  Algorithm:         0x00000020 (Unknown)
-  Encryption Scheme: 0x00000012 (Unknown)
-  Signature Scheme:  0x00000010 (Unknown)
-  Public Key:
-        8b59fad6 83514128 d56e2aa0 5eef7cff ad23c90d 0dd9b1e2 31ef093d 72d947d8
-        e02fbe3a 3c235ff0 9c487973 40a28c9b 8b83aaaf dc1254ad 31a95410 811742e5
-        92c16823 6f663413 f7067d3a 9af09ccc 12944a13 51d32980 59a98740 4008ab0c
-        07b7d93b 9393691c 8ae7d84c 5fd4fcef 147934f1 09326225 d5d1b652 ab3e12ee
-        fbd1cfba b18abedc de2215cb 97006b92 839fd9a4 3158bc8f 028fe516 550905b3
-        e3eef1e1 9f8dd3ab 331cbe62 d32ce937 0c11ad41 1d2e50f3 c69c7cde cd0bf564
-        4b7b16f8 0885dc66 d4411aba a824c1f1 ea8aa743 5c62fad7 e9540b85 5c0dc7af
-        3c1615ae 56af18e4 770aa107 06ef274b 202e2e3e d4c280d8 5ca9e886 9d889e31
-
diff --git a/tests/units/wifi-ap.pxu b/tests/units/wifi-ap.pxu
deleted file mode 100644
index 78ee075..0000000
--- a/tests/units/wifi-ap.pxu
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-# All rights reserved.
-#
-# Written by:
-#   Jim Hodapp <[e-mail]>
-#   Simon Fels <[e-mail]>
-
-unit: category
-id: wifi_ap
-_name: WiFi Access Point
-
-id: wifi_ap/setup/ensure_interface_connection_setup
-category_id: wifi_ap
-_description: Ensure that the wifi_ap interfaces are connected
-plugin: manual
-_steps:
-  1. Connect required wifi_ap slots/plugs
-  .
-     $ sudo snap connect wifi-ap:firewall-control ubuntu-core:firewall-control
-     $ sudo snap connect wifi-ap:network-control ubuntu-core:network-control
-
-     For snaps on Classic:
-     $ sudo snap connect wifi-ap:network-manager ubuntu-core:network-manager
-
-     For full-snap based system (note that you need to install first
-     network-manager snap in this case):
-     $ sudo snap install network-manager
-     $ sudo snap connect wifi-ap:network-manager network-manager:service
-  .
-_verification:
-  Verify that you see the following when running snap interfaces:
-  :network-bind            wifi-ap
-  :network-control         wifi-ap
-
-  For snaps on Classic:
-  :network-manager         wifi-ap
-
-  For full-snap based system:
-  network-manager:service  wifi-ap:network-manager
-
-id: wifi_ap/configuration/get_all
-category_id: wifi_ap
-plugin: manual
-depends: wifi_ap/setup/ensure_interface_connection_setup
-_summary: All WiFi AP configuration items are listed
-_purpose:
-  Check if the configuration of the WiFi AP can be listed
-  with the expected command.
-_steps:
-  1. Execute the following command to retrieve all configuration items:
-  .
-     $ /snap/bin/wifi-ap.config get
-_verification:
-  All available configuration items are listed as output.
-
-id: wifi_ap/configuration/set_any
-category_id: wifi_ap
-plugin: manual
-depends: wifi_ap/setup/ensure_interface_connection_setup
-_summary: Setting any configuration key is possible
-_purpose:
-  Check if any configuration key can be set via the
-  configuration system of the snap.
-_steps:
-  1. Retrieve the current value of a specific configuration item
-     e.g. 'wifi.interface'.
-  .
-     $ /snap/bin/wifi-ap.config get wifi.interface
-  .
-  2. Set a new value for the same configuration item
-  .
-     $ sudo /snap/bin/wifi-ap.config set wifi.interface wlan1
-  .
-  3. Retrieve the current value of the same configuration item
-     for comparison.
-  .
-     $ /snap/bin/wifi-ap.config get wifi.interface
-_verification:
-  Verify that the new value for the configuration is not the same
-  as before the 'set' operation and is now the the value specified
-  in step 2.
-
-id: wifi_ap/connect/enable_ap
-category_id: wifi_ap
-plugin: manual
-depends: wifi_ap/setup/ensure_interface_connection_setup
-_summary: Enabling the AP succeeds
-_purpose:
-   Check to make sure the AP can be enabled. 
-_steps:
-  1. Look up and set the wifi interface to the proper name
-     e.g. from default wlan0 to enp0s3
-  .
-     $ ifconfig
-     $ /snap/bin/wifi-ap.config set wifi.interface <interface_name>
-  .
-  2. Enable the AP with the default configuration for other key values
-  .
-     $ sudo /snap/bin/wifi-ap.config set disabled 0
-  .
-  3. Restart the wifi-ap systemd service to complete the enabling
-  .
-     $ sudo systemctl restart snap.wifi-ap.backend
-  .
-  4. Verify that the AP is enabled by looking at the key/value pair
-  .
-     $ /snap/bin/wifi-ap.config get disabled
-_verification:
-  Verify that the new value for the disabled is set to 0. Also verify that a
-  different machine such as a phone or a laptop can connect to the AP using
-  SSID of "Ubuntu" and no security type.
diff --git a/tests/units/wireless-tools.pxu b/tests/units/wireless-tools.pxu
deleted file mode 100644
index 3c59f13..0000000
--- a/tests/units/wireless-tools.pxu
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-# All rights reserved.
-#
-# Written by:
-#   Konrad Zapalowicz <[e-mail]>
-
-unit: category
-id:wireless-tools
-_name: Wireless Tools
-
-id: wireless-tools/setup/ensure_interface_connection_setup
-category_id: wireless-tools
-_description: Ensure that wireless_tools interfaces are connected
-plugin: manual
-_steps:
-  1. Connect required wireless-tools slots/plugs 
-  .
-    $ sudo snap connect wireless-tools:network-control :network-control
-  .
-_verification:
-  Verify that you see the following when running snap interfaces:
-    :network                wireless-tools
-    :network-bind           wireless-tools
-    :network-control        wireless-tools
-
-id: wireless-tools/rfkill/list
-category_id:wireless-tools
-plugin: manual
-depends: wireless-tools/setup/ensure_interface_connection_setup
-_summary: The RF kill switches are listed
-_purpose: Check if all RF kill switches that are available on the HW are listed.
-_steps:
-  1. Execute the following command to retrieve the list of all RF kill switches:
-  .
-    $ /snap/bin/wireless-tools.rfkill list
-  .
-_verification:
-  Your expected RF kill switche(s) is/are shown in the output such as:
-    <id>: <name>: <description>
-        Soft blocked: <yes|no>
-        Hard blocked: <yes|no>
-
-  For example:
-    1: phy0: Wireless LAN
-        Soft blocked: no
-        Hard blocked: no
-    2: hci0: Bluetooth
-        Soft blocked: yes
-        Hard blocked: no
-
-id: wireless-tools/rfkill/change_state
-category_id:wireless-tools
-plugin: manual
-depends: wireless-tools/rfkill/list
-_summary: It is possible to change the state of RF kill
-_purpose: Check if it is possible to change a state of the RF kill switch
-_steps:
-  1. Execute the following commands first to list the available RF kill switches
-  .
-    $ /snap/bin/wireles-tools.rfkill list
-  .
-  2. Change the state of the selected RF kill switch using the id obtained in
-     the previous step. Note that the action: block or unblock shall be selected
-     based on the initial state of the RF kill switch: blocked yes or no.
-  .
-    $ /snap/bin/wireless-tools.rfkill [un]block <id>
-  .
-_verification:
-  There shall be no output on the standard output however there shall be a
-  change of state visible when listing the RF kill switches.
-  .
-    $ /snap/bin/wireless_tools.rfkill list
-  .
-  
-id: wireless_tools/rfkill/capture_event
-category_id: wireless-tools
-plugin: manual
-depends: wireless-tools/rfkill/list
-_summary: It is possible to see the events related to RF kill switch(es)
-_purpose: Check if it is possible to capture the event notifications
-_steps:
-  1. Execute the following command to enter the capture-events mode
-  .
-    $ /snap/bin/wireless_tools.rfkill event
-  .
-  2. Change the state of the RF kill switch using a hardware button if
-     available.
-_verification:
-  The command executed in the step 1 shall block and display the current state
-  of the RF kill switches in a following form:
-    <timestamp>: idx <id> type <type id> op <op id> soft <0|1> hard <0|1>
-  Pressing the hardware RF kill switch should be printed in the following
-  form as in the above. For example:
-    1478774281.491635: idx 0 type 2 op 0 soft 0 hard 0
-    1478774281.491762: idx 1 type 1 op 0 soft 0 hard 0
-    1478774281.491776: idx 2 type 2 op 0 soft 1 hard 0
-    1478774301.905695: idx 2 type 2 op 2 soft 0 hard 0
-    1478774307.837112: idx 0 type 2 op 2 soft 1 hard 0
-    1478774310.817935: idx 2 type 2 op 2 soft 1 hard 0
-    1478774310.818989: idx 2 type 2 op 1 soft 1 hard 0
-
-
diff --git a/tpm/manage.py b/tpm/manage.py
new file mode 100755
index 0000000..7135842
--- /dev/null
+++ b/tpm/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+from plainbox.provider_manager import setup, N_
+
+setup(
+    name='plainbox-provider-tpm',
+    namespace='2016.com.canonical.tpm',
+    version="1.0",
+    description=N_("Plainbox provider for the TPM snap"),
+    gettext_domain="2016_com_canonical_tpm",
+)
diff --git a/tpm/units/tpm.pxu b/tpm/units/tpm.pxu
new file mode 100644
index 0000000..cbbf256
--- /dev/null
+++ b/tpm/units/tpm.pxu
@@ -0,0 +1,135 @@
+# Copyright 2016 Canonical Ltd.
+# All rights reserved.
+#
+# Written by:
+#   Scott Sweeny <[e-mail]>
+
+unit: category
+id: tpm1.2
+_name: TPM 1.2
+
+id: tpm1.2/setup/ensure_interface_connection_setup
+category_id: tpm1.2
+_description: Ensure that the tpm1.2 interfaces are connected
+plugin: manual
+_steps:
+  1. Connect required tpm1.2 slots/plugs
+  .
+     $ sudo snap connect tpm:network ubuntu-core:network
+     $ sudo snap connect tpm:network-bind ubuntu-core:network-bind
+     $ sudo snap connect tpm:tpm ubuntu-core:tpm
+  .
+_verification:
+  Verify that you see the following when running snap interfaces:
+  :network                 tpm
+  :network-bind            tpm
+  :tpm                     tpm
+
+id: tpm1.2/setup/get_version
+category_id: tpm1.2
+plugin: manual
+depends: tpm1.2/setup/ensure_interface_connection_setup
+_summary: Can get version information from the TPM chip
+_purpose:
+  Check that basic communication with the TPM chip is working and that version
+  information can be retrieved with the expected command.
+_steps:
+  1. Execute the following command to show the TPM version:
+  .
+     $ /snap/bin/tpm.version
+_verification:
+  Output is similar to below with all fields showing data:
+  .
+  TPM 1.2 Version Info:
+    Chip Version:        1.2.5.81
+    Spec Level:          2
+    Errata Revision:     3
+    TPM Vendor ID:       WEC
+    Vendor Specific data: 0000
+    TPM Version:         01010000
+    Manufacturer Info:   57454300
+
+id: tpm1.2/setup/self_test
+category_id: tpm1.2
+plugin: manual
+depends: tpm1.2/setup/ensure_interface_connection_setup
+_summary: TPM self test runs successfully
+_purpose:
+  Check that the TPM self test runs successfully and returns no errors.
+_steps:
+  1. Execute the following command to run the TPM self test:
+  .
+    $ /snap/bin/tpm.selftest
+_verification:
+  Output is similar to below (actual values are not important) and no
+  error messages are shown:
+  .
+  TPM Test Results:
+        ff010205 51ffffff ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff
+        ffffffff ffffffff ffffffff ffff0000 00000000 00000000 00000000 00000000
+        00000000 00000000 00000000 00000000 00000000 00000000 00000000 0000
+
+
+id: tpm1.2/configuration/take_ownership
+category_id: tpm1.2
+plugin: manual
+depends: tpm1.2/setup/ensure_interface_connection_setup
+_summary: Taking ownership of the device is possible
+_purpose:
+  Check that you are able to take ownership of the device using TPM commands.
+_steps:
+  1.Execute the following command to take ownership of the TPM chip: 
+  .
+     $ /snap/bin/tpm.takeownership
+  .
+_verification:
+  Verify that you are prompted for both the owner key and the SRK (storage
+  root key) and that no errors are returned.
+  . 
+  NOTE: This command will only work if it has not been run before. You can
+  reset the TPM with:
+  .
+    $ /snap/bin/tpm.clear
+  .
+  Which will invalidate all existing keys and passwords and disable the chip.
+  Once this is done you must re-enable the TPM from the device's BIOS before
+  it can be used.
+
+id: tpm1.2/crypto/show_public_key
+category_id: tpm1.2
+plugin: manual
+depends: tpm1.2/setup/ensure_interface_connection_setup
+_summary: Showing the public endorsement key succeeds
+_purpose:
+   Check to make sure that the endorsement key pair exists and the public key
+   can be queried.
+_steps:
+  1. Execute the following command to see the public key:
+  .
+     $ /snap/bin/tpm.getpubek
+  .
+  You may see an error similar to:
+  .
+    Tspi_TPM_GetPubEndorsementKey failed: 0x00000008 - layer=tpm, code=0008 (8), The TPM target command has been disabled
+  .
+  This can be safely ignored as long as the public key data is displayed.
+_verification:
+  Verify that the public key data is shown, for example:
+  .
+  Public Endorsement Key:
+  Version:   01010000
+  Usage:     0x0002 (Unknown)
+  Flags:     0x00000000 (!VOLATILE, !MIGRATABLE, !REDIRECTION)
+  AuthUsage: 0x00 (Never)
+  Algorithm:         0x00000020 (Unknown)
+  Encryption Scheme: 0x00000012 (Unknown)
+  Signature Scheme:  0x00000010 (Unknown)
+  Public Key:
+        8b59fad6 83514128 d56e2aa0 5eef7cff ad23c90d 0dd9b1e2 31ef093d 72d947d8
+        e02fbe3a 3c235ff0 9c487973 40a28c9b 8b83aaaf dc1254ad 31a95410 811742e5
+        92c16823 6f663413 f7067d3a 9af09ccc 12944a13 51d32980 59a98740 4008ab0c
+        07b7d93b 9393691c 8ae7d84c 5fd4fcef 147934f1 09326225 d5d1b652 ab3e12ee
+        fbd1cfba b18abedc de2215cb 97006b92 839fd9a4 3158bc8f 028fe516 550905b3
+        e3eef1e1 9f8dd3ab 331cbe62 d32ce937 0c11ad41 1d2e50f3 c69c7cde cd0bf564
+        4b7b16f8 0885dc66 d4411aba a824c1f1 ea8aa743 5c62fad7 e9540b85 5c0dc7af
+        3c1615ae 56af18e4 770aa107 06ef274b 202e2e3e d4c280d8 5ca9e886 9d889e31
diff --git a/wifi-ap/manage.py b/wifi-ap/manage.py
new file mode 100755
index 0000000..824585c
--- /dev/null
+++ b/wifi-ap/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+from plainbox.provider_manager import setup, N_
+
+setup(
+    name='plainbox-provider-wifi-ap',
+    namespace='2016.com.canonical.wifi-ap',
+    version="1.0",
+    description=N_("Plainbox provider for the WiFi AP snap"),
+    gettext_domain="2016_com_canonical_wifi_ap",
+)
diff --git a/wifi-ap/units/wifi-ap.pxu b/wifi-ap/units/wifi-ap.pxu
new file mode 100644
index 0000000..ae198ef
--- /dev/null
+++ b/wifi-ap/units/wifi-ap.pxu
@@ -0,0 +1,111 @@
+# Copyright 2016 Canonical Ltd.
+# All rights reserved.
+#
+# Written by:
+#   Jim Hodapp <[e-mail]>
+#   Simon Fels <[e-mail]>
+
+unit: category
+id: wifi_ap
+_name: WiFi Access Point
+
+id: wifi_ap/setup/ensure_interface_connection_setup
+category_id: wifi_ap
+_description: Ensure that the wifi_ap interfaces are connected
+plugin: manual
+_steps:
+  1. Connect required wifi_ap slots/plugs
+     .
+     $ sudo snap connect wifi-ap:firewall-control ubuntu-core:firewall-control
+     $ sudo snap connect wifi-ap:network-control ubuntu-core:network-control
+     .
+     For snaps on Classic:
+     $ sudo snap connect wifi-ap:network-manager ubuntu-core:network-manager
+     .
+     For full-snap based system (note that you need to install first
+     network-manager snap in this case):
+     $ sudo snap install network-manager
+     $ sudo snap connect wifi-ap:network-manager network-manager:service
+     .
+_verification:
+  Verify that you see the following when running snap interfaces:
+  :network-bind            wifi-ap
+  :network-control         wifi-ap
+  .
+  For snaps on Classic:
+  :network-manager         wifi-ap
+  .
+  For full-snap based system:
+  network-manager:service  wifi-ap:network-manager
+
+id: wifi_ap/configuration/get_all
+category_id: wifi_ap
+plugin: manual
+depends: wifi_ap/setup/ensure_interface_connection_setup
+_summary: All WiFi AP configuration items are listed
+_purpose:
+  Check if the configuration of the WiFi AP can be listed
+  with the expected command.
+_steps:
+  1. Execute the following command to retrieve all configuration items:
+  .
+     $ /snap/bin/wifi-ap.config get
+_verification:
+  All available configuration items are listed as output.
+
+id: wifi_ap/configuration/set_any
+category_id: wifi_ap
+plugin: manual
+depends: wifi_ap/setup/ensure_interface_connection_setup
+_summary: Setting any configuration key is possible
+_purpose:
+  Check if any configuration key can be set via the
+  configuration system of the snap.
+_steps:
+  1. Retrieve the current value of a specific configuration item
+     e.g. 'wifi.interface'.
+  .
+     $ /snap/bin/wifi-ap.config get wifi.interface
+  .
+  2. Set a new value for the same configuration item
+  .
+     $ sudo /snap/bin/wifi-ap.config set wifi.interface wlan1
+  .
+  3. Retrieve the current value of the same configuration item
+     for comparison.
+  .
+     $ /snap/bin/wifi-ap.config get wifi.interface
+_verification:
+  Verify that the new value for the configuration is not the same
+  as before the 'set' operation and is now the the value specified
+  in step 2.
+
+id: wifi_ap/connect/enable_ap
+category_id: wifi_ap
+plugin: manual
+depends: wifi_ap/setup/ensure_interface_connection_setup
+_summary: Enabling the AP succeeds
+_purpose:
+   Check to make sure the AP can be enabled. 
+_steps:
+  1. Look up and set the wifi interface to the proper name
+     e.g. from default wlan0 to enp0s3
+  .
+     $ ifconfig
+     $ /snap/bin/wifi-ap.config set wifi.interface <interface_name>
+  .
+  2. Enable the AP with the default configuration for other key values
+  .
+     $ sudo /snap/bin/wifi-ap.config set disabled 0
+  .
+  3. Restart the wifi-ap systemd service to complete the enabling
+  .
+     $ sudo systemctl restart snap.wifi-ap.backend
+  .
+  4. Verify that the AP is enabled by looking at the key/value pair
+  .
+     $ /snap/bin/wifi-ap.config get disabled
+_verification:
+  Verify that the new value for the disabled is set to 0. Also verify that a
+  different machine such as a phone or a laptop can connect to the AP using
+  SSID of "Ubuntu" and no security type.
diff --git a/wireless-tools/manage.py b/wireless-tools/manage.py
new file mode 100755
index 0000000..93a5a14
--- /dev/null
+++ b/wireless-tools/manage.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+from plainbox.provider_manager import setup, N_
+
+setup(
+    name='plainbox-provider-wireless-tools',
+    namespace='2016.com.canonical.wireless-tools',
+    version="1.0",
+    description=N_("Plainbox provider for the Wireless tools snap"),
+    gettext_domain="2016_com_canonical_wireless_tools",
+)
diff --git a/wireless-tools/units/wireless-tools.pxu b/wireless-tools/units/wireless-tools.pxu
new file mode 100644
index 0000000..39c070e
--- /dev/null
+++ b/wireless-tools/units/wireless-tools.pxu
@@ -0,0 +1,100 @@
+# Copyright 2016 Canonical Ltd.
+# All rights reserved.
+#
+# Written by:
+#   Konrad Zapalowicz <[e-mail]>
+
+unit: category
+id:wireless-tools
+_name: Wireless Tools
+
+id: wireless-tools/setup/ensure_interface_connection_setup
+category_id: wireless-tools
+_description: Ensure that wireless_tools interfaces are connected
+plugin: manual
+_steps:
+  1. Connect required wireless-tools slots/plugs 
+  .
+    $ sudo snap connect wireless-tools:network-control :network-control
+  .
+_verification:
+  Verify that you see the following when running snap interfaces:
+    :network                wireless-tools
+    :network-bind           wireless-tools
+    :network-control        wireless-tools
+
+id: wireless-tools/rfkill/list
+category_id:wireless-tools
+plugin: manual
+depends: wireless-tools/setup/ensure_interface_connection_setup
+_summary: The RF kill switches are listed
+_purpose: Check if all RF kill switches that are available on the HW are listed.
+_steps:
+  1. Execute the following command to retrieve the list of all RF kill switches:
+  .
+    $ /snap/bin/wireless-tools.rfkill list
+  .
+_verification:
+  Your expected RF kill switche(s) is/are shown in the output such as:
+    <id>: <name>: <description>
+        Soft blocked: <yes|no>
+        Hard blocked: <yes|no>
+  .
+  For example:
+    1: phy0: Wireless LAN
+        Soft blocked: no
+        Hard blocked: no
+    2: hci0: Bluetooth
+        Soft blocked: yes
+        Hard blocked: no
+
+id: wireless-tools/rfkill/change_state
+category_id:wireless-tools
+plugin: manual
+depends: wireless-tools/rfkill/list
+_summary: It is possible to change the state of RF kill
+_purpose: Check if it is possible to change a state of the RF kill switch
+_steps:
+  1. Execute the following commands first to list the available RF kill switches
+  .
+    $ /snap/bin/wireles-tools.rfkill list
+  .
+  2. Change the state of the selected RF kill switch using the id obtained in
+     the previous step. Note that the action: block or unblock shall be selected
+     based on the initial state of the RF kill switch: blocked yes or no.
+  .
+    $ /snap/bin/wireless-tools.rfkill [un]block <id>
+  .
+_verification:
+  There shall be no output on the standard output however there shall be a
+  change of state visible when listing the RF kill switches.
+  .
+    $ /snap/bin/wireless_tools.rfkill list
+  .
+
+id: wireless_tools/rfkill/capture_event
+category_id: wireless-tools
+plugin: manual
+depends: wireless-tools/rfkill/list
+_summary: It is possible to see the events related to RF kill switch(es)
+_purpose: Check if it is possible to capture the event notifications
+_steps:
+  1. Execute the following command to enter the capture-events mode
+  .
+    $ /snap/bin/wireless_tools.rfkill event
+  .
+  2. Change the state of the RF kill switch using a hardware button if
+     available.
+_verification:
+  The command executed in the step 1 shall block and display the current state
+  of the RF kill switches in a following form:
+    <timestamp>: idx <id> type <type id> op <op id> soft <0|1> hard <0|1>
+  Pressing the hardware RF kill switch should be printed in the following
+  form as in the above. For example:
+    1478774281.491635: idx 0 type 2 op 0 soft 0 hard 0
+    1478774281.491762: idx 1 type 1 op 0 soft 0 hard 0
+    1478774281.491776: idx 2 type 2 op 0 soft 1 hard 0
+    1478774301.905695: idx 2 type 2 op 2 soft 0 hard 0
+    1478774307.837112: idx 0 type 2 op 2 soft 1 hard 0
+    1478774310.817935: idx 2 type 2 op 2 soft 1 hard 0
+    1478774310.818989: idx 2 type 2 op 1 soft 1 hard 0