Remove -s option from vcollect
Remove -s option from testpkgctrl