Merge "Expand test coverage for disconnect during connect."