Added handling for Windows connectivity test