Add some Client tests