Merge "Change orchestration client to return one value and update tests"