Updated the system-package test scripts to be a little more teting friendly.