diff --git a/contrib/test/test-vectors-fixtures/syscall-fixtures/memcpy.list b/contrib/test/test-vectors-fixtures/syscall-fixtures/memcpy.list
index 7c50c35a9e..ff56fed277 100644
--- a/contrib/test/test-vectors-fixtures/syscall-fixtures/memcpy.list
+++ b/contrib/test/test-vectors-fixtures/syscall-fixtures/memcpy.list
@@ -1,8 +1,5 @@
 dump/test-vectors/syscall/fixtures/memcpy/0ba7dca8254e87ac49d60127a8681948af276f26_3347501.fix
 dump/test-vectors/syscall/fixtures/memcpy/1e1e9081a217357562a59ecdf1339b20753a90a7_1442966.fix
-dump/test-vectors/syscall/fixtures/memcpy/1e5a8fb94e00850a1fb089637609f1a09f8c3eb9_1444741.fix
-dump/test-vectors/syscall/fixtures/memcpy/1e5a8fb94e00850a1fb089637609f1a09f8c3eb9_1672537.fix
-dump/test-vectors/syscall/fixtures/memcpy/1ebb739c660d4bb4f32c401b3802de0aa7fb5050_1443705.fix
 dump/test-vectors/syscall/fixtures/memcpy/1ebb739c660d4bb4f32c401b3802de0aa7fb5050_1671088.fix
 dump/test-vectors/syscall/fixtures/memcpy/22afb56a0993ee26756193cf719516564fc87224_1445111.fix
 dump/test-vectors/syscall/fixtures/memcpy/2c474d41cb0c72185c48d70b5537a978229afd6b_1445803.fix
@@ -42,14 +39,12 @@ dump/test-vectors/syscall/fixtures/memcpy/9d050bdcc3745eb9935341cfcf8d0e3ee67222
 dump/test-vectors/syscall/fixtures/memcpy/9d050bdcc3745eb9935341cfcf8d0e3ee6722262_1671934.fix
 dump/test-vectors/syscall/fixtures/memcpy/a23ad072e6b5f88aeb2c66fb4ef39e4d9f29fb1c_1447821.fix
 dump/test-vectors/syscall/fixtures/memcpy/a301ed12deb16c2f9fc734c288f14c705942f167_3345838.fix
-dump/test-vectors/syscall/fixtures/memcpy/a4790aafb3436e0f1916860d74db71fb26e85c08_1447710.fix
 dump/test-vectors/syscall/fixtures/memcpy/b56959e99d162bb4ecd091581cf30382234ea10b_1445006.fix
 dump/test-vectors/syscall/fixtures/memcpy/b56959e99d162bb4ecd091581cf30382234ea10b_1673061.fix
 dump/test-vectors/syscall/fixtures/memcpy/b6982dfe4412bb0039354648d7319e2117dfcda8_1442144.fix
 dump/test-vectors/syscall/fixtures/memcpy/b6982dfe4412bb0039354648d7319e2117dfcda8_1669375.fix
 dump/test-vectors/syscall/fixtures/memcpy/b6f447ee5367ec02fdd70382eeb21f2ca5ac5426_1444006.fix
 dump/test-vectors/syscall/fixtures/memcpy/b6f447ee5367ec02fdd70382eeb21f2ca5ac5426_1671519.fix
-dump/test-vectors/syscall/fixtures/memcpy/b971a0252e35c006c68f207b011e2260648c15d2_1445451.fix
 dump/test-vectors/syscall/fixtures/memcpy/bae0f6508b8a2d7a14137684b45303155fd6e9ac_1447118.fix
 dump/test-vectors/syscall/fixtures/memcpy/bae0f6508b8a2d7a14137684b45303155fd6e9ac_1676386.fix
 dump/test-vectors/syscall/fixtures/memcpy/c4283f25a4617512afd2448f760fa2c5bc09655a_1442486.fix
