Removed duplicating tests in package-safe and unsafe builds.