test and fix two shortcomings in evaluate_2