Adding unit test for empty HandshakeKey bug
Adding support for SubFields