Adjust test timeouts per comments on commit 094d84f.