Update ClientTest for changes in interface