Fix WIFI tests for 2.1