Hotfix for failed codereview tests. Related to test grouping

One hidden bad method was also fixed.