Fix test broken by merge