Fix tests
Merge remote-tracking branch 'origin/fix_log_event_notification'