Merge "ConnectivityCoverageTests refactoring"