Add client, and simple test.