Snapshot tests are taking too long; rebase our fork on the latest, which is compatible with xdist. Will require a bunch of changes.