Updated auto-uninstall with tests