Moved _monitor_message and _compute_update_message code and tests to MonitorNotification and ComputeUpdateNotification