Re #8882. Speed up a test that was surely doing more than it needed to.
Re #8882. Unfortunately, it appears that we can't have a timeout.

It turns out that we currently only set a timeout on Linux builds.
If we have it globally, some tests time out on both Mac & Windows.