Fix tests, at least locally.