NXP-14007 reorganize and complete tests