diff --git a/packages/example/lib/main.dart b/packages/example/lib/main.dart
index b507bf3..2908610 100644
--- a/packages/example/lib/main.dart
+++ b/packages/example/lib/main.dart
@@ -18,6 +18,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return QueryBowlScope(
       child: MaterialApp(
+        // showPerformanceOverlay: true,
         title: 'Flutter Demo',
         theme: ThemeData(
           useMaterial3: true,
diff --git a/packages/fl_query/lib/query.dart b/packages/fl_query/lib/query.dart
index 94aad84..c70f801 100644
--- a/packages/fl_query/lib/query.dart
+++ b/packages/fl_query/lib/query.dart
@@ -211,7 +211,7 @@ class Query<T extends Object, Outside> extends ChangeNotifier {
   ///
   /// Every time a new instance of data should be returned because of
   /// immutability
-  update(FutureOr<T> Function(T? data) updateFn) async {
+  setQueryData(FutureOr<T> Function(T? data) updateFn) async {
     final newData = await updateFn(data);
     if (data == newData) {
       // TODO: Better Error handling & Error structure
diff --git a/packages/fl_query/pubspec.yaml b/packages/fl_query/pubspec.yaml
index 1fecce2..182f522 100644
--- a/packages/fl_query/pubspec.yaml
+++ b/packages/fl_query/pubspec.yaml
@@ -17,6 +17,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   flutter_lints: ^2.0.0
+  mocktail: ^0.3.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
diff --git a/packages/fl_query/test/query_test.dart b/packages/fl_query/test/query_test.dart
new file mode 100644
index 0000000..fdc1bc7
--- /dev/null
+++ b/packages/fl_query/test/query_test.dart
@@ -0,0 +1,77 @@
+import 'dart:math';
+
+import 'package:fl_query/models/query_job.dart';
+import 'package:fl_query/query.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:mocktail/mocktail.dart';
+
+class MockQueryJob extends Mock implements QueryJob {}
+
+void main() {
+  // for testing query without external data
+  late Query query;
+  late QueryJob queryJob;
+  setUp(() {
+    queryJob = MockQueryJob();
+    when(() => queryJob.queryKey).thenReturn("test");
+    when(() => queryJob.task("test", null))
+        .thenAnswer((_) => (_, __) => "test");
+    query = Query.fromOptions(
+      queryJob,
+      externalData: null,
+    );
+  });
+
+  group("Query Test", () {
+    test("default values", () {
+      expect(query.enabled, isTrue);
+      expect(query.refetchCount, 0);
+      expect(query.retries, 3);
+      expect(query.retryAttempts, 0);
+      expect(query.fetched, isFalse);
+      expect(query.retryDelay, Duration(milliseconds: 200));
+      expect(query.status, QueryStatus.pending);
+      expect(query.isStale, isFalse);
+      expect(query.isIdle, isFalse);
+      expect(query.isInactive, isTrue);
+      expect(query.isLoading, isTrue);
+      expect(query.isSucceeded, isFalse);
+      expect(query.hasError, isFalse);
+      expect(query.hasData, isFalse);
+    });
+
+    test("calling fetch for the first time runs the _execute method", () async {
+      final data = await query.fetch();
+
+      expect(data, "test");
+      expect(query.fetched, isTrue);
+      verify(() => queryJob.task("test", null)).called(1);
+    });
+
+    test(
+        "calling fetch twice or more should return same data where _execute gets called once",
+        () async {
+      final data1 = await query.fetch();
+      final data2 = await query.fetch();
+
+      await query.fetch();
+      await query.fetch();
+      expect(data1, data2);
+      verify(() => queryJob.task("test", null)).called(1);
+    });
+
+    test('calling refetch should return new data', () async {
+      reset(queryJob);
+      when(() => queryJob.queryKey).thenReturn("test-1");
+      when(() => queryJob.task("test-1", null)).thenAnswer((_) => (_, __) {
+            return Future.value(Random().nextInt(100).toString());
+          });
+      final data = await query.fetch();
+      await Future.delayed(Duration(milliseconds: 100));
+      final refetchData = await query.refetch();
+
+      expect(data, isNot(equals(refetchData)));
+      verify(() => queryJob.task("test-1", null)).called(2);
+    });
+  });
+}