Improve tree_evaluator tests and functions