API-2659 savepoint: tests working, but order dep.

Seriously, no idea what state is leaking. A lot is, but I'm not sure at
the point what, specifically, is causing the problem.
Run with `TESTOPTS="--seed=15207` and everythink is ok. Other seeds have
random failures