Refactor testvars to include groups and recapitalize names