NXP-12479 refactor tests