diff --git a/tests/api/test_ossl_asn1.c b/tests/api/test_ossl_asn1.c
index 4cae23a3a..4edf0ca00 100644
--- a/tests/api/test_ossl_asn1.c
+++ b/tests/api/test_ossl_asn1.c
@@ -36,7 +36,7 @@
 #include <tests/api/test_ossl_asn1.h>
 
 /*******************************************************************************
- * ASN.1 OpenSSL compatibiltity API Testing
+ * ASN.1 OpenSSL compatibility API Testing
  ******************************************************************************/
 
 int test_wolfSSL_ASN1_BIT_STRING(void)
diff --git a/tests/api/test_ossl_bio.c b/tests/api/test_ossl_bio.c
index 7ad53d6f9..770db8aa7 100644
--- a/tests/api/test_ossl_bio.c
+++ b/tests/api/test_ossl_bio.c
@@ -35,7 +35,7 @@
 #include <tests/api/test_ossl_bio.h>
 
 /*******************************************************************************
- * BIO OpenSSL compatibiltity API Testing
+ * BIO OpenSSL compatibility API Testing
  ******************************************************************************/
 
 #ifndef NO_BIO
diff --git a/tests/api/test_ossl_bn.c b/tests/api/test_ossl_bn.c
index 7cb9b8766..176772eec 100644
--- a/tests/api/test_ossl_bn.c
+++ b/tests/api/test_ossl_bn.c
@@ -34,7 +34,7 @@
 #include <tests/api/test_ossl_bn.h>
 
 /*******************************************************************************
- * BN OpenSSL compatibiltity API Testing
+ * BN OpenSSL compatibility API Testing
  ******************************************************************************/
 
 int test_wolfSSL_BN_CTX(void)
diff --git a/tests/api/test_ossl_cipher.c b/tests/api/test_ossl_cipher.c
index e0aa46687..bbd09f099 100644
--- a/tests/api/test_ossl_cipher.c
+++ b/tests/api/test_ossl_cipher.c
@@ -37,7 +37,7 @@
 #include <tests/api/test_ossl_cipher.h>
 
 /*******************************************************************************
- * Cipher OpenSSL compatibiltity API Testing
+ * Cipher OpenSSL compatibility API Testing
  ******************************************************************************/
 
 int test_wolfSSL_DES(void)
diff --git a/tests/api/test_ossl_dgst.c b/tests/api/test_ossl_dgst.c
index 897d1c9ee..8bc6c467e 100644
--- a/tests/api/test_ossl_dgst.c
+++ b/tests/api/test_ossl_dgst.c
@@ -37,7 +37,7 @@
 #include <tests/api/test_ossl_dgst.h>
 
 /*******************************************************************************
- * Digest OpenSSL compatibiltity API Testing
+ * Digest OpenSSL compatibility API Testing
  ******************************************************************************/
 
 int test_wolfSSL_MD4(void)
diff --git a/tests/api/test_ossl_dh.c b/tests/api/test_ossl_dh.c
index 359d45b30..687155eb9 100644
--- a/tests/api/test_ossl_dh.c
+++ b/tests/api/test_ossl_dh.c
@@ -35,7 +35,7 @@
 #include <tests/api/test_ossl_dh.h>
 
 /*******************************************************************************
- * DH OpenSSL compatibiltity API Testing
+ * DH OpenSSL compatibility API Testing
  ******************************************************************************/
 
 int test_wolfSSL_DH(void)
diff --git a/tests/api/test_ossl_dsa.c b/tests/api/test_ossl_dsa.c
index 915f03615..7d0958636 100644
--- a/tests/api/test_ossl_dsa.c
+++ b/tests/api/test_ossl_dsa.c
@@ -35,7 +35,7 @@
 #include <tests/api/test_ossl_dsa.h>
 
 /*******************************************************************************
- * DSA OpenSSL compatibiltity API Testing
+ * DSA OpenSSL compatibility API Testing
  ******************************************************************************/
 
 int test_DSA_do_sign_verify(void)
diff --git a/tests/api/test_ossl_ec.c b/tests/api/test_ossl_ec.c
index 35bc78cdd..174c75cfd 100644
--- a/tests/api/test_ossl_ec.c
+++ b/tests/api/test_ossl_ec.c
@@ -36,7 +36,7 @@
 #include <tests/api/test_ossl_ec.h>
 
 /*******************************************************************************
- * EC OpenSSL compatibiltity API Testing
+ * EC OpenSSL compatibility API Testing
  ******************************************************************************/
 
 #if defined(HAVE_ECC) && !defined(OPENSSL_NO_PK)
diff --git a/tests/api/test_ossl_ecx.c b/tests/api/test_ossl_ecx.c
index 460d1dc9a..b86a09ce7 100644
--- a/tests/api/test_ossl_ecx.c
+++ b/tests/api/test_ossl_ecx.c
@@ -40,7 +40,7 @@
 #include <tests/api/test_ossl_ecx.h>
 
 /*******************************************************************************
- * ECX OpenSSL compatibiltity API Testing
+ * ECX OpenSSL compatibility API Testing
  ******************************************************************************/
 
 #ifdef OPENSSL_EXTRA
diff --git a/tests/api/test_ossl_mac.c b/tests/api/test_ossl_mac.c
index eeac138f8..daba856d2 100644
--- a/tests/api/test_ossl_mac.c
+++ b/tests/api/test_ossl_mac.c
@@ -35,7 +35,7 @@
 #include <tests/api/test_ossl_mac.h>
 
 /*******************************************************************************
- * MAC OpenSSL compatibiltity API Testing
+ * MAC OpenSSL compatibility API Testing
  ******************************************************************************/
 
 #if defined(OPENSSL_EXTRA) && !defined(NO_HMAC)
diff --git a/tests/api/test_ossl_rsa.c b/tests/api/test_ossl_rsa.c
index 81efecdb3..1947ad7ee 100644
--- a/tests/api/test_ossl_rsa.c
+++ b/tests/api/test_ossl_rsa.c
@@ -36,7 +36,7 @@
 #include <tests/api/test_ossl_rsa.h>
 
 /*******************************************************************************
- * RSA OpenSSL compatibiltity API Testing
+ * RSA OpenSSL compatibility API Testing
  ******************************************************************************/
 
 int test_wolfSSL_RSA(void)
diff --git a/tests/api/test_pkcs12.c b/tests/api/test_pkcs12.c
index 86ec70895..b71b2a166 100644
--- a/tests/api/test_pkcs12.c
+++ b/tests/api/test_pkcs12.c
@@ -135,7 +135,7 @@ static int test_wc_PKCS12_create_once(int keyEncType, int certEncType)
         &outCert, &outCertSz, &outCaList), 0);
 
     ExpectIntEQ(outKeySz, inKeySz);
-    ExpectIntEQ(outCertSz, outCertSz);
+    ExpectIntEQ(outCertSz, inCertSz);
     ExpectNotNull(outCaList);
     ExpectNotNull(outCaList->buffer);
     ExpectIntEQ(outCaList->bufferSz, inCa.bufferSz);