Start on downstream LDM-7 & improve check for CUnit package