Merge ~teknoraver/snappy-hwe-snaps/+git/wifi-ap:master into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master

[Matteo Croce]

Run wizard during first boot.

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

FAILED: Continuous integration, rev:93e735e85a5888659598f8ce31cc87ff5dc53203
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/402/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/148/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/310/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:93e735e85a5888659598f8ce31cc87ff5dc53203
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/403/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/149
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/311/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:93e735e85a5888659598f8ce31cc87ff5dc53203
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/406/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/152
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/314/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:93e735e85a5888659598f8ce31cc87ff5dc53203
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/407/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/153
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/315/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

review: Needs Fixing

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

FAILED: Continuous integration, rev:da937aa8a68d81ac1f9467b4b05c833e8cb7ec0d
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/408/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/154/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/316/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:da937aa8a68d81ac1f9467b4b05c833e8cb7ec0d
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/409/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/155/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/317/console

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

review: Needs Fixing (continuous-integration)

[Jim Hodapp (jhodapp)]

Small change inline below.

review: Needs Fixing

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

FAILED: Continuous integration, rev:b7afff7c235e3e25d0436b1ba4547e2fab12a033
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/412/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/158/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/320/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:b7afff7c235e3e25d0436b1ba4547e2fab12a033
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/413/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/159
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/321/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:501a4e02711ea2e874d8778d9633f4f7507e5312
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/414/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/160
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/322/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:501a4e02711ea2e874d8778d9633f4f7507e5312
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/415/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/161
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/323/console

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:7953c08e1e24794c2fbb353ea3295108cf783335
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/416/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/162/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/324/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:7953c08e1e24794c2fbb353ea3295108cf783335
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/417/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/163/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/325/console

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

review: Needs Fixing

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

PASSED: Continuous integration, rev:ac47a25203a882280cdd7c2491566d4a72fb3900
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/421/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/164
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/329/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:ac47a25203a882280cdd7c2491566d4a72fb3900
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/422/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/165
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/330/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

review: Needs Fixing

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

PASSED: Continuous integration, rev:fda4f556cea8600db575e3d9032349e234901bb8
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/427/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/169
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/335/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:fda4f556cea8600db575e3d9032349e234901bb8
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/428/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/170
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/336/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:d93d9c17cbe1fe0596ebad844e1c71a7b7901088
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/429/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/171
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/337/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:d93d9c17cbe1fe0596ebad844e1c71a7b7901088
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/430/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/172
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/338/console

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

Two last comments inline.

review: Needs Fixing

[Simon Fels (morphis)]

Lets wait for the CI to give this a last pass and then we can merge.

review: Approve

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

FAILED: Continuous integration, rev:f237449c26f579728a4bda0f18131b56332532ec
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/445/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/187/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/353/console

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

review: Needs Fixing (continuous-integration)

[Simon Fels (morphis)]

Due to hickups in the CI infrastructure the above one is incorrect. The real run is https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/190/console

[Jim Hodapp (jhodapp)]

My requested change looks good although there are 4 spread tests currently failing.

review: Approve

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

FAILED: Continuous integration, rev:f237449c26f579728a4bda0f18131b56332532ec
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/450/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/196/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/358/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:092f746ea29aa1f85accdca79269443f4c7c8d7b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/458/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/201/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/366/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:092f746ea29aa1f85accdca79269443f4c7c8d7b
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/459/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/202/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/367/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:9653e41ef496b94d6e4683a161b2be29e04fbf74
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/464/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/207/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/372/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:9653e41ef496b94d6e4683a161b2be29e04fbf74
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/465/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/208
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/373/console

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

review: Approve (continuous-integration)

diff --git a/bin/ap.sh b/bin/ap.sh
index b98cfe0..4fd35e8 100755
--- a/bin/ap.sh
+++ b/bin/ap.sh
@@ -87,7 +87,7 @@ if [ "$WIFI_INTERFACE_MODE" = "virtual" ] ; then
 	# Make sure if the real wifi interface is connected we use
 	# the same channel for our AP as otherwise the created AP
 	# will not work.
