Refactor testvars to include groups and recapitalize names
Merge pull request #534 from owdqa/feature/refactor_testvars

Refactor testvars to include groups and recapitalize names