[2.1-devel 4/7] Update examples and test cases for changes from isolating installer code.