Adding client tests