Merge pull request #714 from CanineHQ/feature/test-notification-feedback