This should fix [1] when finished (43 fixed, 2 tests remains to fix)
[1] https://jenkins.softwareheritage.org/job/DCIDX/job/tests/1063/console
I'm not done yet as I don't see what needs fixing yet. Well, I know it's only
test data since that's about the only change happening in there.