Added test_evaluate_*