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