add remaining client tests