diff --git a/test/iban_ex/registry_validation_test.exs b/test/iban_ex/registry_validation_test.exs
index 6aa0a9c..392e0e0 100644
--- a/test/iban_ex/registry_validation_test.exs
+++ b/test/iban_ex/registry_validation_test.exs
@@ -179,7 +179,7 @@ test "validates numeric-only BBANs (68 countries, 64.8%)" do
       # Verify they are actually numeric
       Enum.each(numeric_ibans, fn iban ->
         {:ok, parsed} = Parser.parse(iban)
-        bban = String.slice(iban, 4..-1//1
+        bban = String.slice(iban, 4..-1//1)
 
         assert bban =~ ~r/^\d+$/,
                "Expected numeric BBAN for #{parsed.country_code}, got: #{bban}"
@@ -194,7 +194,7 @@ test "validates alphanumeric BBANs (31+ countries, 29.5%)" do
 
       # Verify they contain letters
       Enum.each(alphanumeric_ibans, fn iban ->
-        bban = String.slice(iban, 4..-1//1
+        bban = String.slice(iban, 4..-1//1)
 
         assert bban =~ ~r/[A-Z]/,
                "Expected alphanumeric BBAN for #{iban}, got: #{bban}"
diff --git a/test/support/iban_factory.exs b/test/support/iban_factory.exs
index e2fa3fc..20abe59 100644
--- a/test/support/iban_factory.exs
+++ b/test/support/iban_factory.exs
@@ -4,7 +4,7 @@ defmodule IbanEx.IbanFactory do
   Supports creating valid and invalid IBANs for comprehensive testing.
   """
 
-  alias IbanEx.{Iban, Country}
+  alias IbanEx.Parser
 
   @doc """
   Build an IBAN struct with custom attributes.
@@ -104,7 +104,7 @@ def build_with_unsupported_country do
   # Private functions
 
   defp build_from_string(iban_string) do
-    case IbanEx.parse(iban_string) do
+    case Parser.parse(iban_string) do
       {:ok, iban} -> iban
       {:error, _} -> raise "Invalid IBAN string: #{iban_string}"
     end
@@ -117,7 +117,7 @@ defp build_from_attrs(attrs) do
     example_iban = get_example_iban(country_code)
 
     # Parse it to get the structure
-    {:ok, base_iban} = IbanEx.parse(example_iban)
+    {:ok, base_iban} = Parser.parse(example_iban)
 
     # Override with provided attributes
     %{