Improves coverage of critical codepath (incl. invalid handshake)
Improves testing workflow