Merge "Add connectivity coverage tests"