Merge old evaluate into new evaluate function and doing mocking test