diff --git a/lib/components/badge/gf_button_badge.dart b/lib/components/badge/gf_button_badge.dart
index 53f0a9e0..291c1b47 100644
--- a/lib/components/badge/gf_button_badge.dart
+++ b/lib/components/badge/gf_button_badge.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:getwidget/getwidget.dart';
 
-class GFButtonBadge extends StatefulWidget {
+class GFBadgeButton extends StatefulWidget {
   /// Create badges badges of all types. check out [GFIconButton] for icon badges, and [GFBadge] for badges
-  const GFButtonBadge({
+  const GFBadgeButton({
     Key? key,
     required this.onPressed,
     this.onHighlightChanged,
@@ -214,10 +214,10 @@ class GFButtonBadge extends StatefulWidget {
   final Widget? icon;
 
   @override
-  _GFButtonBadgeState createState() => _GFButtonBadgeState();
+  _GFBadgeButtonState createState() => _GFBadgeButtonState();
 }
 
-class _GFButtonBadgeState extends State<GFButtonBadge> {
+class _GFBadgeButtonState extends State<GFBadgeButton> {
   @override
   Widget build(BuildContext context) => ConstrainedBox(
         constraints: const BoxConstraints(
diff --git a/lib/components/badge/gf_icon_badge.dart b/lib/components/badge/gf_icon_badge.dart
index fad1225c..f6e6fbaf 100644
--- a/lib/components/badge/gf_icon_badge.dart
+++ b/lib/components/badge/gf_icon_badge.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:getwidget/getwidget.dart';
 
-class GFIconBadge extends StatefulWidget {
+class GFBadgeIcon extends StatefulWidget {
   /// Create badges of all types, check out [GFBadge] for button badges and [GFIconBadge] for icon badges.
   const GFIconBadge(
       {Key? key,
diff --git a/test/components/badge/gf_badge_test.dart b/test/components/badge/gf_badge_test.dart
index 05e286af..19f03c1a 100644
--- a/test/components/badge/gf_badge_test.dart
+++ b/test/components/badge/gf_badge_test.dart
@@ -7,9 +7,7 @@ void main() {
     await tester.pumpWidget(
       MaterialApp(
         home: Scaffold(
-          body: GFBadge(
-            text: 'Test Badge',
-          ),
+          body: GFBadge(text: 'Test Badge'),
         ),
       ),
     );
diff --git a/test/components/badge/gf_button_badge_test.dart b/test/components/badge/gf_button_badge_test.dart
new file mode 100644
index 00000000..ee64c13a
--- /dev/null
+++ b/test/components/badge/gf_button_badge_test.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:getwidget/components/badge/gf_button_badge.dart';
+
+void main() {
+  testWidgets('GFBadgeButton displays text when provided', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: GFBadgeButton(text: 'Button Badge', onPressed: () {}),
+        ),
+      ),
+    );
+    expect(find.text('Button Badge'), findsOneWidget);
+  });
+
+  testWidgets('GFBadgeButton displays child widget when no text is provided', (WidgetTester tester) async {
+    final childKey = Key('child_key');
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: GFBadgeButton(icon: Container(key: childKey), onPressed: () {}),
+        ),
+      ),
+    );
+    expect(find.byKey(childKey), findsOneWidget);
+  });
+}
diff --git a/test/components/badge/gf_icon_badge_test.dart b/test/components/badge/gf_icon_badge_test.dart
new file mode 100644
index 00000000..19d073ec
--- /dev/null
+++ b/test/components/badge/gf_icon_badge_test.dart
@@ -0,0 +1,27 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:getwidget/getwidget.dart';
+
+void main() {
+  testWidgets('GFIconBadge displays an icon when provided', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: GFIconBadge(child: Icon(Icons.star), counterChild: Container()),
+        ),
+      ),
+    );
+    expect(find.byIcon(Icons.star), findsOneWidget);
+  });
+
+  testWidgets('GFIconBadge displays an icon with default properties', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: GFIconBadge(child: Icon(Icons.favorite), counterChild: Container()),
+        ),
+      ),
+    );
+    expect(find.byIcon(Icons.favorite), findsOneWidget);
+  });
+}