Evaluate in machine; refactor Evaluate tests