fixed notifactions
fixed test
Merge pull request #1185 from xliiv/notification-fix

fixed notifactions