evaluator done + tests