add features to handshake and test