fix merge typo for disk_spec
Revert "exclude some test for warden-cpi"

This reverts commit e22eaaf3b1f9b32d0e88e5376419f70d87709026.