Add client tests. Make tests configurable.