I don't know what other tests are assuming, and not all unit tests are passing. I'll add a TODO.