increased timeouts
(cherry picked from commit 47a6ec4)