Merge "Update tests to ensure WFC mode is set correctly in roaming" into pi-dev