Increased the default test timeout.
Merge pull request #857 from nanek/increase-test-timeout

Increased the default test timeout.