Fix broken test cases because of variable renaming in CBN

They are broken because variable names in a CBN are renamed and test framework still uses them to verify values.