beautify imports
Merge pull request #76 from wongak/notification_logic

Reworking test fixtures, Notification logic
Merge remote-tracking branch 'upstream/master' into web_tests