Change testvar names
Merge pull request #528 from owdqa/feature/refactor_testvars

Change testvar names