Added support for test groups