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