Added tests for the evaluator