I'm bumping up the longer test to the 60 seconds I intended to make it.
If this doesn't cure the intermittent buildbot timeouts, I'm going to
turn that test into a warning rather than a failure.