-	channel_in_use=$(iw dev $WIFI_INTERFACE info |awk '/channel/{print$2}')
+	channel_in_use=$($SNAP/bin/iw dev $WIFI_INTERFACE info |awk '/channel/{print$2}')
 	if [ "$channel_in_use" != "$WIFI_CHANNEL" ] ; then
 		echo "ERROR: You configured a different channel than the WiFi device"
 		echo "       is currently using. This will not work as most devices"
diff --git a/bin/automatic-setup.sh b/bin/automatic-setup.sh
new file mode 100755
index 0000000..9a93954
--- /dev/null
+++ b/bin/automatic-setup.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Copyright (C) 2016 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set -x
+
+[ -f "$SNAP_DATA/config" ] && exit 0
+
+while ! $SNAP/bin/client status; do
+    sleep .5
+done
+
+exec $SNAP/bin/client wizard --auto
diff --git a/bin/helper.sh b/bin/helper.sh
index 4a557d6..f535325 100644
--- a/bin/helper.sh
+++ b/bin/helper.sh
@@ -17,13 +17,13 @@
 set -x
 
 does_interface_exist() {
-	grep -q $1 /proc/net/dev
+	[ -d /sys/class/net/$1 ]
 }
 
 wait_until_interface_is_available() {
-	while ! does_interface_exist $iface; do
-		# Wait for 10ms
-		sleep 0.01
+	while ! does_interface_exist $1; do
+		# Wait for 200ms
+		sleep 0.2
 	done
 }
 
diff --git a/snapcraft.yaml b/snapcraft.yaml
index d4d41d5..3168ff0 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -31,6 +31,11 @@ apps:
       - network-control
       - firewall-control
       - network-manager
+  automatic-setup:
+    command: bin/automatic-setup.sh
+    daemon: simple
+    plugs:
+      - network
 
 parts:
   common:
@@ -41,6 +46,7 @@ parts:
       - bin/config-internal.sh
       - bin/ap.sh
       - bin/helper.sh
+      - bin/automatic-setup.sh
       - conf/default-config
 
   network-utils:
diff --git a/tests/lib/prepare-all.sh b/tests/lib/prepare-all.sh
index 59e1349..52d622a 100644
--- a/tests/lib/prepare-all.sh
+++ b/tests/lib/prepare-all.sh
@@ -12,6 +12,8 @@ if [ -e /home/wifi-ap/wifi-ap_*_amd64.snap ] ; then
 	exit 0
 fi
 
+# Simulate two WiFi radio network interfaces
+modprobe mac80211_hwsim radios=2
 
 # Setup classic snap and build the wifi-ap snap in there
 snap install --devmode --beta classic
diff --git a/tests/lib/prepare.sh b/tests/lib/prepare.sh
index 55129b3..b95e884 100644
--- a/tests/lib/prepare.sh
+++ b/tests/lib/prepare.sh
@@ -31,7 +31,7 @@ if [ -n "$SNAP_CHANNEL" ] ; then
 else
 	# Install prebuilt wifi-ap snap
 	snap install --dangerous /home/wifi-ap/wifi-ap_*_amd64.snap
-	# As we have a snap which we build locally its unasserted and therefor
+	# As we have a snap which we build locally it's unasserted and therefore
 	# we don't have any snap-declarations in place and need to manually
 	# connect all plugs.
 	snap connect wifi-ap:network-control core
@@ -49,4 +49,4 @@ fi
 
 # For debugging dump all snaps and connected slots/plugs
 snap list
