NXP-12244: fix tests in backport