Reconnect to discoverd when the connection drops

I don't like this global, but I can't think of an easy fix. I guess we can fix it if we ever parallelize the tests.