NXP-14312: add missing contribution and fix test