Merge "Improve coverage of cadi-aaf"