Merge pull request #9611 from choudhuryanupam/master

Refactored test case with standard variable names
Removed unnecessary lines