Completely replace client.exchange.Handshake
Merge both DefaultHandshakeTest classes