Merge "Improve coverage of cadi-core"