fix evaluation functions to evaluate objects, update tests