Clean up connectivity tests.

Change-Id: I407cb78aecb43aa8413835a25b4558241d69fd2e
9 files changed