Fix translation() usage
Add GroupHelper to group activities more logical
Fix tests again