diff --git a/lib/boruta/adapters/issuer-coordinator/signatures.ex b/lib/boruta/adapters/issuer-coordinator/signatures.ex
index bd49f880..fd81b79b 100644
--- a/lib/boruta/adapters/issuer-coordinator/signatures.ex
+++ b/lib/boruta/adapters/issuer-coordinator/signatures.ex
@@ -36,7 +36,7 @@ defmodule Boruta.IssuerCoordinator.Signatures do
          )
          |> Finch.request(OpenIDHttpClient) do
       {:ok, %Finch.Response{status: 200, body: credential}} ->
-        {:ok, credential}
+        credential
 
       _ ->
         {:error, "Could not sign with universal key."}
diff --git a/test/boruta/openid/verifiable_credentials_test.exs b/test/boruta/openid/verifiable_credentials_test.exs
index 5bcaf32a..893e9ac4 100644
--- a/test/boruta/openid/verifiable_credentials_test.exs
+++ b/test/boruta/openid/verifiable_credentials_test.exs
@@ -399,12 +399,12 @@ defmodule Boruta.Openid.VerifiableCredentialsTest do
         |> String.split("~")
         |> List.last()
 
-      VerifiableCredentials.verify_salt(token.client.private_key, valid_salt)
+      VerifiableCredentials.Status.verify_status_token(token.client.private_key, valid_salt)
 
       assert valid_salt_key ==
                VerifiableCredentials.Hotp.generate_hotp(
                  token.client.private_key,
-                 div(:os.system_time(:seconds), 3600) + VerifiableCredentials.shift(:valid)
+                 div(:os.system_time(:seconds), 3600) + VerifiableCredentials.Status.shift(:valid)
                )
 
       suspended_salt =
@@ -419,12 +419,12 @@ defmodule Boruta.Openid.VerifiableCredentialsTest do
         |> String.split("~")
         |> List.last()
 
-      VerifiableCredentials.verify_salt(token.client.private_key, suspended_salt)
+      VerifiableCredentials.Status.verify_status_token(token.client.private_key, suspended_salt)
 
       assert suspended_salt_key ==
                VerifiableCredentials.Hotp.generate_hotp(
                  token.client.private_key,
-                 div(:os.system_time(:seconds), 3600) + VerifiableCredentials.shift(:suspended)
+                 div(:os.system_time(:seconds), 3600) + VerifiableCredentials.Status.shift(:suspended)
                )
     end
 
@@ -486,7 +486,7 @@ defmodule Boruta.Openid.VerifiableCredentialsTest do
       assert suspended_salt_key ==
                VerifiableCredentials.Hotp.generate_hotp(
                  token.client.private_key,
-                 div(:os.system_time(:seconds), 3600) + VerifiableCredentials.shift(:suspended)
+                 div(:os.system_time(:seconds), 3600) + VerifiableCredentials.Status.shift(:suspended)
                )
     end
 
@@ -548,7 +548,7 @@ defmodule Boruta.Openid.VerifiableCredentialsTest do
       assert revoked_salt_key ==
                VerifiableCredentials.Hotp.generate_hotp(
                  token.client.private_key,
-                 div(:os.system_time(:seconds), 3600) + VerifiableCredentials.shift(:revoked)
+                 div(:os.system_time(:seconds), 3600) + VerifiableCredentials.Status.shift(:revoked)
                )
     end
 
@@ -639,10 +639,10 @@ defmodule Boruta.Openid.VerifiableCredentialsTest do
       assert String.split(salt, "~") |> List.last() ==
                VerifiableCredentials.Hotp.generate_hotp(
                  secret,
-                 div(:os.system_time(:seconds), expiration) + VerifiableCredentials.shift(:valid)
+                 div(:os.system_time(:seconds), expiration) + VerifiableCredentials.Status.shift(:valid)
                )
 
-      assert VerifiableCredentials.verify_salt(secret, salt) == :valid
+      assert VerifiableCredentials.Status.verify_status_token(secret, salt) == :valid
     end
 
     test "generate a valid salt" do
@@ -654,10 +654,10 @@ defmodule Boruta.Openid.VerifiableCredentialsTest do
       assert String.split(salt, "~") |> List.last() ==
                VerifiableCredentials.Hotp.generate_hotp(
                  secret,
-                 div(:os.system_time(:seconds), expiration) + VerifiableCredentials.shift(:valid)
+                 div(:os.system_time(:seconds), expiration) + VerifiableCredentials.Status.shift(:valid)
                )
 
-      assert VerifiableCredentials.verify_salt(secret, salt) == :valid
+      assert VerifiableCredentials.Status.verify_status_token(secret, salt) == :valid
     end
 
     test "generate a thousand salt" do
@@ -669,7 +669,7 @@ defmodule Boruta.Openid.VerifiableCredentialsTest do
           status = Enum.random(statuses)
           expiration = Enum.random(1..3600)
 
-          assert salt = VerifiableCredentials.generate_sd_salt(secret, expiration, status)
+          assert salt = VerifiableCredentials.Status.generate_status_token(secret, expiration, status)
           {status, salt}
         end)
 
@@ -690,10 +690,10 @@ defmodule Boruta.Openid.VerifiableCredentialsTest do
                VerifiableCredentials.Hotp.generate_hotp(
                  secret,
                  div(:os.system_time(:seconds), expiration) +
-                   VerifiableCredentials.shift(:revoked)
+                   VerifiableCredentials.Status.shift(:revoked)
                )
 
-      assert VerifiableCredentials.verify_salt(secret, salt) == :revoked
+      assert VerifiableCredentials.Status.verify_status_token(secret, salt) == :revoked
     end
 
     test "generate a suspended salt" do
@@ -706,10 +706,10 @@ defmodule Boruta.Openid.VerifiableCredentialsTest do
                VerifiableCredentials.Hotp.generate_hotp(
                  secret,
                  div(:os.system_time(:seconds), expiration) +
-                   VerifiableCredentials.shift(:suspended)
+                   VerifiableCredentials.Status.shift(:suspended)
                )
 
-      assert VerifiableCredentials.verify_salt(secret, salt) == :suspended
+      assert VerifiableCredentials.Status.verify_status_token(secret, salt) == :suspended
     end
   end