Change tests setup
Add groups classes