NXP-9060 - fix tests