Merge pull request #3069 from AndrzejKurek/handshake-tests-refactor

Handshake tests refactor