Nightly testing updates.

A set of updates that improves the nightly testing to work when
ssh localhost may not work correctly.