Split out non-deterministic tests.
Tidy.