adding code to support test groups