Fixed UnitTests after change to Message-Id/Content-Id semantics