diff --git a/include/jwt/algorithm.hpp b/include/jwt/algorithm.hpp
index 519cb58..e117760 100644
--- a/include/jwt/algorithm.hpp
+++ b/include/jwt/algorithm.hpp
@@ -46,6 +46,7 @@ SOFTWARE.
 #include "jwt/exceptions.hpp"
 #include "jwt/string_view.hpp"
 #include "jwt/error_codes.hpp"
+#include "jwt/base64.hpp"
 
 namespace jwt {
 
diff --git a/include/jwt/test/test_base64 b/include/jwt/test/test_base64
index 7d22ec8..25becbd 100755
Binary files a/include/jwt/test/test_base64 and b/include/jwt/test/test_base64 differ
diff --git a/include/jwt/test/test_evp b/include/jwt/test/test_evp
deleted file mode 100755
index 818c82e..0000000
Binary files a/include/jwt/test/test_evp and /dev/null differ
diff --git a/include/jwt/test/test_evp.c b/include/jwt/test/test_evp.c
index 7affbc8..6c8597c 100644
--- a/include/jwt/test/test_evp.c
+++ b/include/jwt/test/test_evp.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
- #include <openssl/evp.h>
+#include <openssl/evp.h>
 
- main(int argc, char *argv[])
+int  main(int argc, char *argv[])
  {
  EVP_MD_CTX *mdctx;
  const EVP_MD *md;
diff --git a/include/jwt/test/test_hmac b/include/jwt/test/test_hmac
index 2f78e44..314a819 100755
Binary files a/include/jwt/test/test_hmac and b/include/jwt/test/test_hmac differ
diff --git a/include/jwt/test/test_jwt_decode b/include/jwt/test/test_jwt_decode
index f6a8bd6..a79d910 100755
Binary files a/include/jwt/test/test_jwt_decode and b/include/jwt/test/test_jwt_decode differ
diff --git a/include/jwt/test/test_jwt_decode.cc b/include/jwt/test/test_jwt_decode.cc
index b3bb737..b2b6ed0 100644
--- a/include/jwt/test/test_jwt_decode.cc
+++ b/include/jwt/test/test_jwt_decode.cc
@@ -14,11 +14,14 @@ void basic_decode_test()
   jp.add_claim("admin", true);
 
   jwt::jwt_signature sgn{"secret"};
-  auto res = sgn.encode(hdr, jp);
+  std::error_code ec{};
+  auto res = sgn.encode(hdr, jp, ec);
   std::cout << res << std::endl;
 
+  using namespace jwt::params;
+
   std::cout << "DECODE: \n";
-  jwt::jwt_decode(res, "secret");
+  jwt::decode(res, algorithms({"none", "hs256"}), ec, verify(false), secret("secret"));
 }
 
 int main() {
diff --git a/include/jwt/test/test_jwt_header b/include/jwt/test/test_jwt_header
index 5ff066f..2320623 100755
Binary files a/include/jwt/test/test_jwt_header and b/include/jwt/test/test_jwt_header differ
diff --git a/include/jwt/test/test_jwt_object b/include/jwt/test/test_jwt_object
index 9f65ca3..d26912e 100755
Binary files a/include/jwt/test/test_jwt_object and b/include/jwt/test/test_jwt_object differ
diff --git a/include/jwt/test/test_jwt_object.cc b/include/jwt/test/test_jwt_object.cc
index 29f4d85..ecab0c8 100644
--- a/include/jwt/test/test_jwt_object.cc
+++ b/include/jwt/test/test_jwt_object.cc
@@ -45,7 +45,7 @@ void basic_jwt_object_test()
   obj3.secret("secret");
   obj3.header().algo("hs256");
 
-  auto dec_obj = jwt::decode(obj3.signature(), "secret", algorithms({"hs256"}));
+  auto dec_obj = jwt::decode(obj3.signature(), algorithms({"hs256"}), secret("secret"));
 }
 
 void jwt_object_pem_test()
@@ -82,8 +82,7 @@ MIGkAgEBBDBeLCgapjZmvTatMHaYX3A02+0Ys3Tr8kda+E9DFnmCSiCOEig519fT
   std::cout << "Get claim value for exp: " << 
     obj.payload().get_claim_value<uint64_t>("exp") << std::endl;
 
-  sleep(4);
-  auto dec_obj = jwt::decode(obj.signature(), pub_key, algorithms({"es256"}));
+  auto dec_obj = jwt::decode(obj.signature(), algorithms({"es256"}), secret(pub_key));
   std::cout << dec_obj.payload() << std::endl;
 }
 
diff --git a/include/jwt/test/test_jwt_payload b/include/jwt/test/test_jwt_payload
index 2e39d24..e6b8551 100755
Binary files a/include/jwt/test/test_jwt_payload and b/include/jwt/test/test_jwt_payload differ
diff --git a/include/jwt/test/test_jwt_signature b/include/jwt/test/test_jwt_signature
index d4482a1..d389633 100755
Binary files a/include/jwt/test/test_jwt_signature and b/include/jwt/test/test_jwt_signature differ
diff --git a/include/jwt/test/test_jwt_signature.cc b/include/jwt/test/test_jwt_signature.cc
index 7a95082..6a25b87 100644
--- a/include/jwt/test/test_jwt_signature.cc
+++ b/include/jwt/test/test_jwt_signature.cc
@@ -14,7 +14,8 @@ void basic_sign_test()
   jp.add_claim("admin", true);
 
   jwt::jwt_signature sgn{"secret"};
-  auto res = sgn.sign(hdr, jp);
+  std::error_code ec{};
+  auto res = sgn.encode(hdr, jp, ec);
   std::cout << res << std::endl;
 }
 
diff --git a/include/jwt/test/test_rsa b/include/jwt/test/test_rsa
index c9adf83..cc16227 100755
Binary files a/include/jwt/test/test_rsa and b/include/jwt/test/test_rsa differ
diff --git a/include/jwt/test/test_stack_alloc b/include/jwt/test/test_stack_alloc
index 609de84..bada01b 100755
Binary files a/include/jwt/test/test_stack_alloc and b/include/jwt/test/test_stack_alloc differ
diff --git a/include/jwt/test/test_stack_alloc.cc b/include/jwt/test/test_stack_alloc.cc
index 7c19319..ab158db 100644
--- a/include/jwt/test/test_stack_alloc.cc
+++ b/include/jwt/test/test_stack_alloc.cc
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <vector>
-#include "./stack_alloc.hpp"
+#include "jwt/stack_alloc.hpp"
 
 template <typename T, size_t SZ = 2>
 using SmallVector = std::vector<T, jwt::stack_alloc<T, SZ, alignof(T)>>;
diff --git a/include/jwt/test/test_sv b/include/jwt/test/test_sv
index 4c91707..e8ac63e 100755
Binary files a/include/jwt/test/test_sv and b/include/jwt/test/test_sv differ
diff --git a/include/jwt/test/test_sv.cc b/include/jwt/test/test_sv.cc
index 439726e..2577d5b 100644
--- a/include/jwt/test/test_sv.cc
+++ b/include/jwt/test/test_sv.cc
@@ -2,7 +2,7 @@
 #include <cassert>
 #include <cstring>
 #include <memory>
-#include "./string_view.hpp"
+#include "jwt/string_view.hpp"
 
 using string_view = jwt::basic_string_view<char>;