diff --git a/TsRandomizer.Tests/ForwardFillingRandomizerFixture.cs b/TsRandomizer.Tests/ForwardFillingRandomizerFixture.cs
index e8f0d6c5..742703b2 100644
--- a/TsRandomizer.Tests/ForwardFillingRandomizerFixture.cs
+++ b/TsRandomizer.Tests/ForwardFillingRandomizerFixture.cs
@@ -16,7 +16,7 @@ public void Should_generate_beatable_seed_in_1_pass()
 			var seed = new Seed(1U, SeedOptions.None);
 			var unlockingMap = new ItemUnlockingMap(seed);
 			var itemProvder = new ItemInfoProvider(SeedOptions.None, unlockingMap);
-			var itemLocations = new ItemLocationMap(itemProvder);
+			var itemLocations = new ItemLocationMap(itemProvder, unlockingMap);
 
 			ForwardFillingItemLocationRandomizer.AddRandomItemsToLocationMap(seed, itemProvder, unlockingMap, itemLocations, true);
 
@@ -33,7 +33,7 @@ public void Should_fill_tuturial_with_melee_and_spellorb(uint seedIndex)
 			var seed = new Seed(seedIndex, SeedOptions.None);
 			var unlockingMap = new ItemUnlockingMap(seed);
 			var itemProvder = new ItemInfoProvider(SeedOptions.None, unlockingMap);
-			var itemLocations = new ItemLocationMap(itemProvder);
+			var itemLocations = new ItemLocationMap(itemProvder, unlockingMap);
 
 			ForwardFillingItemLocationRandomizer.AddRandomItemsToLocationMap(seed, itemProvder, unlockingMap, itemLocations, true);
 
diff --git a/TsRandomizer.Tests/ItemLocationMapFixture.cs b/TsRandomizer.Tests/ItemLocationMapFixture.cs
index a82b0c2d..7da26a83 100644
--- a/TsRandomizer.Tests/ItemLocationMapFixture.cs
+++ b/TsRandomizer.Tests/ItemLocationMapFixture.cs
@@ -12,7 +12,8 @@ class ItemLocationMapFixture
 		[Test]
 		public void With_no_items_only_6_item_locatios_should_be_accessable()
 		{
-			var itemLocations = new ItemLocationMap(new ItemInfoProvider(SeedOptions.None, new ItemUnlockingMap(Seed.Zero)));
+			var unlockingMap = new ItemUnlockingMap(Seed.Zero);
+			var itemLocations = new ItemLocationMap(new ItemInfoProvider(SeedOptions.None, unlockingMap), unlockingMap);
 
 			var accessableLocations = itemLocations.GetReachableLocations(Requirement.None).ToArray();
 
@@ -27,7 +28,8 @@ public void With_no_items_only_6_item_locatios_should_be_accessable()
 		[Test]
 		public void With_doubejump_timestop_spindle_and_cardD_should_get_access_to_past()
 		{
-			var itemLocations = new ItemLocationMap(new ItemInfoProvider(SeedOptions.None, new ItemUnlockingMap(Seed.Zero)));
+			var unlockingMap = new ItemUnlockingMap(Seed.Zero);
+			var itemLocations = new ItemLocationMap(new ItemInfoProvider(SeedOptions.None, unlockingMap), unlockingMap);
 
 			var accessableLocations = itemLocations.GetReachableLocations(
 					Requirement.DoubleJump | Requirement.GateAccessToPast | Requirement.Swimming)
@@ -39,7 +41,8 @@ public void With_doubejump_timestop_spindle_and_cardD_should_get_access_to_past(
 		[Test]
 		public void With_given_requirements_shoud_mark_captians_chests_as_available()
 		{
-			var itemLocations = new ItemLocationMap(new ItemInfoProvider(SeedOptions.None, new ItemUnlockingMap(Seed.Zero)));
+			var unlockingMap = new ItemUnlockingMap(Seed.Zero);
+			var itemLocations = new ItemLocationMap(new ItemInfoProvider(SeedOptions.None, unlockingMap), unlockingMap);
 
 			var accessableLocations = itemLocations.GetReachableLocations(
 					Requirement.GassMask | Requirement.AntiWeed | Requirement.Swimming | Requirement.GateLakeSirineRight | Requirement.DoubleJump)
diff --git a/TsRandomizer.Tests/RandomFillingRandomizerFixture.cs b/TsRandomizer.Tests/RandomFillingRandomizerFixture.cs
index 59476f91..511a5c22 100644
--- a/TsRandomizer.Tests/RandomFillingRandomizerFixture.cs
+++ b/TsRandomizer.Tests/RandomFillingRandomizerFixture.cs
@@ -19,7 +19,7 @@ public void Should_fill_tuturial_with_melee_and_spellorb(uint seedIndex)
 			var seed = new Seed(seedIndex, SeedOptions.None);
 			var unlockingMap = new ItemUnlockingMap(seed);
 			var itemProvider = new ItemInfoProvider(SeedOptions.None, unlockingMap);
-			var itemLocations = new ItemLocationMap(itemProvider);
+			var itemLocations = new ItemLocationMap(itemProvider, unlockingMap);
 
 			FullRandomItemLocationRandomizer.AddRandomItemsToLocationMap(seed, itemProvider, unlockingMap, itemLocations, true);