Regression fixes in uninstall.
Removed test key file.