Try to support timeouts, as in the spec.

Unfuck tests in the process.