increased timeouts (reverted from commit 456ae3d2a84657528c948baf9bd64ec2903ad691)