Revert "fix"

This reverts commit 404a80268adef8935a6f057481cb5191d456d4f8.
Revert "p1"

This reverts commit af985151588c77ec6677960b7ae62f5b23284108.
Revert "u2"

This reverts commit b7194a8111ec66c67f7cc69f2411146687a58945.
Revert "update software manager test"

This reverts commit 79f6cd7efcc42c3bdcad94fea59079aec3af2d88.