Merge "Move ConnectivityCoverageTests to general-tests"