Removed notification test
Changed data source
Merge remote-tracking branch 'origin/master'