Add test for reinstall and fix other tests
This refs affinitic #5731