Change database clients to return one value and update tests

Partially implements: blueprint clients-return-one-value

Change-Id: I132115b8e9ec3859469a2b502f862c9270b17884
6 files changed