ncm-cdp: Hotfix for failing cdp unittest using new buildtools