NXP-14278: fix some unit tests