Reverted some half-formed crap and made tests deterministic.
This reverts commit 873b96200bc04c39a93702dadab8bb58489e372c.
Well, let's just run these tests.