Improving tests.
Merge branch 'master' of github.com:blakeembrey/notification

* 'master' of github.com:blakeembrey/notification:
  Merge conflict