Fixing client/server test