Merge "Improve coverage of cadi-client"