Fix broken notifications, add test.