Fix CMPv2 test cases after pnf-simulator changes