Merge both DefaultHandshakeTest classes