Cleanup unused test variables

Cleanup unused test variables