Added more client tests.