Improved testing/javadoc/argument-checking for the ClientService