Fix test broken during merge