Try and fix flaky junit test that has a race with a connection timing out