Merge "Adapt package installer tests for watch"