Fix the entity_message_test