Breaking tests into smaller packages and grouping