Refactor the double-testing-install attempt under travis

Should be no functional changes, just shuffling to get everything
to run under run_or_err
Throwaway