Merge "Extract test utilities for ConnectivityService"