More fixes to tests using timeouts.

Hopefully the last fixes???