Fixing client test code