NXP-16211: fix tests