diff --git a/test/dungeons/TestDungeon.py b/test/dungeons/TestDungeon.py
index 1ebc6b29..be59c359 100644
--- a/test/dungeons/TestDungeon.py
+++ b/test/dungeons/TestDungeon.py
@@ -30,8 +30,8 @@ class TestDungeon(unittest.TestCase):
         connect_simple(self.world, 'Big Bomb Shop', 'Big Bomb Shop', 1)
         self.world.get_region('Menu', 1).exits = []
         self.world.swamp_patch_required[1] = True
-        set_rules(self.world, 1)
-        generate_itempool(self.world, 1)
+        self.world.worlds[1].set_rules()
+        self.world.worlds[1].create_items()
         self.world.itempool.extend(get_dungeon_item_pool(self.world))
         self.world.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
 
diff --git a/test/inverted/TestInverted.py b/test/inverted/TestInverted.py
index cb38adc8..0f76b353 100644
--- a/test/inverted/TestInverted.py
+++ b/test/inverted/TestInverted.py
@@ -26,11 +26,11 @@ class TestInverted(TestBase):
         create_dungeons(self.world, 1)
         create_shops(self.world, 1)
         link_inverted_entrances(self.world, 1)
-        generate_itempool(self.world, 1)
+        self.world.worlds[1].create_items()
         self.world.required_medallions[1] = ['Ether', 'Quake']
         self.world.itempool.extend(get_dungeon_item_pool(self.world))
         self.world.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
         self.world.get_location('Agahnim 1', 1).item = None
         self.world.get_location('Agahnim 2', 1).item = None
         mark_light_world_regions(self.world, 1)
-        set_rules(self.world, 1)
+        self.world.worlds[1].set_rules()
diff --git a/test/inverted_minor_glitches/TestInvertedMinor.py b/test/inverted_minor_glitches/TestInvertedMinor.py
index ac698d29..570de3fc 100644
--- a/test/inverted_minor_glitches/TestInvertedMinor.py
+++ b/test/inverted_minor_glitches/TestInvertedMinor.py
@@ -27,11 +27,11 @@ class TestInvertedMinor(TestBase):
         create_dungeons(self.world, 1)
         create_shops(self.world, 1)
         link_inverted_entrances(self.world, 1)
-        generate_itempool(self.world, 1)
+        self.world.worlds[1].create_items()
         self.world.required_medallions[1] = ['Ether', 'Quake']
         self.world.itempool.extend(get_dungeon_item_pool(self.world))
         self.world.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
         self.world.get_location('Agahnim 1', 1).item = None
         self.world.get_location('Agahnim 2', 1).item = None
         mark_light_world_regions(self.world, 1)
-        set_rules(self.world, 1)
+        self.world.worlds[1].set_rules()
diff --git a/test/inverted_owg/TestInvertedOWG.py b/test/inverted_owg/TestInvertedOWG.py
index 754a2702..ba779043 100644
--- a/test/inverted_owg/TestInvertedOWG.py
+++ b/test/inverted_owg/TestInvertedOWG.py
@@ -28,7 +28,7 @@ class TestInvertedOWG(TestBase):
         create_dungeons(self.world, 1)
         create_shops(self.world, 1)
         link_inverted_entrances(self.world, 1)
-        generate_itempool(self.world, 1)
+        self.world.worlds[1].create_items()
         self.world.required_medallions[1] = ['Ether', 'Quake']
         self.world.itempool.extend(get_dungeon_item_pool(self.world))
         self.world.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
@@ -37,4 +37,4 @@ class TestInvertedOWG(TestBase):
         self.world.precollected_items.clear()
         self.world.itempool.append(ItemFactory('Pegasus Boots', 1))
         mark_light_world_regions(self.world, 1)
-        set_rules(self.world, 1)
+        self.world.worlds[1].set_rules()
diff --git a/test/minor_glitches/TestMinor.py b/test/minor_glitches/TestMinor.py
index 101d2c6e..f86216ae 100644
--- a/test/minor_glitches/TestMinor.py
+++ b/test/minor_glitches/TestMinor.py
@@ -26,11 +26,11 @@ class TestMinor(TestBase):
         create_dungeons(self.world, 1)
         create_shops(self.world, 1)
         link_entrances(self.world, 1)
-        generate_itempool(self.world, 1)
+        self.world.worlds[1].create_items()
         self.world.required_medallions[1] = ['Ether', 'Quake']
         self.world.itempool.extend(get_dungeon_item_pool(self.world))
         self.world.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
         self.world.get_location('Agahnim 1', 1).item = None
         self.world.get_location('Agahnim 2', 1).item = None
         mark_dark_world_regions(self.world, 1)
-        set_rules(self.world, 1)
\ No newline at end of file
+        self.world.worlds[1].set_rules()
\ No newline at end of file
diff --git a/test/owg/TestVanillaOWG.py b/test/owg/TestVanillaOWG.py
index 5149c24c..81acd492 100644
--- a/test/owg/TestVanillaOWG.py
+++ b/test/owg/TestVanillaOWG.py
@@ -27,7 +27,7 @@ class TestVanillaOWG(TestBase):
         create_dungeons(self.world, 1)
         create_shops(self.world, 1)
         link_entrances(self.world, 1)
-        generate_itempool(self.world, 1)
+        self.world.worlds[1].create_items()
         self.world.required_medallions[1] = ['Ether', 'Quake']
         self.world.itempool.extend(get_dungeon_item_pool(self.world))
         self.world.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
@@ -36,4 +36,4 @@ class TestVanillaOWG(TestBase):
         self.world.precollected_items.clear()
         self.world.itempool.append(ItemFactory('Pegasus Boots', 1))
         mark_dark_world_regions(self.world, 1)
-        set_rules(self.world, 1)
\ No newline at end of file
+        self.world.worlds[1].set_rules()
\ No newline at end of file
diff --git a/test/vanilla/TestVanilla.py b/test/vanilla/TestVanilla.py
index 9eb5d0e0..0e6208d8 100644
--- a/test/vanilla/TestVanilla.py
+++ b/test/vanilla/TestVanilla.py
@@ -25,11 +25,11 @@ class TestVanilla(TestBase):
         create_dungeons(self.world, 1)
         create_shops(self.world, 1)
         link_entrances(self.world, 1)
-        generate_itempool(self.world, 1)
+        self.world.worlds[1].create_items()
         self.world.required_medallions[1] = ['Ether', 'Quake']
         self.world.itempool.extend(get_dungeon_item_pool(self.world))
         self.world.itempool.extend(ItemFactory(['Green Pendant', 'Red Pendant', 'Blue Pendant', 'Beat Agahnim 1', 'Beat Agahnim 2', 'Crystal 1', 'Crystal 2', 'Crystal 3', 'Crystal 4', 'Crystal 5', 'Crystal 6', 'Crystal 7'], 1))
         self.world.get_location('Agahnim 1', 1).item = None
         self.world.get_location('Agahnim 2', 1).item = None
         mark_dark_world_regions(self.world, 1)
-        set_rules(self.world, 1)
\ No newline at end of file
+        self.world.worlds[1].set_rules()
\ No newline at end of file