Minimized the number of packages in test folder