More testing package tweaks.