Fixed package-safe tests.