more package-testing tweaks