Merge "Fix NotificationGuts tests"