Added evaluator and tests.