improve tests and timeout providers