made handshake test more complete