Merge "Move @group and @covers tags in tests close to class"