Merge "CSIT tests for SO vCPE/OOF/HPA"