Improve coverage of Cadi