Fix tests broken by commit 2e1b26effa721324a77873c38e4173bf8200e219