Ensure onConnectionInterrupted is called.
Add more discovery tests.
Another discovery test.