Hotfix for failed codereview tests. Related to test grouping