merge client tests