Merge "Change compute volume client to return one value and update tests"