Merge "Assert fixed test method count in ConnectivityServiceTest" into main