Unit test fix and new notification settings