Merge "Test updates for ECS, PMS and SDNC"