Test cleanup

A bunch of test cleanup and consolidation. Most importantly this tries to quiet down the expected messages in the tests, so we can see what's really failing in our CI (for example).

One thing that's not yet quietted down is the messages that look this:

```
Warning: Permanently added '[localhost]:53032' (RSA) to the list of known hosts.
```

The libssh work should take care of that.