Merge "Fix wireless test:"