Add missing tests to DefaultHandshakeTest