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