Enhance the server for connectivity test