Add a WiFi connection to the ConnectivityManager

Also clean up some tests.

Fixes #679

:snail: