Added ExpressionEvaluatorAndTestClass