Cleanup tests for unused variables

Cleanup tests for unused variables