Action should triggered by Action, No totification
Update notifications
fix tests after refactoring