Fixed insufficient test isolation when overriding services.
Moved package build to PackageManager.