Merge "Check that wifi, cell validates before tests" into main