Updated the Notification client according to the changed api.

Added a test.