Fix ugly mistakes when refactoring (there is some test coverage missing in notifications)
Fix ugly mistakes when refactoring (there is some test coverage missing in notifications)

labianchin/WatchMen,NotyIm/WatchMen,iloire/WatchMen,plyo/watchmen,NotyIm/WatchMen,labianchin/WatchMen,antoligy/WatchMen,labianchin/WatchMen,ravi/watchmen,corinis/watchmen,Cellington1/Status,iloire/WatchMen,antoligy/WatchMen,ravi/watchmen,corinis/watchmen,plyo/watchmen,plyo/watchmen,iloire/WatchMen,Cellington1/Status,ravi/watchmen,corinis/watchmen,NotyIm/WatchMen,Cellington1/Status