Make a mock listener and test using it
Expand the handshake test