Implement unregister_notification

Fixed tests per requests, trying to keep my branches clean to enable rebasing