diff --git a/.run/Archipelago Unittests.run.xml b/.run/Archipelago Unittests.run.xml
index 24fea0f73fec..59e6f263ae37 100644
--- a/.run/Archipelago Unittests.run.xml	
+++ b/.run/Archipelago Unittests.run.xml	
@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Archipelago Unittests" type="tests" factoryName="Unittests">
-    <module name="Archipelago" />
+    <module name="Archipelago-Integration" />
+    <option name="ENV_FILES" value="" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <option name="SDK_HOME" value="" />
diff --git a/worlds/am2r/__init__.py b/worlds/am2r/__init__.py
index 043c9288e1c0..bbc9be41aabd 100644
--- a/worlds/am2r/__init__.py
+++ b/worlds/am2r/__init__.py
@@ -4,7 +4,7 @@
 from .items import item_table
 from .locations import get_location_datas, EventId
 from .regions import create_regions_and_locations
-from BaseClasses import Tutorial, Item
+from BaseClasses import Tutorial, Item, ItemClassification
 from .options import AM2R_options, LocationSettings
 from worlds.AutoWorld import World, WebWorld
 from worlds.LauncherComponents import Component, components, Type, launch_subprocess
@@ -52,10 +52,14 @@ def fill_slot_data(self) -> Dict[str, object]:
 
     def create_regions(self) -> None:
         create_regions_and_locations(self.multiworld, self.player)
+        self.multiworld.get_location("The Last Metroid is in Captivity", self.player).place_locked_item(self.create_event("The Galaxy is at Peace"))
 
     def create_item(self, name: str) -> Item:
         return items.create_item(self.player, name)
 
+    def create_event(self, event: str):
+        return Item(event, ItemClassification.progression, None, self.player)
+
     def create_items(self) -> None:
         if self.options.MetroidsRequired > self.options.MetroidsInPool:
             logger.warning(f"Metroids in pool raised to {self.options.MetroidsRequired.value} for {self.multiworld.get_player_name(self.player)} because the given count was too low for the requirement.")
@@ -113,7 +117,6 @@ def create_items(self) -> None:
             self.multiworld.exclude_locations[self.player].value.add("Deep Caves: Ramulken Lava Pool")
             self.multiworld.exclude_locations[self.player].value.add("Deep Caves: After Omega")
 
-        self.multiworld.get_location("The Last Metroid is in Captivity", self.player).place_locked_item(self.create_item("The Galaxy is at Peace"))
         items.create_all_items(self.multiworld, self.player)
 
     def set_rules(self) -> None:
diff --git a/worlds/am2r/items.py b/worlds/am2r/items.py
index 38e951a17633..b7fe89d23ef5 100644
--- a/worlds/am2r/items.py
+++ b/worlds/am2r/items.py
@@ -134,7 +134,6 @@ def create_all_items(multiworld: MultiWorld, player: int) -> None:
     "OHKO Trap":                ItemData(108678026, "Trap", ItemClassification.trap, 25),
     "Touhou Trap":              ItemData(108678027, "Trap", ItemClassification.trap, 26),
     "Metroid":                  ItemData(108678025, "MacGuffin", ItemClassification.progression_skip_balancing, 19),
-    "The Galaxy is at Peace":   ItemData(None, "", ItemClassification.progression)
 
 }
 filler_weights: Dict[str, int] = {
diff --git a/worlds/am2r/regions.py b/worlds/am2r/regions.py
index 3dc82fb60179..fe2a399a09b8 100644
--- a/worlds/am2r/regions.py
+++ b/worlds/am2r/regions.py
@@ -181,7 +181,7 @@ def create_regions_and_locations(world: MultiWorld, player: int):
     connect(world, player, "Pipe Hell L", "Fast Travel", lambda state: state.has("Screw Attack", player)),
     connect(world, player, "Fast Travel", "Pipe Hell L", lambda state: state.has("Screw Attack", player)),
 
-    connect(world, player, "Fast Travel", "Gravity", lambda state: state.has("Gravity Suit", player) and state.has("Space Jump")),  # one way transition due to crumbles
+    connect(world, player, "Fast Travel", "Gravity", lambda state: state.has("Gravity Suit", player) and state.has("Space Jump", player)),  # one way transition due to crumbles
 
     connect(world, player, "Fast Travel", "Underwater Distribution Center"),
     connect(world, player, "Underwater Distribution Center", "Fast Travel", lambda state: state.can_reach("Fast Travel", "Region", player)),