Fix failing cdp unittest with new buildtools