Merge "Mock connectivity resources in integration tests"