Evaluator added
Tests added