Fix @group annotations of tests