Fixes handshake test behaviour
Release 0.2.0-1