Merge "Add Notification Flag behavior test"