NXP-11551: clean up test contribs