Update to Package.onUse and Package.onTest