Adjust test timeouts per comments on commit 094d84f.
Merge branch 'master' into banguero/testsaucelabs-runut