Merge "Moving test related to Uninstalling and removing to their own class" into main