Merge "Add tests for NotificationGutsManager"