Tweak wait duration in waitUntilConnected

Also increased an acceptance test timeout to stabilise the test.