Fix broken cell evaluator tests