Fix client with passing tests