Stop using sleep, and increase timeout for connection validator

Signed-off-by: Ken Barber <ken@bob.sh>