[Changed] notification manager refactoring +  unit test