NXP-13471: Try to fix tests