Extend test suite to cover evaluation.