diff --git a/test/archethic/contracts/interpreter/action_interpreter_test.exs b/test/archethic/contracts/interpreter/action_interpreter_test.exs
index 4d9f921388..913d04d90a 100644
--- a/test/archethic/contracts/interpreter/action_interpreter_test.exs
+++ b/test/archethic/contracts/interpreter/action_interpreter_test.exs
@@ -505,7 +505,10 @@ defmodule Archethic.Contracts.Interpreter.ActionInterpreterTest do
                |> Interpreter.sanitize_code()
                |> elem(1)
                # mark as existing
-               |> ActionInterpreter.parse(FunctionKeys.add_public(%{}, "hello", 0))
+               |> ActionInterpreter.parse(
+                 FunctionKeys.new()
+                 |> FunctionKeys.add_public("hello", 0)
+               )
 
       # private function
       assert {:ok, _, _} =
@@ -513,7 +516,10 @@ defmodule Archethic.Contracts.Interpreter.ActionInterpreterTest do
                |> Interpreter.sanitize_code()
                |> elem(1)
                # mark as existing
-               |> ActionInterpreter.parse(FunctionKeys.add_private(%{}, "hello", 0))
+               |> ActionInterpreter.parse(
+                 FunctionKeys.new()
+                 |> FunctionKeys.add_private("hello", 0)
+               )
     end
   end
 
diff --git a/test/archethic/contracts/interpreter/condition_interpreter_test.exs b/test/archethic/contracts/interpreter/condition_interpreter_test.exs
index a7b7fe3f80..f778421d33 100644
--- a/test/archethic/contracts/interpreter/condition_interpreter_test.exs
+++ b/test/archethic/contracts/interpreter/condition_interpreter_test.exs
@@ -129,7 +129,10 @@ defmodule Archethic.Contracts.Interpreter.ConditionInterpreterTest do
                |> Interpreter.sanitize_code()
                |> elem(1)
                # mark function as existing
-               |> ConditionInterpreter.parse(FunctionKeys.add_public(%{}, "get_uco_transfers", 0))
+               |> ConditionInterpreter.parse(
+                 FunctionKeys.new()
+                 |> FunctionKeys.add_public("get_uco_transfers", 0)
+               )
 
       assert is_tuple(ast) && :ok == Macro.validate(ast)
     end
diff --git a/test/archethic/contracts/interpreter/function_interpreter_test.exs b/test/archethic/contracts/interpreter/function_interpreter_test.exs
index b565a74ba1..bd33f0e614 100644
--- a/test/archethic/contracts/interpreter/function_interpreter_test.exs
+++ b/test/archethic/contracts/interpreter/function_interpreter_test.exs
@@ -120,7 +120,10 @@ defmodule Archethic.Contracts.Interpreter.FunctionInterpreterTest do
                |> Interpreter.sanitize_code()
                |> elem(1)
                # mark function as declared
-               |> FunctionInterpreter.parse(FunctionKeys.add_public(%{}, "hello", 0))
+               |> FunctionInterpreter.parse(
+                 FunctionKeys.new()
+                 |> FunctionKeys.add_public("hello", 0)
+               )
     end
 
     test "should not be able to use IO functions in public function with dynamic access" do
@@ -135,7 +138,10 @@ defmodule Archethic.Contracts.Interpreter.FunctionInterpreterTest do
                |> Interpreter.sanitize_code()
                |> elem(1)
                # mark function as declared
-               |> FunctionInterpreter.parse(FunctionKeys.add_public(%{}, "hello", 0))
+               |> FunctionInterpreter.parse(
+                 FunctionKeys.new()
+                 |> FunctionKeys.add_public("hello", 0)
+               )
     end
 
     test "should return an error if module is unknown" do
@@ -218,7 +224,10 @@ defmodule Archethic.Contracts.Interpreter.FunctionInterpreterTest do
                |> Interpreter.sanitize_code()
                |> elem(1)
                # mark function as declared
-               |> FunctionInterpreter.parse(FunctionKeys.add_public(%{}, "hello", 0))
+               |> FunctionInterpreter.parse(
+                 FunctionKeys.new()
+                 |> FunctionKeys.add_public("hello", 0)
+               )
     end
 
     test "should not be able to call declared private function from private function" do
@@ -233,7 +242,10 @@ defmodule Archethic.Contracts.Interpreter.FunctionInterpreterTest do
                |> Interpreter.sanitize_code()
                |> elem(1)
                # mark function as declared
-               |> FunctionInterpreter.parse(FunctionKeys.add_private(%{}, "hello", 0))
+               |> FunctionInterpreter.parse(
+                 FunctionKeys.new()
+                 |> FunctionKeys.add_private("hello", 0)
+               )
     end
 
     test "should not be able to call declared function from public function" do
@@ -277,7 +289,10 @@ defmodule Archethic.Contracts.Interpreter.FunctionInterpreterTest do
         |> Interpreter.sanitize_code()
         |> elem(1)
         # pass allowed function
-        |> FunctionInterpreter.parse(FunctionKeys.add_public(%{}, "hello", 0))
+        |> FunctionInterpreter.parse(
+          FunctionKeys.new()
+          |> FunctionKeys.add_public("hello", 0)
+        )
 
       function_constant = %{:functions => %{{"hello", 0} => %{args: [], ast: ast_hello}}}
 
diff --git a/test/archethic/contracts/interpreter/function_keys_test.exs b/test/archethic/contracts/interpreter/function_keys_test.exs
index c4db11aba0..2e0dcbe05e 100644
--- a/test/archethic/contracts/interpreter/function_keys_test.exs
+++ b/test/archethic/contracts/interpreter/function_keys_test.exs
@@ -7,7 +7,7 @@ defmodule Archethic.Contracts.Interpreter.FunctionKeysTest do
 
   test "add_public/3 and add_private/3 should add function in map" do
     function_keys =
-      %{}
+      FunctionKeys.new()
       |> FunctionKeys.add_private("private_function", 0)
       |> FunctionKeys.add_public("public_function", 1)
       |> FunctionKeys.add_private("private_function", 1)