complete rework of e2e tests for handshake, added some data-qas