Adjust ComputeClient & tests to compute v2