Change messaging clients to return one value and update tests

Partially implements: blueprint clients-return-one-value

Change-Id: I5ec5b7e951344d86b5d8f1c653ee7d9430221c0b
5 files changed