NXP-15315 fixup tests