Merge pull request #10090 from nupplaphil/feat/install_testrewrite