adding support to run the specific group(s)
Merge branch 'fix-tests'