Merge "Cleanup and refine connectivity test config"