Fix tests broken by commit 257a368a14a7f6510280c0742e9e36fa6c18b214