Merge "Increase testing of network connectivity"