WIP: Added support for ContextNotification - added some related tests