Fix best-first tests