More notification unit tests

This is to support future refactoring. The current implementation has
sections of code that were completely not tested and has tests that are
very tightly coupled to the implementation.

Change-Id: I3d8d744005ba9006cefbc0feb740cc2662f57146
Merge "More notification unit tests"