diff --git a/deku-p/src/core/block_storage/block_storage.mli b/deku-p/src/core/block_storage/block_storage.mli
index 534889d05..18c869c5b 100644
--- a/deku-p/src/core/block_storage/block_storage.mli
+++ b/deku-p/src/core/block_storage/block_storage.mli
@@ -3,7 +3,9 @@ open Deku_concepts
 open Deku_consensus
 open Deku_gossip
 
-type storage
+type storage = private
+  | Storage of { worker : Parallel.Worker.t; pool : Query.pool }
+
 type t = storage
 
 val make : worker:Parallel.Worker.t -> uri:Uri.t -> storage
diff --git a/deku-p/src/core/block_storage/tests/block_storage_tests.ml b/deku-p/src/core/block_storage/tests/block_storage_tests.ml
new file mode 100644
index 000000000..babe2c3dc
--- /dev/null
+++ b/deku-p/src/core/block_storage/tests/block_storage_tests.ml
@@ -0,0 +1,85 @@
+open Deku_stdlib
+open Deku_crypto
+open Deku_consensus
+open Deku_concepts
+
+exception Test_finished
+
+let block_testable = Alcotest.testable Block.pp Block.equal
+
+let identity =
+  let secret = Ed25519.Secret.generate () in
+  let secret = Secret.Ed25519 secret in
+  Identity.make secret
+
+let block ~default_block_size =
+  let above = Genesis.block in
+  let withdrawal_handles_hash = BLAKE2b.hash "potato" in
+  let producer = Producer.empty in
+  Producer.produce ~identity ~default_block_size ~above ~withdrawal_handles_hash
+    producer
+
+let file_hash =
+  let randn = Stdlib.Random.int 230 in
+  Deku_crypto.BLAKE2b.hash (Int.to_string randn) |> BLAKE2b.to_hex
+
+(* TODO: change to an in-memory databse *)
+let uri = Uri.of_string (Format.sprintf "sqlite3:/tmp/%s.db" file_hash)
+
+let make_block_storage env sw =
+  let domains = Eio.Stdenv.domain_mgr env in
+  let worker = Parallel.Worker.make ~domains ~sw in
+  let storage = Deku_block_storage.Block_storage.make ~worker ~uri in
+  storage
+
+let test_empty_block_load env () =
+  try
+    Eio.Switch.run @@ fun sw ->
+    let block_storage = make_block_storage env sw in
+    let (Block { hash; level; _ } as block) = block ~default_block_size:0 in
+    Deku_block_storage.Block_storage.save_block ~block block_storage;
+    let retrieved_block =
+      match
+        Deku_block_storage.Block_storage.find_block_by_hash ~block_hash:hash
+          block_storage
+      with
+      | Some block -> block
+      | None -> Genesis.block
+    in
+    Alcotest.(check' block_testable)
+      ~msg:"hash loaded block is not equal to saved block" ~expected:block
+      ~actual:retrieved_block;
+    let retrieved_block =
+      match
+        Deku_block_storage.Block_storage.find_block_by_level ~level
+          block_storage
+      with
+      | Some block -> block
+      | None -> Genesis.block
+    in
+
+    Alcotest.(check' block_testable)
+      ~msg:"level loaded block is equal to saved block" ~expected:block
+      ~actual:retrieved_block;
+
+    Eio.Switch.fail sw Test_finished
+  with _ -> ()
+
+let run () =
+  Eio_main.run (fun env ->
+      let open Alcotest in
+      run "Block_storage" ~and_exit:false
+        [
+          ( "simple",
+            [
+              test_case "empty_block is returned" `Quick
+                (test_empty_block_load env);
+            ] );
+        ])
+
+let () = run ()
+
+(* TODO: Tests
+   try all combinations of what's in the block_storage.mli. Use it with different block sizes, do it in parallel, try reading and writing at the same time, try reading a query that doesn't exist
+   try reading something right before you write it and vice versa,
+   try reading or writing two things at once *)
diff --git a/deku-p/src/core/block_storage/tests/dune b/deku-p/src/core/block_storage/tests/dune
new file mode 100644
index 000000000..9072010c6
--- /dev/null
+++ b/deku-p/src/core/block_storage/tests/dune
@@ -0,0 +1,16 @@
+(executable
+ (name block_storage_tests)
+ (libraries
+  deku_block_storage
+  deku_crypto
+  deku_protocol
+  deku_stdlib
+  alcotest
+  deku_consensus))
+
+(rule
+ (alias runtest)
+ (deps
+  (:exe ./block_storage_tests.exe))
+ (action
+  (run %{exe})))