fix tests (message_id field added to every message)