allow optional timeout message
increase timeout
increase timeouts; make tests more repeatable