Remove irrelevant unittests.
Merge remote-tracking branch 'origin/container_package'