diff --git a/common/src/gametest/resources/data/lithium-gametest/gametest/structure/test_redstone.ai_johnny_witch_throw_regeneration.snbt b/common/src/gametest/resources/data/lithium-gametest/gametest/structure/test_redstone.ai_johnny_witch_throw_regeneration.snbt
index 5b7541ff1..59a791e21 100644
--- a/common/src/gametest/resources/data/lithium-gametest/gametest/structure/test_redstone.ai_johnny_witch_throw_regeneration.snbt
+++ b/common/src/gametest/resources/data/lithium-gametest/gametest/structure/test_redstone.ai_johnny_witch_throw_regeneration.snbt
@@ -1,10 +1,10 @@
 {
-    DataVersion: 3953,
+    DataVersion: 4189,
     size: [3, 5, 1],
     data: [
         {pos: [0, 0, 0], state: "minecraft:command_block{conditional:false,facing:up}", nbt: {Command: "/summon minecraft:vindicator ~ ~.5 ~ {Patrolling: 1b, CanJoinRaid: 1b, PatrolLeader: 1b, CustomName: '\"Johnny\"', ArmorItems: [{}, {}, {}, {id: \"minecraft:white_banner\", tag: {display: {Name: '{\"translate\":\"block.minecraft.ominous_banner\",\"color\":\"gold\"}'}, HideFlags: 32, BlockEntityTag: {id: \"minecraft:banner\", Patterns: [{Pattern: \"mr\", Color: 9}, {Pattern: \"bs\", Color: 8}, {Pattern: \"cs\", Color: 7}, {Pattern: \"bo\", Color: 8}, {Pattern: \"ms\", Color: 15}, {Pattern: \"hh\", Color: 8}, {Pattern: \"mc\", Color: 8}, {Pattern: \"bo\", Color: 15}]}}, Count: 1b}], RaidId: 5, HandItems: [{id: \"minecraft:iron_axe\", tag: {Damage: 0}, Count: 1b}, {}], Wave: 1, PersistenceRequired: 1b, Johnny: 1b}", SuccessCount: 0, TrackOutput: 1b, UpdateLastExecution: 1b, auto: 0b, conditionMet: 0b, id: "minecraft:command_block", powered: 0b}},
         {pos: [1, 0, 0], state: "minecraft:red_terracotta"},
-        {pos: [2, 0, 0], state: "minecraft:command_block{conditional:false,facing:up}", nbt: {Command: "summon witch ~ ~.5 ~", SuccessCount: 0, TrackOutput: 1b, UpdateLastExecution: 1b, auto: 0b, conditionMet: 0b, id: "minecraft:command_block", powered: 0b}},
+        {pos: [2, 0, 0], state: "minecraft:command_block{conditional:false,facing:up}", nbt: {Command: "summon witch ~ ~.5 ~ {PersistenceRequired:1b}", SuccessCount: 0, TrackOutput: 1b, UpdateLastExecution: 1b, auto: 0b, conditionMet: 0b, id: "minecraft:command_block", powered: 0b}},
         {pos: [0, 1, 0], state: "minecraft:air"},
         {pos: [1, 1, 0], state: "minecraft:white_stained_glass"},
         {pos: [2, 1, 0], state: "minecraft:air"},
diff --git a/common/src/gametest/resources/data/lithium-gametest/gametest/structure/test_redstone.tnt_knockback_entity.snbt b/common/src/gametest/resources/data/lithium-gametest/gametest/structure/test_redstone.tnt_knockback_entity.snbt
index e9e15e090..202e7ebbb 100644
--- a/common/src/gametest/resources/data/lithium-gametest/gametest/structure/test_redstone.tnt_knockback_entity.snbt
+++ b/common/src/gametest/resources/data/lithium-gametest/gametest/structure/test_redstone.tnt_knockback_entity.snbt
@@ -1,5 +1,5 @@
 {
-    DataVersion: 3953,
+    DataVersion: 4189,
     size: [5, 5, 5],
     data: [
         {pos: [0, 0, 0], state: "minecraft:bedrock"},
@@ -12,7 +12,7 @@
         {pos: [1, 0, 2], state: "minecraft:red_terracotta"},
         {pos: [1, 0, 3], state: "minecraft:bedrock"},
         {pos: [1, 0, 4], state: "minecraft:bedrock"},
-        {pos: [2, 0, 0], state: "minecraft:command_block{conditional:false,facing:up}", nbt: {Command: "summon witch ~ ~.5 ~", SuccessCount: 0, TrackOutput: 1b, UpdateLastExecution: 1b, auto: 0b, conditionMet: 0b, id: "minecraft:command_block", powered: 0b}},
+        {pos: [2, 0, 0], state: "minecraft:command_block{conditional:false,facing:up}", nbt: {Command: "summon witch ~ ~.5 ~ {PersistenceRequired:1b}", SuccessCount: 0, TrackOutput: 1b, UpdateLastExecution: 1b, auto: 0b, conditionMet: 0b, id: "minecraft:command_block", powered: 0b}},
         {pos: [2, 0, 1], state: "minecraft:bedrock"},
         {pos: [2, 0, 2], state: "minecraft:command_block{conditional:false,facing:up}", nbt: {Command: "summon tnt ~ ~.5 ~", SuccessCount: 0, TrackOutput: 1b, UpdateLastExecution: 1b, auto: 0b, conditionMet: 0b, id: "minecraft:command_block", powered: 0b}},
         {pos: [2, 0, 3], state: "minecraft:bedrock"},