fixing some tests in uninstall following refactor