Cleanup tests for unused variables
Merge pull request #9657 from vipulnsward/cleanup_tests

Cleanup tests for unused variables