Merged in forgotten changes from wifidb-test branch