Clean up test code for package manager.

Change-Id: Ie5cdd1e97b52bff59c712b6a62ad776b5e469e75
2 files changed