Fix frequency evaluator: fix tests