Clean test suite to conform to other functional tests
Merge branch 'muktaa-oc-8526-group-provider-windows' of https://github.com/ClogenyTechnologies/chef into muktaa-oc-8526-group-provider-windows

Conflicts: