Fixed Client tests