NXP-14931 use bootstrap of the bundle for unit test and change granularity