[Enhancement] Better message event mock

Removing the old mock message object for a more accurate mock object.