Add stub handshake validation