Fix broken test cases because variable renaming