Fix unittest for new Message Format