diff --git a/contrib/test/test-vectors-fixtures/syscall-fixtures/memmove.list b/contrib/test/test-vectors-fixtures/syscall-fixtures/memmove.list
index 7d8c72a010..9c16ef9d4e 100644
--- a/contrib/test/test-vectors-fixtures/syscall-fixtures/memmove.list
+++ b/contrib/test/test-vectors-fixtures/syscall-fixtures/memmove.list
@@ -23,7 +23,6 @@ dump/test-vectors/syscall/fixtures/memmove/7b392fb9628c71ce38a5e424e8a46c95914fb
 dump/test-vectors/syscall/fixtures/memmove/7ee6429422411d13ccd4b3ee7cdfc79bf6986fbe_855132.fix
 dump/test-vectors/syscall/fixtures/memmove/815db9e058ca425d7dcdf4e74d2c9f3c895f9376_856834.fix
 dump/test-vectors/syscall/fixtures/memmove/8d6b7cb957bf511e2008af66e518a22e7dc936dc_854535.fix
-dump/test-vectors/syscall/fixtures/memmove/92d47def3b5060a224264cabf3d37337c9c5f98a_854853.fix
 dump/test-vectors/syscall/fixtures/memmove/98b3d84154e796d5442e8244f8d82703c3546827_4139847.fix
 dump/test-vectors/syscall/fixtures/memmove/9a23ba179a0296d83859dea28f136bca1f7bb43c_856548.fix
 dump/test-vectors/syscall/fixtures/memmove/9d806b1eb622bc6bd95c94900b3024ae00546e4b_856647.fix
diff --git a/src/flamenco/runtime/tests/fd_exec_instr_test.c b/src/flamenco/runtime/tests/fd_exec_instr_test.c
index a0bd296f2a..56b4efaad0 100644
--- a/src/flamenco/runtime/tests/fd_exec_instr_test.c
+++ b/src/flamenco/runtime/tests/fd_exec_instr_test.c
@@ -1460,8 +1460,8 @@ fd_exec_vm_syscall_test_run( fd_exec_instr_test_runner_t * runner,
   int                     direct_mapping          = FD_FEATURE_ACTIVE( ctx->slot_ctx, bpf_account_data_direct_mapping );
 
   uchar program_id_idx = ctx->instr->program_id;
-  uchar is_deprecated  = (program_id_idx < ctx->txn_ctx->accounts_cnt) &&
-                         (!memcmp( ctx->txn_ctx->borrowed_accounts[program_id_idx].const_meta->info.owner, fd_solana_bpf_loader_deprecated_program_id.key, sizeof(fd_pubkey_t) ));
+  uchar is_deprecated  = ( program_id_idx < ctx->txn_ctx->accounts_cnt ) &&
+                         ( !memcmp( ctx->txn_ctx->borrowed_accounts[program_id_idx].const_meta->info.owner, fd_solana_bpf_loader_deprecated_program_id.key, sizeof(fd_pubkey_t) ) );
 
   if( is_deprecated ) {
     fd_bpf_loader_input_serialize_unaligned( *ctx,
diff --git a/src/flamenco/runtime/tests/fd_vm_test.c b/src/flamenco/runtime/tests/fd_vm_test.c
index 11b9289cdd..62002cb8b6 100644
--- a/src/flamenco/runtime/tests/fd_vm_test.c
+++ b/src/flamenco/runtime/tests/fd_vm_test.c
@@ -111,8 +111,8 @@ do{
   int                     direct_mapping          = FD_FEATURE_ACTIVE( instr_ctx->slot_ctx, bpf_account_data_direct_mapping );
 
   uchar program_id_idx = instr_ctx->instr->program_id;
-  uchar is_deprecated  = (program_id_idx < instr_ctx->txn_ctx->accounts_cnt) &&
-                         (!memcmp( instr_ctx->txn_ctx->borrowed_accounts[program_id_idx].const_meta->info.owner, fd_solana_bpf_loader_deprecated_program_id.key, sizeof(fd_pubkey_t) ));
+  uchar is_deprecated  = ( program_id_idx < instr_ctx->txn_ctx->accounts_cnt ) &&
+                         ( !memcmp( instr_ctx->txn_ctx->borrowed_accounts[program_id_idx].const_meta->info.owner, fd_solana_bpf_loader_deprecated_program_id.key, sizeof(fd_pubkey_t) ) );
 
   if( is_deprecated ) {
     fd_bpf_loader_input_serialize_unaligned( *instr_ctx,