Merge "Change database clients to return one value and update tests"