-snap interfaces
\ No newline at end of file
+snap interfaces
diff --git a/tests/lib/restore-each.sh b/tests/lib/restore-each.sh
index 1193b58..fa474b4 100644
--- a/tests/lib/restore-each.sh
+++ b/tests/lib/restore-each.sh
@@ -22,6 +22,7 @@ rm -rf /var/snap/$SNAP_NAME/current/*
 # Depending on what the test did both services are not meant to be
 # running here.
 systemctl stop snap.wifi-ap.management-service || true
+wait_for_systemd_service_exit snap.wifi-ap.management-service
 
 # Drop any generated or modified netplan configuration files. The original
 # ones will be restored below.
@@ -41,3 +42,13 @@ netplan apply
 # Start services again now that the system is restored
 systemctl start snap.wifi-ap.management-service
 wait_for_systemd_service snap.wifi-ap.management-service
+
+# remove and reinsert the module to refresh all the wifi network settings
+rmmod mac80211_hwsim || true
+modprobe mac80211_hwsim radios=2
+wait_until_interface_is_available wlan0
+wait_until_interface_is_available wlan1
+
+# Wizard should run after snap install
+systemctl restart snap.wifi-ap.automatic-setup
+wait_for_systemd_service_exit snap.wifi-ap.automatic-setup
diff --git a/tests/lib/utilities.sh b/tests/lib/utilities.sh
index 0e4c455..9e2513e 100644
--- a/tests/lib/utilities.sh
+++ b/tests/lib/utilities.sh
@@ -6,3 +6,21 @@ wait_for_systemd_service() {
 	done
 	sleep 1
 }
+
+wait_for_systemd_service_exit() {
+	while systemctl status $1 ; do
+		sleep 1
+	done
+	sleep 1
+}
+
+does_interface_exist() {
+	[ -d /sys/class/net/$1 ]
+}
+
+wait_until_interface_is_available() {
+	while ! does_interface_exist $1; do
+		# Wait for 200ms
+		sleep 0.2
+	done
+}
diff --git a/tests/main/background-process-control/task.yaml b/tests/main/background-process-control/task.yaml
index a1b62fa..58dd047 100644
--- a/tests/main/background-process-control/task.yaml
+++ b/tests/main/background-process-control/task.yaml
@@ -1,27 +1,18 @@
 summary: Test correct service behavior to ensure the background AP process is running
 
 prepare: |
-    # Simulate two WiFi radio network interfaces
-    modprobe mac80211_hwsim radios=2
-
     # We need some tools for scanning etc.
     snap install wireless-tools
     snap connect wireless-tools:network-control core
 
-restore: |
-    rmmod mac80211_hwsim
-
 execute: |
     # Verify first the management service is up and running
     /snap/bin/wifi-ap.config get
-    test "`/snap/bin/wifi-ap.config get disabled`" = true
+    test "`/snap/bin/wifi-ap.config get disabled`" = false
 
     # AP should be not active at this time as still disabled
-    /snap/bin/wifi-ap.status | grep "ap.active: false"
-
-    # Now start the AP and ensure its reported as active
-    /snap/bin/wifi-ap.config set disabled false
     /snap/bin/wifi-ap.status | grep "ap.active: true"
+
     # And if we wait a bit more it should be still active
     sleep 5
     /snap/bin/wifi-ap.status | grep "ap.active: true"
diff --git a/tests/main/conf-wizard-auto-at-boot/task.yaml b/tests/main/conf-wizard-auto-at-boot/task.yaml
new file mode 100644
index 0000000..b042097
--- /dev/null
+++ b/tests/main/conf-wizard-auto-at-boot/task.yaml
@@ -0,0 +1,21 @@
+summary: Verify that the automatic wizard works
+
+execute: |
+    # Check that we get good default values
+    test "$(/snap/bin/wifi-ap.config get disabled)" = false
+
+    test "$(/snap/bin/wifi-ap.config get wifi.interface)" = wlan0
+    test "$(/snap/bin/wifi-ap.config get wifi.security)" = open
+    test "$(/snap/bin/wifi-ap.config get wifi.ssid)" = Ubuntu
+    test "$(/snap/bin/wifi-ap.config get wifi.address)" = 10.0.60.1
+
+    test "$(/snap/bin/wifi-ap.config get dhcp.range-start)" = 10.0.60.2
+    test "$(/snap/bin/wifi-ap.config get dhcp.range-stop)" = 10.0.60.199
+
+    default_route=$(ip route |awk '/default/{print$5}')
+    if [ -n "$default_route" ]; then
+        test "$(/snap/bin/wifi-ap.config get share.disabled)" = false
+        test "$(/snap/bin/wifi-ap.config get share.network-interface)" = "$default_route"
+    else
+        test "$(/snap/bin/wifi-ap.config get share.disabled)" = true
+    fi
diff --git a/tests/main/conf-wizard-auto-nodefaultip/task.yaml b/tests/main/conf-wizard-auto-nodefaultip/task.yaml
index e6d6e06..8be2f75 100644
--- a/tests/main/conf-wizard-auto-nodefaultip/task.yaml
+++ b/tests/main/conf-wizard-auto-nodefaultip/task.yaml
@@ -1,9 +1,6 @@
 summary: Verify that the wizard is able to find an unused IP
 
 prepare: |
-    # Simulate a radio network interfaces
-    modprobe mac80211_hwsim radios=1
-
     # Dummy interface to assign an IP to
     modprobe dummy
 
@@ -12,11 +9,14 @@ prepare: |
     ifconfig dummy0 10.0.48.2/20
 
 restore: |
-    rmmod mac80211_hwsim dummy
+    rmmod dummy
 
 execute: |
-    # Start the automatic wizard, it must fail
-    /snap/bin/wifi-ap.setup-wizard wizard --auto
+    # Free the actual IP
+    ifconfig wlan0 0.0.0.0
+
+    # Start the automatic wizard
+    /snap/bin/wifi-ap.setup-wizard --auto
 
     # Check for assigned IP on subnet 10.0.64.0/24
     test "$(/snap/bin/wifi-ap.config get wifi.address)" = 10.0.64.1
diff --git a/tests/main/conf-wizard-auto-noip/task.yaml b/tests/main/conf-wizard-auto-noip/task.yaml
index 5a0885c..10822e1 100644
--- a/tests/main/conf-wizard-auto-noip/task.yaml
+++ b/tests/main/conf-wizard-auto-noip/task.yaml
@@ -1,9 +1,6 @@
 summary: Verify that wizard fails when all private subnets are busy
 
 prepare: |
-    # Simulate a radio network interfaces
-    modprobe mac80211_hwsim radios=1
-
     # Dummy interface to assign an IP to
     modprobe dummy
 
@@ -11,11 +8,11 @@ prepare: |
     ifconfig dummy0 10.0.0.2/8
 
 restore: |
-    rmmod mac80211_hwsim dummy
+    rmmod dummy
 
 execute: |
     # Start the automatic wizard, it must fail
-    ! /snap/bin/wifi-ap.setup-wizard wizard --auto
+    ! /snap/bin/wifi-ap.setup-wizard --auto
 
     # Check for a descriptive error message
-    /snap/bin/wifi-ap.setup-wizard wizard --auto 2>&1 |grep 'No free netmask found'
+    /snap/bin/wifi-ap.setup-wizard --auto 2>&1 |grep 'No free netmask found'
diff --git a/tests/main/conf-wizard-auto-nowifi/task.yaml b/tests/main/conf-wizard-auto-nowifi/task.yaml
index 18301f1..ce89798 100644
--- a/tests/main/conf-wizard-auto-nowifi/task.yaml
+++ b/tests/main/conf-wizard-auto-nowifi/task.yaml
@@ -1,8 +1,11 @@
 summary: Verify that wizard fails when there are no WiFi devices
 
+prepare: |
+    rmmod mac80211_hwsim
+
 execute: |
     # Start the automatic wizard, it must fail
-    ! /snap/bin/wifi-ap.setup-wizard wizard --auto
+    ! /snap/bin/wifi-ap.setup-wizard --auto
 
     # Check for a descriptive error message
-    /snap/bin/wifi-ap.setup-wizard wizard --auto 2>&1 |grep 'There are no valid wireless network interfaces available'
+    /snap/bin/wifi-ap.setup-wizard --auto 2>&1 |grep 'There are no valid wireless network interfaces available'
diff --git a/tests/main/conf-wizard-auto/task.yaml b/tests/main/conf-wizard-auto/task.yaml
index bdda246..ae6219c 100644
--- a/tests/main/conf-wizard-auto/task.yaml
+++ b/tests/main/conf-wizard-auto/task.yaml
@@ -1,15 +1,7 @@
 summary: Verify that the automatic wizard works
 
-prepare: |
-    # Simulate two WiFi radio network interfaces
-    modprobe mac80211_hwsim radios=2
-
-restore: |
-    rmmod mac80211_hwsim
-
 execute: |
-    # Start the automatic wizard
-    /snap/bin/wifi-ap.setup-wizard wizard --auto
+    # The automatic wizard was already started
 
     # Check that we get good default values
     test "$(/snap/bin/wifi-ap.config get disabled)" = false
diff --git a/tests/main/configuration-changes/task.yaml b/tests/main/configuration-changes/task.yaml
index 07c2e09..61f55a0 100644
--- a/tests/main/configuration-changes/task.yaml
+++ b/tests/main/configuration-changes/task.yaml
@@ -5,10 +5,10 @@ execute: |
     /snap/bin/wifi-ap.config set wifi.interface wlan1
     test "`/snap/bin/wifi-ap.config get wifi.interface`" = "wlan1"
 
-    test `/snap/bin/wifi-ap.config get disabled` = true
-    /snap/bin/wifi-ap.config set disabled false
-    # Verify 'disabled' was safed and change to 'wifi.interface' is still there
     test `/snap/bin/wifi-ap.config get disabled` = false
+    /snap/bin/wifi-ap.config set disabled true
+    # Verify 'disabled' was saved and change to 'wifi.interface' is still there
+    test `/snap/bin/wifi-ap.config get disabled` = true
     test "`/snap/bin/wifi-ap.config get wifi.interface`" = "wlan1"
 
     ! /snap/bin/wifi-ap.config set
diff --git a/tests/main/default-conf-brings-up-ap/task.yaml b/tests/main/default-conf-brings-up-ap/task.yaml
index ed9fcf3..820a695 100644
--- a/tests/main/default-conf-brings-up-ap/task.yaml
+++ b/tests/main/default-conf-brings-up-ap/task.yaml
@@ -1,18 +1,8 @@
 summary: Verify that the default configuration is able to spawn up an AP
 
-prepare: |
-    # Simulate two WiFi radio network interfaces
-    modprobe mac80211_hwsim radios=2
-
-restore: |
-    rmmod mac80211_hwsim
-
 execute: |
     . $TESTSLIB/utilities.sh
 
-    # Default configuration will use wlan0 which we just created
-    /snap/bin/wifi-ap.config set disabled false
-
     snap install wireless-tools
     snap connect wireless-tools:network-control core
 
@@ -35,6 +25,6 @@ execute: |
     # And we should get an IP address assigned over DHCP
     dhclient wlan1
     # IP Address and routing needs to be correct
-    ifconfig wlan1 | fgrep 'inet addr:10.0.60.1'
+    ifconfig wlan1 | fgrep 'inet addr:10.0.60'
     ip route | fgrep '10.0.60.0/24 dev wlan1'
     ip route | fgrep 'default via 10.0.60.1 dev wlan1'
diff --git a/tests/main/stress-ap-status-control/task.yaml b/tests/main/stress-ap-status-control/task.yaml
index 38fe709..83876ff 100644
--- a/tests/main/stress-ap-status-control/task.yaml
+++ b/tests/main/stress-ap-status-control/task.yaml
@@ -5,16 +5,10 @@ environment:
     SCAN_ITERATIONS: 10
 
 prepare: |
-    # Simulate two WiFi radio network interfaces
-    modprobe mac80211_hwsim radios=2
-
     # We need some tools for scanning etc.
     snap install wireless-tools
     snap connect wireless-tools:network-control core
 
-restore: |
-    rmmod mac80211_hwsim
-
 execute: |
     # Bring up the access point first
     /snap/bin/wifi-ap.config set disabled false
diff --git a/tests/main/utf8-ssid/task.yaml b/tests/main/utf8-ssid/task.yaml
index 6d190c6..a9714c3 100644
--- a/tests/main/utf8-ssid/task.yaml
+++ b/tests/main/utf8-ssid/task.yaml
@@ -1,17 +1,8 @@
 summary: Verify that the AP can accept an UTF8 SSID
 
-prepare: |
-    # Simulate two WiFi radio network interfaces
-    modprobe mac80211_hwsim radios=2
-
-restore: |
-    rmmod mac80211_hwsim
-
 execute: |
     . $TESTSLIB/utilities.sh
 
-    wait_for_systemd_service snap.wifi-ap.management-service
-
     # Default configuration will use wlan0 which we just created
     /snap/bin/wifi-ap.config set wifi.ssid 'Ubuntu👍'
     /snap/bin/wifi-ap.config set disabled false