remove method and use new evaluator in tests