Change short timeouts to standard

This is needed for running tests on slow-ish EC2 small instance.