FS-1 FS-2: Fix in ClientTest