Make max_tries / wait_time accessible-
Extended tests.