Fixed handshake error
Tests