(Notifications) Fixed routing with a couple unit tests