diff --git a/devtools/git-gas-diff/bin/main.ml b/devtools/git-gas-diff/bin/main.ml
index d6e687237ee46975b56f9b3c682f7b8552b1708b..bc19fc75cd6e63918fa7ada37845f0bfead270dd 100644
--- a/devtools/git-gas-diff/bin/main.ml
+++ b/devtools/git-gas-diff/bin/main.ml
@@ -70,8 +70,6 @@ module Decimal = struct
     include Big_int
 
     let ( * ) = mult_big_int
-
-    let ( + ) = add_big_int
   end
 
   (* A decimal is represented by its value without decimals (an integer), and
@@ -82,8 +80,6 @@ module Decimal = struct
 
   let zero = of_int 0
 
-  let one = of_int 1
-
   (* [scale r1 r2] returns a triple [(r1', r2', decimals)] where [r1'] (resp.
      [r2']) is mathematically equal to [r1] ([r2]), and [r1'] and [r2'] have
      the same number of decimals ([decimals]). It's just about adding the right
@@ -109,14 +105,6 @@ module Decimal = struct
 
   let sub r1 r2 = add r1 (opp r2)
 
-  let mul r1 r2 =
-    let {value = value1; decimals = decimals1} = r1 in
-    let {value = value2; decimals = decimals2} = r2 in
-    {
-      value = Big_int.mult_big_int value1 value2;
-      decimals = decimals1 + decimals2;
-    }
-
   let ge r1 r2 =
     let value1, value2, _decimals = scale r1 r2 in
     Big_int.ge_big_int value1 value2
@@ -154,14 +142,8 @@ module Decimal = struct
 
   let ( - ) = sub
 
-  let ( * ) = mul
-
   let ( >= ) = ge
 
-  let ( > ) = gt
-
-  let max r1 r2 = if r1 >= r2 then r1 else r2
-
   (* [pct v ref_v] returns the percentage represented by [v] with regards to the
      reference value [ref_v], close to the lower percent. *)
   let pct v ref_v =
diff --git a/src/lib_error_monad/test/test_splitted_error_encoding.ml b/src/lib_error_monad/test/test_splitted_error_encoding.ml
index d32505c59bd9032481904e2a751a2f50ddad102b..4160c77b98106ae313b0c5f70fe6c8dae677de04 100644
--- a/src/lib_error_monad/test/test_splitted_error_encoding.ml
+++ b/src/lib_error_monad/test/test_splitted_error_encoding.ml
@@ -40,8 +40,6 @@ let splitted_error_encoding =
 
 type error += Foo
 
-let msg error = Obj.Extension_constructor.(name @@ of_val error)
-
 let test_unregistered_binary () =
   (* The error was declared but not registered so we expect all encoding
      attempts to fail. *)
diff --git a/src/lib_lwt_result_stdlib/test/test_list_basic.ml b/src/lib_lwt_result_stdlib/test/test_list_basic.ml
index d2d35582293c6fb009157e2cdea83559273e6968..edef3dc5c4560fba3ea538a6da4588d2c3a4103c 100644
--- a/src/lib_lwt_result_stdlib/test/test_list_basic.ml
+++ b/src/lib_lwt_result_stdlib/test/test_list_basic.ml
@@ -23,28 +23,6 @@
 (*                                                                           *)
 (*****************************************************************************)
 
-open Support.Lib.Monad
-
-let assert_eq_s pa pb =
-  let open Lwt_syntax in
-  let* a = pa and* b = pb in
-  assert (a = b) ;
-  return_unit
-
-let assert_err e = e = Error ()
-
-let assert_err_s e =
-  let open Lwt_syntax in
-  let* e = e in
-  assert (e = Error ()) ;
-  return_unit
-
-let assert_err_p e =
-  let open Lwt_syntax in
-  let* e = e in
-  assert (e = Error (Support.Test_trace.make ())) ;
-  return_unit
-
 module ListGen = struct
   include Support.Lib.List
 
diff --git a/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml b/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml
index 142fa3c6e1e273bd4173c6321ab496a239c9e026..1b3c7ced05a6f87024cecab27ddb95d8b1040fc1 100644
--- a/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml
+++ b/src/lib_lwt_result_stdlib/test/test_list_basic_lwt.ml
@@ -48,8 +48,6 @@ let assert_err_p e =
 module ListGen = struct
   include Support.Lib.List
 
-  let rec down n : int t = if n < 0 then [] else n :: down (pred n)
-
   let rec up n i : int t = if i > n then [] else i :: up n (succ i)
 
   let up n = up n 0
diff --git a/src/lib_stdlib/test/test_hash_queue.ml b/src/lib_stdlib/test/test_hash_queue.ml
index 9e4d274a2abcbf2151a5a3499e28d6965beb1ece..d3df30308acd6a267052aa87e162fd3bd1c04bcf 100644
--- a/src/lib_stdlib/test/test_hash_queue.ml
+++ b/src/lib_stdlib/test/test_hash_queue.ml
@@ -61,11 +61,6 @@ let init_queue capacity n =
   add_multiple_values q vs ;
   q
 
-let string_of_opt_int = function None -> "None" | Some i -> string_of_int i
-
-let string_of_int_list l =
-  Printf.sprintf "[%s]" @@ (List.map string_of_int l |> String.concat ";")
-
 let test_create () =
   let q = Queue.create 10 in
   Assert.Int.equal ~loc:__LOC__ 10 (Queue.capacity q)
@@ -198,6 +193,7 @@ let () =
         [
           ("capacity (create n) = n", `Quick, test_create);
           ("replace", `Quick, test_replace);
+          ("replace_incr_length", `Quick, test_replace_incr_length);
           ("replace_existing", `Quick, test_replace_existing);
           ("peek", `Quick, test_peek);
           ("peek_empty", `Quick, test_peek_empty);
diff --git a/src/lib_store/test/test.ml b/src/lib_store/test/test.ml
index a9ddf857af869d4f9204f555f55e814c0df26a8e..278a05bcc804bcecb437cf01e98777d0e59a581f 100644
--- a/src/lib_store/test/test.ml
+++ b/src/lib_store/test/test.ml
@@ -25,18 +25,6 @@
 
 module Assert = Lib_test.Assert
 
-let equal_block ?msg st1 st2 =
-  let eq st1 st2 = Block_header.equal st1 st2 in
-  let pp ppf st =
-    Format.fprintf
-      ppf
-      "%a (%ld)"
-      Block_hash.pp
-      (Block_header.hash st)
-      st.shell.level
-  in
-  Assert.equal ?msg ~pp ~eq st1 st2
-
 let () =
   let speed =
     try
diff --git a/src/proto_012_Psithaca/lib_benchmark/test/test_distribution.ml b/src/proto_012_Psithaca/lib_benchmark/test/test_distribution.ml
index 53f0df75819198d2e3b5de67016ed35c5753e24f..c78a0174083f0b267ff481c04c8845bdfa8326b3 100644
--- a/src/proto_012_Psithaca/lib_benchmark/test/test_distribution.ml
+++ b/src/proto_012_Psithaca/lib_benchmark/test/test_distribution.ml
@@ -40,8 +40,6 @@ let pp_type_name fmtr (t : type_name) =
 module Type_name = struct
   type t = type_name
 
-  let compare (x : t) (y : t) = Stdlib.compare x y
-
   let equal (x : t) (y : t) = x = y
 
   let pp = pp_type_name
diff --git a/src/proto_012_Psithaca/lib_plugin/test/test_consensus_filter.ml b/src/proto_012_Psithaca/lib_plugin/test/test_consensus_filter.ml
index 06ab92ad884b1e3095f5cb6aa7fcea1a04fdf96c..3011feeb6470cef8659be11428ae1094f962b3b0 100644
--- a/src/proto_012_Psithaca/lib_plugin/test/test_consensus_filter.ml
+++ b/src/proto_012_Psithaca/lib_plugin/test/test_consensus_filter.ml
@@ -28,21 +28,8 @@ open Plugin.Mempool
 open Alpha_context
 open Test_utils
 
-type Environment.Error_monad.error += Generation_failure
-
 (** {2. Conversion helpers} *)
 
-let int32_of_timestamp ts =
-  let i64 = Timestamp.to_seconds ts in
-  let i32 = Int64.to_int32 i64 in
-  if Int64.(equal (of_int32 i32) i64) then Ok i32
-  else Environment.Error_monad.error Generation_failure
-
-let int32_of_timestamp_exn ts =
-  match int32_of_timestamp ts with
-  | Ok i32 -> i32
-  | Error _err -> Stdlib.failwith "int32_of_timestamp_exn: number too big"
-
 let timestamp_of_int32 ts = Timestamp.of_seconds (Int64.of_int32 ts)
 
 (** Data Generators *)
@@ -65,8 +52,6 @@ module Generator = struct
 
   let of_result = Result.value_f ~default:(fun _ -> assert false)
 
-  let print_int32 ?prefix ?suffix () = decorate ?prefix ?suffix Int32.to_string
-
   let small_nat_32 =
     let+ small_nat = small_nat in
     Int32.of_int small_nat
@@ -75,9 +60,6 @@ module Generator = struct
     let+ small_signed_int = small_signed_int in
     Int32.of_int small_signed_int
 
-  let print_small_nat ?prefix ?suffix () =
-    decorate ?prefix ?suffix string_of_int
-
   let dup gen =
     let+ x = gen in
     (x, x)
@@ -109,18 +91,6 @@ module Generator = struct
     timestamp_of_int32 i |> fun ts1 ->
     timestamp_of_int32 Int32.(add i diff) |> fun ts2 -> (ts1, ts2)
 
-  let dummy_timestamp =
-    match Timestamp.of_seconds_string "0" with
-    | Some ts -> ts
-    | _ -> assert false
-
-  let unsafe_sub ts1 ts2 =
-    Int64.to_int @@ Period.to_seconds
-    @@
-    match Timestamp.(ts1 -? ts2) with
-    | Ok diff -> diff
-    | Error _ -> assert false
-
   let successive_timestamp =
     let+ ts, (diff : int) = pair timestamp small_nat in
     let x =
diff --git a/src/proto_013_PtJakart/bin_tx_rollup_node/main_tx_rollup_node_013_PtJakart.ml b/src/proto_013_PtJakart/bin_tx_rollup_node/main_tx_rollup_node_013_PtJakart.ml
index 8891b46370298ac6068e0fe5266f0f2559576add..83517eb6fbae12aa3d7b0d5d38b4f53251d78895 100644
--- a/src/proto_013_PtJakart/bin_tx_rollup_node/main_tx_rollup_node_013_PtJakart.ml
+++ b/src/proto_013_PtJakart/bin_tx_rollup_node/main_tx_rollup_node_013_PtJakart.ml
@@ -102,13 +102,6 @@ let rollup_id_param =
         [("alias", from_alias); ("key", from_key)]
         s)
 
-let rollup_id_arg =
-  Clic.arg
-    ~long:"rollup-id"
-    ~placeholder:"rollup-id"
-    ~doc:"The rollup id of the rollup to target"
-    rollup_id_param
-
 let origination_level_arg =
   Clic.arg
     ~long:"origination-level"
@@ -194,8 +187,6 @@ let group =
       title = "Commands related to the transaction rollup node";
     }
 
-let to_tzresult msg = function Some x -> return x | None -> failwith msg
-
 let config_from_args data_dir rollup_id mode operator batch_signer
     finalize_commitment_signer remove_commitment_signer rejection_signer
     dispatch_withdrawals_signer origination_level rpc_addr allow_deposit
diff --git a/src/proto_013_PtJakart/lib_benchmark/test/test_distribution.ml b/src/proto_013_PtJakart/lib_benchmark/test/test_distribution.ml
index f8380845c29790090930429b47b5f6a1f72e1f4c..5f1a28b3161660e903703c24e17eba5420af9150 100644
--- a/src/proto_013_PtJakart/lib_benchmark/test/test_distribution.ml
+++ b/src/proto_013_PtJakart/lib_benchmark/test/test_distribution.ml
@@ -42,8 +42,6 @@ let pp_type_name fmtr (t : type_name) =
 module Type_name = struct
   type t = type_name
 
-  let compare (x : t) (y : t) = Stdlib.compare x y
-
   let equal (x : t) (y : t) = x = y
 
   let pp = pp_type_name
diff --git a/src/proto_013_PtJakart/lib_plugin/test/test_consensus_filter.ml b/src/proto_013_PtJakart/lib_plugin/test/test_consensus_filter.ml
index 06ab92ad884b1e3095f5cb6aa7fcea1a04fdf96c..3011feeb6470cef8659be11428ae1094f962b3b0 100644
--- a/src/proto_013_PtJakart/lib_plugin/test/test_consensus_filter.ml
+++ b/src/proto_013_PtJakart/lib_plugin/test/test_consensus_filter.ml
@@ -28,21 +28,8 @@ open Plugin.Mempool
 open Alpha_context
 open Test_utils
 
-type Environment.Error_monad.error += Generation_failure
-
 (** {2. Conversion helpers} *)
 
-let int32_of_timestamp ts =
-  let i64 = Timestamp.to_seconds ts in
-  let i32 = Int64.to_int32 i64 in
-  if Int64.(equal (of_int32 i32) i64) then Ok i32
-  else Environment.Error_monad.error Generation_failure
-
-let int32_of_timestamp_exn ts =
-  match int32_of_timestamp ts with
-  | Ok i32 -> i32
-  | Error _err -> Stdlib.failwith "int32_of_timestamp_exn: number too big"
-
 let timestamp_of_int32 ts = Timestamp.of_seconds (Int64.of_int32 ts)
 
 (** Data Generators *)
@@ -65,8 +52,6 @@ module Generator = struct
 
   let of_result = Result.value_f ~default:(fun _ -> assert false)
 
-  let print_int32 ?prefix ?suffix () = decorate ?prefix ?suffix Int32.to_string
-
   let small_nat_32 =
     let+ small_nat = small_nat in
     Int32.of_int small_nat
@@ -75,9 +60,6 @@ module Generator = struct
     let+ small_signed_int = small_signed_int in
     Int32.of_int small_signed_int
 
-  let print_small_nat ?prefix ?suffix () =
-    decorate ?prefix ?suffix string_of_int
-
   let dup gen =
     let+ x = gen in
     (x, x)
@@ -109,18 +91,6 @@ module Generator = struct
     timestamp_of_int32 i |> fun ts1 ->
     timestamp_of_int32 Int32.(add i diff) |> fun ts2 -> (ts1, ts2)
 
-  let dummy_timestamp =
-    match Timestamp.of_seconds_string "0" with
-    | Some ts -> ts
-    | _ -> assert false
-
-  let unsafe_sub ts1 ts2 =
-    Int64.to_int @@ Period.to_seconds
-    @@
-    match Timestamp.(ts1 -? ts2) with
-    | Ok diff -> diff
-    | Error _ -> assert false
-
   let successive_timestamp =
     let+ ts, (diff : int) = pair timestamp small_nat in
     let x =
diff --git a/src/proto_013_PtJakart/lib_protocol/test/pbt/refutation_game_pbt.ml b/src/proto_013_PtJakart/lib_protocol/test/pbt/refutation_game_pbt.ml
index e76d9b05e7671f8bd1a003bc85de8a1313d57c19..00b043f63bbc1f5b998b2857408a081c8226bb42 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/pbt/refutation_game_pbt.ml
+++ b/src/proto_013_PtJakart/lib_protocol/test/pbt/refutation_game_pbt.ml
@@ -695,20 +695,6 @@ module Strategies (P : TestPVM) = struct
       ( {failing_level = 0; branching = 2; max_failure = None},
         fun _ -> assert false )
 
-  (** This is a commuter client having a strategy that forgets a tick*)
-  let failing_committer max_failure =
-    MachineDirected
-      ( {failing_level = 1; branching = 2; max_failure},
-        fun tick ->
-          let s = match max_failure with None -> 20 | Some x -> x in
-          assume_some (Sc_rollup_tick_repr.to_int tick) @@ fun tick -> tick >= s
-      )
-
-  (** This is a commuter client having a strategy that forgets a tick*)
-  let failing_refuter max_failure =
-    MachineDirected
-      ({failing_level = 1; branching = 2; max_failure}, fun _ -> assert false)
-
   (** the possible expectation functions *)
   let commiter_wins x =
     Lwt_main.run
@@ -742,20 +728,6 @@ let perfect_random (module P : TestPVM) _max_failure =
   let module S = Strategies (P) in
   S.test_strategies S.perfect_committer Random S.commiter_wins
 
-let failing_perfect (module P : TestPVM) max_failure =
-  let module S = Strategies (P) in
-  S.test_strategies
-    (S.failing_committer max_failure)
-    S.perfect_refuter
-    S.refuter_wins
-
-let perfect_failing (module P : TestPVM) max_failure =
-  let module S = Strategies (P) in
-  S.test_strategies
-    S.perfect_committer
-    (S.failing_refuter max_failure)
-    S.commiter_wins
-
 (** this assembles a test from a RandomPVM and a function that choses the
 type of strategies *)
 let testing_randomPVM (f : (module TestPVM) -> int option -> bool) name =
diff --git a/src/proto_013_PtJakart/lib_protocol/test/pbt/test_carbonated_map.ml b/src/proto_013_PtJakart/lib_protocol/test/pbt/test_carbonated_map.ml
index 03b2e682ea62b6dda31bd58938a317ffc7c3198c..6e2d5ab046a4f8d6154a58837d05765debaee567 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/pbt/test_carbonated_map.ml
+++ b/src/proto_013_PtJakart/lib_protocol/test/pbt/test_carbonated_map.ml
@@ -497,6 +497,7 @@ let tests =
     test_find_non_existing;
     test_find_existing;
     test_update_add;
+    test_update_replace;
     test_update_merge;
     test_update_delete;
     test_map;
diff --git a/src/proto_013_PtJakart/lib_protocol/test/pbt/test_merkle_list.ml b/src/proto_013_PtJakart/lib_protocol/test/pbt/test_merkle_list.ml
index d2f1d01a678613538ac88c666116776ceb376123..aed9852cf3dafc436409f3d7ef66fb9bf4b9cf6a 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/pbt/test_merkle_list.ml
+++ b/src/proto_013_PtJakart/lib_protocol/test/pbt/test_merkle_list.ml
@@ -86,8 +86,6 @@ let test_scons_compute_equiv ~count =
 
 let ok_exn = function Ok x -> x | Error _ -> raise (Invalid_argument "ok_exn")
 
-let is_error = function Ok _ -> false | Error _ -> true
-
 let test_check_path ~count =
   let open Merkle_list_helper in
   QCheck2.Test.make ~count ~name:"check_path" input_and_pos (fun (pos, input) ->
diff --git a/src/proto_013_PtJakart/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml b/src/proto_013_PtJakart/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml
index ff400821f1f456b68276f8164bcbb2ec5728ebe8..e460ebb3469d75126ce86f818610cef1249f91e2 100644
--- a/src/proto_013_PtJakart/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml
+++ b/src/proto_013_PtJakart/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml
@@ -241,8 +241,6 @@ let message_result_withdrawal : Message_result.t QCheck2.Gen.t =
   let+ mres = message_result and+ withdrawals = list withdrawal in
   (mres, withdrawals)
 
-let pp fmt _ = Format.fprintf fmt "{}"
-
 (* ------ test template ----------------------------------------------------- *)
 
 let test_quantity ~count =
diff --git a/src/proto_alpha/bin_sc_rollup_node/main_sc_rollup_node_alpha.ml b/src/proto_alpha/bin_sc_rollup_node/main_sc_rollup_node_alpha.ml
index 5dec705aad9fe38996ac0973577a740d9c7acc26..20057bc9e0e3ceceaeefbb2b85f409ef259fcc7a 100644
--- a/src/proto_alpha/bin_sc_rollup_node/main_sc_rollup_node_alpha.ml
+++ b/src/proto_alpha/bin_sc_rollup_node/main_sc_rollup_node_alpha.ml
@@ -256,6 +256,4 @@ let sc_rollup_commands () =
 let select_commands _ _ =
   return (sc_rollup_commands () @ Client_helpers_commands.commands ())
 
-let main () = ()
-
 let () = Client_main_run.run (module Client_config) ~select_commands
diff --git a/src/proto_alpha/bin_tx_rollup_node/main_tx_rollup_node_alpha.ml b/src/proto_alpha/bin_tx_rollup_node/main_tx_rollup_node_alpha.ml
index 8891b46370298ac6068e0fe5266f0f2559576add..83517eb6fbae12aa3d7b0d5d38b4f53251d78895 100644
--- a/src/proto_alpha/bin_tx_rollup_node/main_tx_rollup_node_alpha.ml
+++ b/src/proto_alpha/bin_tx_rollup_node/main_tx_rollup_node_alpha.ml
@@ -102,13 +102,6 @@ let rollup_id_param =
         [("alias", from_alias); ("key", from_key)]
         s)
 
-let rollup_id_arg =
-  Clic.arg
-    ~long:"rollup-id"
-    ~placeholder:"rollup-id"
-    ~doc:"The rollup id of the rollup to target"
-    rollup_id_param
-
 let origination_level_arg =
   Clic.arg
     ~long:"origination-level"
@@ -194,8 +187,6 @@ let group =
       title = "Commands related to the transaction rollup node";
     }
 
-let to_tzresult msg = function Some x -> return x | None -> failwith msg
-
 let config_from_args data_dir rollup_id mode operator batch_signer
     finalize_commitment_signer remove_commitment_signer rejection_signer
     dispatch_withdrawals_signer origination_level rpc_addr allow_deposit
diff --git a/src/proto_alpha/lib_benchmark/test/test_distribution.ml b/src/proto_alpha/lib_benchmark/test/test_distribution.ml
index 440adbdaac1fe300c16238e26c10e82273730068..ce8866dd7afe796e6c888a3e76f65cfc27f8f239 100644
--- a/src/proto_alpha/lib_benchmark/test/test_distribution.ml
+++ b/src/proto_alpha/lib_benchmark/test/test_distribution.ml
@@ -42,8 +42,6 @@ let pp_type_name fmtr (t : type_name) =
 module Type_name = struct
   type t = type_name
 
-  let compare (x : t) (y : t) = Stdlib.compare x y
-
   let equal (x : t) (y : t) = x = y
 
   let pp = pp_type_name
diff --git a/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml b/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml
index 06ab92ad884b1e3095f5cb6aa7fcea1a04fdf96c..3011feeb6470cef8659be11428ae1094f962b3b0 100644
--- a/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml
+++ b/src/proto_alpha/lib_plugin/test/test_consensus_filter.ml
@@ -28,21 +28,8 @@ open Plugin.Mempool
 open Alpha_context
 open Test_utils
 
-type Environment.Error_monad.error += Generation_failure
-
 (** {2. Conversion helpers} *)
 
-let int32_of_timestamp ts =
-  let i64 = Timestamp.to_seconds ts in
-  let i32 = Int64.to_int32 i64 in
-  if Int64.(equal (of_int32 i32) i64) then Ok i32
-  else Environment.Error_monad.error Generation_failure
-
-let int32_of_timestamp_exn ts =
-  match int32_of_timestamp ts with
-  | Ok i32 -> i32
-  | Error _err -> Stdlib.failwith "int32_of_timestamp_exn: number too big"
-
 let timestamp_of_int32 ts = Timestamp.of_seconds (Int64.of_int32 ts)
 
 (** Data Generators *)
@@ -65,8 +52,6 @@ module Generator = struct
 
   let of_result = Result.value_f ~default:(fun _ -> assert false)
 
-  let print_int32 ?prefix ?suffix () = decorate ?prefix ?suffix Int32.to_string
-
   let small_nat_32 =
     let+ small_nat = small_nat in
     Int32.of_int small_nat
@@ -75,9 +60,6 @@ module Generator = struct
     let+ small_signed_int = small_signed_int in
     Int32.of_int small_signed_int
 
-  let print_small_nat ?prefix ?suffix () =
-    decorate ?prefix ?suffix string_of_int
-
   let dup gen =
     let+ x = gen in
     (x, x)
@@ -109,18 +91,6 @@ module Generator = struct
     timestamp_of_int32 i |> fun ts1 ->
     timestamp_of_int32 Int32.(add i diff) |> fun ts2 -> (ts1, ts2)
 
-  let dummy_timestamp =
-    match Timestamp.of_seconds_string "0" with
-    | Some ts -> ts
-    | _ -> assert false
-
-  let unsafe_sub ts1 ts2 =
-    Int64.to_int @@ Period.to_seconds
-    @@
-    match Timestamp.(ts1 -? ts2) with
-    | Ok diff -> diff
-    | Error _ -> assert false
-
   let successive_timestamp =
     let+ ts, (diff : int) = pair timestamp small_nat in
     let x =
diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_carbonated_map.ml b/src/proto_alpha/lib_protocol/test/pbt/test_carbonated_map.ml
index f58011b6b7c65488a216153e933c5c7ef0e324f3..6b20dc8c4d6374f267a65c62d531c502dddae118 100644
--- a/src/proto_alpha/lib_protocol/test/pbt/test_carbonated_map.ml
+++ b/src/proto_alpha/lib_protocol/test/pbt/test_carbonated_map.ml
@@ -504,6 +504,7 @@ let tests =
     test_find_non_existing;
     test_find_existing;
     test_update_add;
+    test_update_replace;
     test_update_merge;
     test_update_delete;
     test_map;
diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_merkle_list.ml b/src/proto_alpha/lib_protocol/test/pbt/test_merkle_list.ml
index d2f1d01a678613538ac88c666116776ceb376123..aed9852cf3dafc436409f3d7ef66fb9bf4b9cf6a 100644
--- a/src/proto_alpha/lib_protocol/test/pbt/test_merkle_list.ml
+++ b/src/proto_alpha/lib_protocol/test/pbt/test_merkle_list.ml
@@ -86,8 +86,6 @@ let test_scons_compute_equiv ~count =
 
 let ok_exn = function Ok x -> x | Error _ -> raise (Invalid_argument "ok_exn")
 
-let is_error = function Ok _ -> false | Error _ -> true
-
 let test_check_path ~count =
   let open Merkle_list_helper in
   QCheck2.Test.make ~count ~name:"check_path" input_and_pos (fun (pos, input) ->
diff --git a/src/proto_alpha/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml b/src/proto_alpha/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml
index c4816bc34f3b35cc5dc967d2ece438e48b141d4a..f087ae148dee041840a1dd56b45fa9e1d1dea044 100644
--- a/src/proto_alpha/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml
+++ b/src/proto_alpha/lib_protocol/test/pbt/test_tx_rollup_l2_encoding.ml
@@ -239,8 +239,6 @@ let message_result_withdrawal : Message_result.t QCheck2.Gen.t =
   let+ mres = message_result and+ withdrawals = list withdrawal in
   (mres, withdrawals)
 
-let pp fmt _ = Format.fprintf fmt "{}"
-
 (* ------ test template ----------------------------------------------------- *)
 
 let test_quantity ~count =