Increased timeouts. Hopefully less flaky