Fix tests broken in e708c07