Tweak ConnectException detection for provision.startTimeout
Improve test name
Fix TODO