Update evaluate function.
Update tests.