NEXUS-5511: Fixed broken messages.

Messages in two INFEx were constructed wrong.
Also, UT expectations fixed, aligned with actual message.