Fixeb bug

Test handshake with new functions.