diff --git a/TestVectors/dafny/TestVectors/test/perf-encrypt-manifest.json b/TestVectors/dafny/TestVectors/test/perf-encrypt-manifest.json
index 6bf3f9d56..a9e84d9b7 100644
--- a/TestVectors/dafny/TestVectors/test/perf-encrypt-manifest.json
+++ b/TestVectors/dafny/TestVectors/test/perf-encrypt-manifest.json
@@ -1,63 +1,117 @@
 {
-    "manifest": {
-      "type": "awses-encrypt",
-      "version": 5
+  "manifest": {
+    "type": "awses-encrypt",
+    "version": 5
+  },
+  "client": {
+    "name": "aws-encryption-sdk-dafny",
+    "version": "4.1.0"
+  },
+  "keys": "file://keys.json",
+  "plaintexts": {
+    "large": 1000000,
+    "giant": 100000000
+  },
+  "tests": {
+    "giant-raw-rsa": {
+      "encryption-scenario": {
+        "type": "positive-esdk",
+        "plaintext": "giant",
+        "description": "Generated RawRSA rsa-4096",
+        "algorithmSuiteId": "0146",
+        "frame-size": 512,
+        "encryptKeyDescription": {
+          "type": "raw",
+          "key": "rsa-4096-public",
+          "provider-id": "aws-raw-vectors-persistent-rsa-4096",
+          "encryption-algorithm": "rsa",
+          "padding-algorithm": "oaep-mgf1",
+          "padding-hash": "sha384"
+        },
+        "decryptKeyDescription": {
+          "type": "raw",
+          "key": "rsa-4096-private",
+          "provider-id": "aws-raw-vectors-persistent-rsa-4096",
+          "encryption-algorithm": "rsa",
+          "padding-algorithm": "oaep-mgf1",
+          "padding-hash": "sha384"
+        },
+        "encryption-context": {},
+        "reproduced-encryption-context": {}
+      }
     },
-    "client": {
-      "name": "aws-encryption-sdk-dafny",
-      "version": "4.1.0"
+    "giant-raw-rsa-tiny-frame": {
+      "encryption-scenario": {
+        "type": "positive-esdk",
+        "plaintext": "large",
+        "description": "Generated RawRSA rsa-4096",
+        "algorithmSuiteId": "0146",
+        "frame-size": 4,
+        "encryptKeyDescription": {
+          "type": "raw",
+          "key": "rsa-4096-public",
+          "provider-id": "aws-raw-vectors-persistent-rsa-4096",
+          "encryption-algorithm": "rsa",
+          "padding-algorithm": "oaep-mgf1",
+          "padding-hash": "sha384"
+        },
+        "decryptKeyDescription": {
+          "type": "raw",
+          "key": "rsa-4096-private",
+          "provider-id": "aws-raw-vectors-persistent-rsa-4096",
+          "encryption-algorithm": "rsa",
+          "padding-algorithm": "oaep-mgf1",
+          "padding-hash": "sha384"
+        },
+        "encryption-context": {},
+        "reproduced-encryption-context": {}
+      }
     },
-    "keys": "file://keys.json",
-    "plaintexts": {
-        "large": 1000000,
-        "giant": 100000000
+    "giant-raw-aes-256": {
+      "encryption-scenario": {
+        "type": "positive-esdk",
+        "plaintext": "giant",
+        "description": "Generated RawAES aes-256",
+        "algorithmSuiteId": "0078",
+        "frame-size": 512,
+        "encryptKeyDescription": {
+          "type": "raw",
+          "key": "aes-256",
+          "provider-id": "aws-raw-vectors-persistent-aes-256",
+          "encryption-algorithm": "aes"
+        },
+        "decryptKeyDescription": {
+          "type": "raw",
+          "key": "aes-256",
+          "provider-id": "aws-raw-vectors-persistent-aes-256",
+          "encryption-algorithm": "aes"
+        },
+        "encryption-context": {},
+        "reproduced-encryption-context": {}
+      }
     },
-    "tests": {
-        "giant-raw-aes-256": {
-            "encryption-scenario": {
-              "type": "positive-esdk",
-              "plaintext": "giant",
-              "description": "Generated RawAES aes-256",
-              "algorithmSuiteId": "0078",
-              "frame-size": 512,
-              "encryptKeyDescription": {
-                "type": "raw",
-                "key": "aes-256",
-                "provider-id": "aws-raw-vectors-persistent-aes-256",
-                "encryption-algorithm": "aes"
-              },
-              "decryptKeyDescription": {
-                "type": "raw",
-                "key": "aes-256",
-                "provider-id": "aws-raw-vectors-persistent-aes-256",
-                "encryption-algorithm": "aes"
-              },
-              "encryption-context": {},
-              "reproduced-encryption-context": {}
-            }
-          },
-          "giant-raw-aes-256-tiny-frame": {
-            "encryption-scenario": {
-              "type": "positive-esdk",
-              "plaintext": "large",
-              "description": "Generated RawAES aes-256",
-              "algorithmSuiteId": "0078",
-              "frame-size": 4,
-              "encryptKeyDescription": {
-                "type": "raw",
-                "key": "aes-256",
-                "provider-id": "aws-raw-vectors-persistent-aes-256",
-                "encryption-algorithm": "aes"
-              },
-              "decryptKeyDescription": {
-                "type": "raw",
-                "key": "aes-256",
-                "provider-id": "aws-raw-vectors-persistent-aes-256",
-                "encryption-algorithm": "aes"
-              },
-              "encryption-context": {},
-              "reproduced-encryption-context": {}
-            }
-          }
+    "giant-raw-aes-256-tiny-frame": {
+      "encryption-scenario": {
+        "type": "positive-esdk",
+        "plaintext": "large",
+        "description": "Generated RawAES aes-256",
+        "algorithmSuiteId": "0078",
+        "frame-size": 4,
+        "encryptKeyDescription": {
+          "type": "raw",
+          "key": "aes-256",
+          "provider-id": "aws-raw-vectors-persistent-aes-256",
+          "encryption-algorithm": "aes"
+        },
+        "decryptKeyDescription": {
+          "type": "raw",
+          "key": "aes-256",
+          "provider-id": "aws-raw-vectors-persistent-aes-256",
+          "encryption-algorithm": "aes"
+        },
+        "encryption-context": {},
+        "reproduced-encryption-context": {}
+      }
     }
+  }
 }
\ No newline at end of file
diff --git a/TestVectors/dafny/TestVectors/test/thousand-encrypt-manifest.json b/TestVectors/dafny/TestVectors/test/thousand-encrypt-manifest.json
index a88738ab0..d1446c9d0 100644
--- a/TestVectors/dafny/TestVectors/test/thousand-encrypt-manifest.json
+++ b/TestVectors/dafny/TestVectors/test/thousand-encrypt-manifest.json
@@ -35,6 +35,33 @@
         "reproduced-encryption-context": {}
       }
     },
+    "small-rsa-4096": {
+      "encryption-scenario": {
+        "type": "positive-esdk",
+        "plaintext": "small",
+        "description": "Generated RawRSA rsa-4096",
+        "algorithmSuiteId": "0146",
+        "frame-size": 512,
+        "encryptKeyDescription": {
+          "type": "raw",
+          "key": "rsa-4096-public",
+          "provider-id": "aws-raw-vectors-persistent-rsa-4096",
+          "encryption-algorithm": "rsa",
+          "padding-algorithm": "oaep-mgf1",
+          "padding-hash": "sha512"
+        },
+        "decryptKeyDescription": {
+          "type": "raw",
+          "key": "rsa-4096-private",
+          "provider-id": "aws-raw-vectors-persistent-rsa-4096",
+          "encryption-algorithm": "rsa",
+          "padding-algorithm": "oaep-mgf1",
+          "padding-hash": "sha512"
+        },
+        "encryption-context": {},
+        "reproduced-encryption-context": {}
+      }
+    },
     "small-aws-kms-hierarchy": {
       "encryption-scenario": {
         "type": "positive-esdk",
@@ -84,4 +111,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/TestVectors/runtimes/python/src/aws_encryption_sdk_test_vectors/internaldafny/extern/wrapped_esdk.py b/TestVectors/runtimes/python/src/aws_encryption_sdk_test_vectors/internaldafny/extern/wrapped_esdk.py
index d9240b889..5bc54143e 100644
--- a/TestVectors/runtimes/python/src/aws_encryption_sdk_test_vectors/internaldafny/extern/wrapped_esdk.py
+++ b/TestVectors/runtimes/python/src/aws_encryption_sdk_test_vectors/internaldafny/extern/wrapped_esdk.py
@@ -70,7 +70,6 @@ def Encrypt(self, dafny_encrypt_input):
             mkp_flag = False
             if "MASTERKEY" in sys.argv:
                 mkp_flag = True
-            print("mkp_flag:", mkp_flag)
             mkp = None
             if native_encrypt_input.keyring is not None:
                 if mkp_flag:
@@ -127,7 +126,6 @@ def Decrypt(self, dafny_decrypt_input):
             mkp_flag = False
             if "MASTERKEY" in sys.argv:
                 mkp_flag = True
-            print("mkp_flag:", mkp_flag)
             native_esdk_input = {}
             mkp = None
             if native_decrypt_input.keyring is not None:
diff --git a/mpl b/mpl
index 515995e68..1c293223e 160000
--- a/mpl
+++ b/mpl
@@ -1 +1 @@
-Subproject commit 515995e68400e56fc720412fe355e6965715136e
+Subproject commit 1c293223efb2bc9643a45e482daf37a87eeae197