connectivity test fixes