Make SSVM and CPVM test behave the same
Make SSVM and CPVM test behave the same

MissionCriticalCloud/cosmic,MissionCriticalCloud/cosmic,MissionCriticalCloud/cosmic,MissionCriticalCloud/cosmic,MissionCriticalCloud/cosmic