Fix tests, we need proper groups soon.