Refining tests to be more helpful

Especially if we're getting nasty connection errors