New unit test to help ensure uninstall code is accurate
Fixes to make the clean_reinstall test pass