diff --git a/test/suite/hmg/flippers_wraps.yaml b/test/suite/hmg/flippers_wraps.yaml
index 3418b4ec..9971a38e 100644
--- a/test/suite/hmg/flippers_wraps.yaml
+++ b/test/suite/hmg/flippers_wraps.yaml
@@ -19,8 +19,6 @@ advanced_placements:
       locations:
         Link's House: True
         Magic Bat: False
-advanced_placements:
-  1:
     - type: Verification
       item: Progressive Glove
       locations:
diff --git a/test/suite/hmg/inverted_inaccessible_desert.yaml b/test/suite/hmg/inverted_inaccessible_desert.yaml
index bb8ad8aa..5e59ca63 100644
--- a/test/suite/hmg/inverted_inaccessible_desert.yaml
+++ b/test/suite/hmg/inverted_inaccessible_desert.yaml
@@ -5,7 +5,6 @@ settings:
     logic: hybridglitches
     mode: inverted
     shuffle: crossed
-
 start_inventory:
   1:
     - Pegasus Boots
diff --git a/test/suite/hmg/inverted_moon_pearl_locs.yaml b/test/suite/hmg/inverted_moon_pearl_locs.yaml
index 9ae1a9e1..23ec40fe 100644
--- a/test/suite/hmg/inverted_moon_pearl_locs.yaml
+++ b/test/suite/hmg/inverted_moon_pearl_locs.yaml
@@ -15,6 +15,9 @@ start_inventory:
     - Ether
     - Quake
     - Bombos
+    - Big Key (Tower of Hera)
+    - Big Key (Desert Palace)
+    - Big Key (Eastern Palace)
 advanced_placements:
   1:
     - type: Verification
diff --git a/test/suite/hmg/moon_pearl_locs.yaml b/test/suite/hmg/moon_pearl_locs.yaml
index a18d53d1..13a37f92 100644
--- a/test/suite/hmg/moon_pearl_locs.yaml
+++ b/test/suite/hmg/moon_pearl_locs.yaml
@@ -3,6 +3,7 @@ meta:
 settings:
   1:
     logic: hybridglitches
+    shuffle: vanilla
 start_inventory:
   1:
     - Pegasus Boots
@@ -10,9 +11,8 @@ start_inventory:
     - Fire Rod
     - Book of Mudora
     - Progressive Sword
-    - Progressive Sword
     - Lamp
-    - Magic Mirror
+    - Hammer
     - Ether
     - Quake
     - Bombos
diff --git a/test/suite/hmg/no_east_dw_from_kikiskip.yaml b/test/suite/hmg/no_east_dw_from_kikiskip.yaml
new file mode 100644
index 00000000..af5ac2ce
--- /dev/null
+++ b/test/suite/hmg/no_east_dw_from_kikiskip.yaml
@@ -0,0 +1,49 @@
+meta:
+  players: 1
+settings:
+  1:
+    logic: hybridglitches
+    shuffle: vanilla
+start_inventory:
+  1:
+    - Pegasus Boots
+    - Flippers
+    - Fire Rod
+    - Book of Mudora
+    - Progressive Sword
+    - Lamp
+    - Hammer
+    - Ether
+    - Quake
+    - Bombos
+    - Bombs (10)
+placements:
+  1:
+    # Put mirror in PF so we can't DMD
+    Pyramid Fairy - Right: Magic Mirror
+    # Lock all swords and cape behind pearl so we can't do aga 1 for pyramid access
+    Thieves' Town - Big Chest: Progressive Sword
+    Thieves' Town - Attic: Progressive Sword
+    Thieves' Town - Blind's Cell: Progressive Sword
+    Thieves' Town - Map Chest: Cape
+advanced_placements:
+  1:
+    - type: Verification
+      item: Moon Pearl
+      locations:
+        Palace of Darkness - Shooter Room: True
+        Palace of Darkness - The Arena - Bridge: True
+        Palace of Darkness - Stalfos Basement: True
+        Palace of Darkness - Big Key Chest: True
+        Palace of Darkness - The Arena - Ledge: True
+        Palace of Darkness - Map Chest: True
+        Palace of Darkness - Compass Chest: True
+        Palace of Darkness - Dark Basement - Left: True
+        Palace of Darkness - Dark Basement - Right: True
+        Palace of Darkness - Dark Maze - Top: True
+        Palace of Darkness - Dark Maze - Bottom: True
+        Palace of Darkness - Big Chest: True
+        Palace of Darkness - Harmless Hellway: True
+        Palace of Darkness - Boss: True
+        Pyramid Fairy - Left: False
+        Pyramid: False
diff --git a/test/suite/hmg/pearlless_sw.yaml b/test/suite/hmg/pearlless_sw.yaml
index c26ce1d9..3b097028 100644
--- a/test/suite/hmg/pearlless_sw.yaml
+++ b/test/suite/hmg/pearlless_sw.yaml
@@ -9,6 +9,7 @@ start_inventory:
     - Flippers
     - Pegasus Boots
     - Progressive Sword
+    - Progressive Sword
     - Hammer
     - Progressive Glove
     - Progressive Glove
@@ -17,9 +18,16 @@ start_inventory:
     - Bottle
     - Magic Mirror
     - Lamp
+    - Beat Agahnim 1
+    - Cane of Somaria
+    - Hookshot
+    - Quake
+    - Ether
+    - Bombos
 advanced_placements:
   1:
     - type: Verification
       item: Moon Pearl
       locations:
         Skull Woods - Bridge Room: True
+        Skull Woods - Boss: True