Reduced number of packages for test classes