diff --git a/lib/components/card/gf_card.dart b/lib/components/card/gf_card.dart
index 351946bf..79b28b26 100644
--- a/lib/components/card/gf_card.dart
+++ b/lib/components/card/gf_card.dart
@@ -115,7 +115,7 @@ class GFCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final CardThemeData cardTheme = CardTheme.of(context);
+    final CardTheme cardTheme = CardTheme.of(context);
 
     final Widget cardChild = Padding(
       padding: padding,
diff --git a/test/components/badge/gf_badge_test.dart b/test/components/badge/gf_badge_test.dart
new file mode 100644
index 00000000..05e286af
--- /dev/null
+++ b/test/components/badge/gf_badge_test.dart
@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:getwidget/getwidget.dart';
+
+void main() {
+  testWidgets('GFBadge displays text when text is provided', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: GFBadge(
+            text: 'Test Badge',
+          ),
+        ),
+      ),
+    );
+
+    expect(find.text('Test Badge'), findsOneWidget);
+  });
+
+  testWidgets('GFBadge displays child widget when no text is provided', (WidgetTester tester) async {
+    final childKey = Key('child_key');
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: GFBadge(
+            child: Container(key: childKey),
+          ),
+        ),
+      ),
+    );
+
+    expect(find.byKey(childKey), findsOneWidget);
+  });
+
+  testWidgets('GFBadge uses default size and color properties', (WidgetTester tester) async {
+    await tester.pumpWidget(
+      MaterialApp(
+        home: Scaffold(
+          body: GFBadge(
+            text: 'Default',
+          ),
+        ),
+      ),
+    );
+
+    final badge = tester.widget<GFBadge>(find.byType(GFBadge));
+    expect(badge.color, GFColors.DANGER);
+    expect(badge.size, GFSize.SMALL);
+  });
+}