Improve coverage of cadi-core