Make package name test more general.