NXP-12404 fix tests