Added missing @group annotations in tests