finished e2e test for handshake with same identity
Merge remote-tracking branch 'origin/feature-handshake-rework' into feature-handshake-rework
fixes
Merged 'dev'.
Finish handshake-rework