Merge "Clean up connectivity tests." into lmp-dev