Merge "Change basic server client methods to return one value and update tests"