Add client tests
Update doc
Style tweak