Fix install tests
Created by: chuckatkins
Address various issues with the install tests.
Combines #1845 and #1852 Fixes #1842 (closed)
Created by: chuckatkins
Address various issues with the install tests.
Combines #1845 and #1852 Fixes #1842 (closed)