NXP-14931 improve impl+tests