BestSelector fix and test