diff --git a/.github/workflows/make-test-swtpm.yml b/.github/workflows/make-test-swtpm.yml
index 5a8368c2..156ad885 100644
--- a/.github/workflows/make-test-swtpm.yml
+++ b/.github/workflows/make-test-swtpm.yml
@@ -54,6 +54,25 @@ jobs:
             wolftpm_config: --enable-swtpm --enable-smallstack
             test_command: "make check && WOLFSSL_PATH=./wolfssl ./examples/run_examples.sh"
 
+          # Infineon SLB9670
+          - name: slb9670
+            wolftpm_config: --enable-infineon=slb9670
+          # Infineon SLB9672
+          - name: slb9672
+            wolftpm_config: --enable-infineon=slb9672
+          # Infineon SLB9673
+          - name: slb9673
+            wolftpm_config: --enable-infineon=slb9673 --enable-i2c
+          # STMicro ST33KTPM2
+          - name: st33ktpm2
+            wolftpm_config: --enable-st33
+          # Microchip
+          - name: microchip
+            wolftpm_config: --enable-microchip
+          # Nuvoton
+          - name: nuvoton
+            wolftpm_config: --enable-nuvoton
+
           # TIS lock
           - name: tislock
             wolftpm_config: --enable-tislock
@@ -121,7 +140,7 @@ jobs:
 
           # Default configure (no AES CFB, no PKCS7, no crypto cb, no cert gen)
           - name: default-configure
-            wolfssl_config: --enable-wolftpm
+            wolfssl_config: ""
             wolfssl_cflags: "-DWOLFSSL_PUBLIC_MP"
             test_command: "make check && WOLFSSL_PATH=./wolfssl WOLFCRYPT_DEFAULT=1 ./examples/run_examples.sh"
             needs_install: true
@@ -157,7 +176,7 @@ jobs:
           WOLFSSL_CONFIG="${{ matrix.wolfssl_config || '--enable-wolftpm --enable-pkcallbacks' }}"
           WOLFSSL_CFLAGS="${{ matrix.wolfssl_cflags || '' }}"
           if [ -n "$WOLFSSL_CFLAGS" ]; then
-            CFLAGS="$WOLFSSL_CFLAGS" ./configure $WOLFSSL_CONFIG
+            ./configure $WOLFSSL_CONFIG CFLAGS="$WOLFSSL_CFLAGS"
           else
             ./configure $WOLFSSL_CONFIG
           fi
diff --git a/examples/native/native_test.c b/examples/native/native_test.c
index abbdb257..135f74d1 100644
--- a/examples/native/native_test.c
+++ b/examples/native/native_test.c
@@ -1465,6 +1465,9 @@ int TPM2_Native_TestArgs(void* userCtx, int argc, char *argv[])
             goto exit;
         }
     }
+
+    printf("Native test passed\n");
+
 exit:
 
     /* Close session */
diff --git a/examples/tls/tls_client.c b/examples/tls/tls_client.c
index fc8fb3f6..d4d7b57f 100644
--- a/examples/tls/tls_client.c
+++ b/examples/tls/tls_client.c
@@ -694,7 +694,7 @@ int main(int argc, char* argv[])
     (void)argc;
     (void)argv;
 
-    printf("TPM Wrapper or PK//Crypto callback or TLS support not compiled in\n");
+    printf("TPM Wrapper or PK/Crypto callback or TLS support not compiled in\n");
     printf("Build wolfssl with ./configure --enable-wolftpm\n");
 #endif
 
diff --git a/examples/tls/tls_server.c b/examples/tls/tls_server.c
index bfe3a701..b76aab0b 100644
--- a/examples/tls/tls_server.c
+++ b/examples/tls/tls_server.c
@@ -742,7 +742,7 @@ int main(int argc, char* argv[])
     (void)argc;
     (void)argv;
 
-    printf("TPM Wrapper or PK//Crypto callback or TLS support not compiled in\n");
+    printf("TPM Wrapper or PK/Crypto callback or TLS support not compiled in\n");
     printf("Build wolfssl with ./configure --enable-wolftpm\n");
 #endif
 
diff --git a/wolftpm/tpm2_types.h b/wolftpm/tpm2_types.h
index 6421a476..20c9661f 100644
--- a/wolftpm/tpm2_types.h
+++ b/wolftpm/tpm2_types.h
@@ -349,6 +349,10 @@ typedef int64_t  INT64;
     #ifdef WOLFTPM_SLB9670
         /* Max: 43MHz */
         #define TPM2_SPI_MAX_HZ_INFINEON 43000000
+        #ifndef MAX_AES_KEY_BITS
+            #define MAX_AES_KEY_BITS 128
+        #endif
+
     #elif !defined(WOLFTPM_AUTODETECT)
         #ifdef WOLFTPM_I2C
             #undef  WOLFTPM_SLB9673