Change flavors client to return one value and update tests

Partially implements: blueprint clients-return-one-value

Change-Id: I9476bb501d9a0d00f76d83f86540be44f4383c8e
16 files changed