Fix: tests with FlexibleCriterion