Client fix tests