Improve coverage of Cadi/client