More tweaks to package tests

This makes package tests work better on CentOS 5, and also adds a 32-bit
target for Ubuntu.