Add notification handling for uninstallation.
Fix up tests