cleanup tests for unused variables

cleanup tests for unused variables