Fix tests after a39a969e51