Reinstated client tests