Client improved

for the tests