Fixt test broken during merge, per Luca.