diff --git a/proto/common.proto b/proto/common.proto
index e3a901c40b..8fd9d2906b 100644
--- a/proto/common.proto
+++ b/proto/common.proto
@@ -927,8 +927,10 @@ enum EnchantType {
 
 // Contains only the Enchant info needed by the sim.
 message SimEnchant {
-	int32 effect_id = 1;
-	repeated double stats = 2;
+        int32 effect_id = 1;
+        repeated double stats = 2;
+        string name = 3; // Only needed for unit tests.
+        ItemType type = 4; // Only needed for unit tests.
 }
 
 // Contains only the Gem info needed by the sim.
diff --git a/sim/common/wotlk/enchant_effects.go b/sim/common/wotlk/enchant_effects.go
index 201d2ac020..429026c4d9 100644
--- a/sim/common/wotlk/enchant_effects.go
+++ b/sim/common/wotlk/enchant_effects.go
@@ -242,7 +242,7 @@ func init() {
 	})
 
 	// Enchant: 3843, Spell: 61471 - Diamond-cut Refractor Scope
-	core.AddWeaponEffect(3843, func(agent core.Agent, _ proto.ItemSlot) {
+	core.NewEnchantEffect(3843, func(agent core.Agent) {
 		w := agent.GetCharacter().AutoAttacks.Ranged()
 		w.BaseDamageMin += 15
 		w.BaseDamageMax += 15
diff --git a/sim/core/database.go b/sim/core/database.go
index b3e3858902..6e6e55854a 100644
--- a/sim/core/database.go
+++ b/sim/core/database.go
@@ -209,12 +209,16 @@ func RandomSuffixFromProto(pData *proto.ItemRandomSuffix) RandomSuffix {
 type Enchant struct {
 	EffectID int32 // Used by UI to apply effect to tooltip
 	Stats    stats.Stats
+	Name     string         // Only needed for unit tests
+	Type     proto.ItemType // Only needed for unit tests
 }
 
 func EnchantFromProto(pData *proto.SimEnchant) Enchant {
 	return Enchant{
 		EffectID: pData.EffectId,
 		Stats:    stats.FromProtoArray(pData.Stats),
+		Name:     pData.Name,
+		Type:     pData.Type,
 	}
 }
 
@@ -345,6 +349,16 @@ func (equipment *Equipment) EquipItem(item Item) {
 	}
 }
 
+func (equipment *Equipment) EquipEnchant(enchant Enchant) {
+	// Some shield enchants parse as ItemTypeUnknown, so default those to
+	// the OH slot to ensure they still get tested.
+	if enchant.Type == proto.ItemType_ItemTypeUnknown {
+		equipment.OffHand().Enchant = enchant
+	} else {
+		equipment[ItemTypeToSlot(enchant.Type)].Enchant = enchant
+	}
+}
+
 func (equipment *Equipment) containsEnchantInSlot(effectID int32, slot proto.ItemSlot) bool {
 	return (equipment[slot].Enchant.EffectID == effectID) || (equipment[slot].TempEnchant == effectID)
 }
diff --git a/sim/core/database_load.go b/sim/core/database_load.go
index 740b37a8e5..67bbabef8b 100644
--- a/sim/core/database_load.go
+++ b/sim/core/database_load.go
@@ -53,6 +53,8 @@ func init() {
 		simDB.Enchants[i] = &proto.SimEnchant{
 			EffectId: enchant.EffectId,
 			Stats:    enchant.Stats,
+			Name:     enchant.Name,
+			Type:     enchant.Type,
 		}
 	}
 
diff --git a/sim/core/item_effects.go b/sim/core/item_effects.go
index e2a7d1e1af..35b54d8556 100644
--- a/sim/core/item_effects.go
+++ b/sim/core/item_effects.go
@@ -6,7 +6,6 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/wowsims/cata/sim/core/proto"
 	"github.com/wowsims/cata/sim/core/stats"
 )
 
@@ -16,15 +15,12 @@ import (
 // but there are occasionally class-specific item effects.
 type ApplyEffect func(Agent)
 
-// Function for applying permanent effects to an agent's weapon
-type ApplyWeaponEffect func(Agent, proto.ItemSlot)
-
 var itemEffects = map[int32]ApplyEffect{}
-var weaponEffects = map[int32]ApplyWeaponEffect{}
 var enchantEffects = map[int32]ApplyEffect{}
 
 // IDs of item effects which should be used for tests.
 var itemEffectsForTest []int32
+var enchantEffectsForTest []int32
 
 // This value can be set before adding item effects, to control whether they are included in tests.
 var AddEffectsToTest = true
@@ -37,11 +33,6 @@ func HasItemEffectForTest(id int32) bool {
 	return slices.Contains(itemEffectsForTest, id)
 }
 
-func HasWeaponEffect(id int32) bool {
-	_, ok := weaponEffects[id]
-	return ok
-}
-
 func HasEnchantEffect(id int32) bool {
 	_, ok := enchantEffects[id]
 	return ok
@@ -80,22 +71,13 @@ func NewEnchantEffect(id int32, enchantEffect ApplyEffect) {
 	}
 
 	enchantEffects[id] = enchantEffect
-}
-
-func AddWeaponEffect(id int32, weaponEffect ApplyWeaponEffect) {
-	if WITH_DB {
-		if _, ok := EnchantsByEffectID[id]; !ok {
-			panic(fmt.Sprintf("No enchant with ID: %d", id))
-		}
-	}
-	if HasWeaponEffect(id) {
-		panic(fmt.Sprintf("Cannot add multiple effects for one item: %d, %#v", id, weaponEffect))
+	if AddEffectsToTest {
+		enchantEffectsForTest = append(enchantEffectsForTest, id)
 	}
-	weaponEffects[id] = weaponEffect
 }
 
 func (equipment *Equipment) applyItemEffects(agent Agent, registeredItemEffects map[int32]bool, registeredItemEnchantEffects map[int32]bool, includeGemEffects bool) {
-	for slot, eq := range equipment {
+	for _, eq := range equipment {
 		if applyItemEffect, ok := itemEffects[eq.ID]; ok && !registeredItemEffects[eq.ID] {
 			applyItemEffect(agent)
 			registeredItemEffects[eq.ID] = true
@@ -113,12 +95,6 @@ func (equipment *Equipment) applyItemEffects(agent Agent, registeredItemEffects
 			applyEnchantEffect(agent)
 			registeredItemEnchantEffects[eq.Enchant.EffectID] = true
 		}
-
-		if applyWeaponEffect, ok := weaponEffects[eq.Enchant.EffectID]; ok && !registeredItemEnchantEffects[eq.Enchant.EffectID] {
-			applyWeaponEffect(agent, proto.ItemSlot(slot))
-			registeredItemEnchantEffects[eq.Enchant.EffectID] = true
-		}
-
 	}
 }
 
diff --git a/sim/core/test_generators.go b/sim/core/test_generators.go
index 5580aa6d10..127dbbb8da 100644
--- a/sim/core/test_generators.go
+++ b/sim/core/test_generators.go
@@ -232,6 +232,9 @@ type ItemFilter struct {
 
 	// Item IDs to ignore.
 	IDBlacklist []int32
+
+	// Effect IDs to ignore.
+	EnchantBlacklist []int32
 }
 
 // Returns whether the given item matches the conditions of this filter.
@@ -314,6 +317,22 @@ func (filter *ItemFilter) FindAllMetaGems() []Gem {
 	return filteredGems
 }
 
+func (filter *ItemFilter) FindAllEnchants() []Enchant {
+	filteredEnchantIDs := FilterSlice(enchantEffectsForTest, func(id int32) bool {
+		return !slices.Contains(filter.EnchantBlacklist, id)
+	})
+
+	return MapSlice(filteredEnchantIDs, func(id int32) Enchant {
+		enchant, ok := EnchantsByEffectID[id]
+
+		if !ok {
+			panic(fmt.Sprintf("No DB data for enchant with id: %d", id))
+		}
+
+		return enchant
+	})
+}
+
 type ItemsTestGenerator struct {
 	// Fields describing the base API request.
 	Player     *proto.Player
@@ -333,6 +352,7 @@ type ItemsTestGenerator struct {
 	sets  []*ItemSet
 
 	metagems []Gem
+	enchants []Enchant
 
 	metaSocketIdx int
 }
@@ -349,10 +369,15 @@ func (generator *ItemsTestGenerator) init() {
 	}
 	for _, itemSpec := range generator.Player.Equipment.Items {
 		generator.ItemFilter.IDBlacklist = append(generator.ItemFilter.IDBlacklist, itemSpec.Id)
+
+		if itemSpec.Enchant != 0 {
+			generator.ItemFilter.EnchantBlacklist = append(generator.ItemFilter.EnchantBlacklist, itemSpec.Enchant)
+		}
 	}
 
 	generator.items = generator.ItemFilter.FindAllItems()
 	generator.sets = generator.ItemFilter.FindAllSets()
+	generator.enchants = generator.ItemFilter.FindAllEnchants()
 
 	baseEquipment := ProtoToEquipment(generator.Player.Equipment)
 	generator.metaSocketIdx = -1
@@ -370,7 +395,7 @@ func (generator *ItemsTestGenerator) init() {
 
 func (generator *ItemsTestGenerator) NumTests() int {
 	generator.init()
-	return len(generator.items) + len(generator.sets) + len(generator.metagems)
+	return len(generator.items) + len(generator.sets) + len(generator.metagems) + len(generator.enchants)
 }
 
 func (generator *ItemsTestGenerator) GetTest(testIdx int) (string, *proto.ComputeStatsRequest, *proto.StatWeightsRequest, *proto.RaidSimRequest) {
@@ -389,7 +414,7 @@ func (generator *ItemsTestGenerator) GetTest(testIdx int) (string, *proto.Comput
 			equipment.EquipItem(setItem)
 		}
 		label = strings.ReplaceAll(testSet.Name, " ", "")
-	} else {
+	} else if testIdx < len(generator.items)+len(generator.sets)+len(generator.metagems) {
 		testMetaGem := generator.metagems[testIdx-len(generator.items)-len(generator.sets)]
 		headItem := &equipment[proto.ItemSlot_ItemSlotHead]
 		for len(headItem.Gems) <= generator.metaSocketIdx {
@@ -397,6 +422,10 @@ func (generator *ItemsTestGenerator) GetTest(testIdx int) (string, *proto.Comput
 		}
 		headItem.Gems[generator.metaSocketIdx] = testMetaGem
 		label = strings.ReplaceAll(testMetaGem.Name, " ", "")
+	} else {
+		testEnchant := generator.enchants[testIdx-len(generator.items)-len(generator.sets)-len(generator.metagems)]
+		equipment.EquipEnchant(testEnchant)
+		label = fmt.Sprintf("%s-%d", strings.ReplaceAll(testEnchant.Name, " ", ""), testEnchant.EffectID)
 	}
 	playerCopy.Equipment = equipment.ToEquipmentSpecProto()
 
diff --git a/sim/death_knight/blood/TestBlood.results b/sim/death_knight/blood/TestBlood.results
index db05378df7..f82cb2029f 100644
--- a/sim/death_knight/blood/TestBlood.results
+++ b/sim/death_knight/blood/TestBlood.results
@@ -459,6 +459,22 @@ dps_results: {
   hps: 5300.29889
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 21920.69271
+  tps: 110263.55595
+  hps: 5932.88695
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 21920.69271
+  tps: 110263.55595
+  hps: 5932.88695
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -555,6 +571,14 @@ dps_results: {
   hps: 5936.82296
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 21971.2473
+  tps: 110542.97145
+  hps: 5935.7523
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -603,6 +627,14 @@ dps_results: {
   hps: 5639.81071
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 21971.2473
+  tps: 110542.97145
+  hps: 5935.7523
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -611,6 +643,166 @@ dps_results: {
   hps: 5934.59532
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 21988.91988
+  tps: 110648.69774
+  hps: 5921.80612
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 21971.2473
+  tps: 110542.97145
+  hps: 5921.80612
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 21971.2473
+  tps: 110542.97145
+  hps: 5928.77921
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 21920.69271
+  tps: 108058.28484
+  hps: 5932.88695
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 21878.59134
+  tps: 112244.31458
+  hps: 5935.7523
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 20007.46599
+  tps: 99315.4842
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 19933.83097
+  tps: 99041.64999
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 19834.3293
+  tps: 98373.09794
+  hps: 5110.92877
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 19957.57964
+  tps: 99066.05242
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 20029.4509
+  tps: 99298.87393
+  hps: 5177.30142
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 19860.58447
+  tps: 98581.0766
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 20117.48674
+  tps: 100090.89518
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5092.39097
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5087.13635
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -771,6 +963,14 @@ dps_results: {
   hps: 5934.59532
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 21971.2473
+  tps: 110542.97145
+  hps: 5935.7523
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-FluidDeath-58181"
  value: {
@@ -851,6 +1051,14 @@ dps_results: {
   hps: 5372.05589
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 21971.2473
+  tps: 110542.97145
+  hps: 5935.7523
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-GraceoftheHerald-55266"
  value: {
@@ -971,6 +1179,14 @@ dps_results: {
   hps: 5306.62748
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 22017.7479
+  tps: 110792.21784
+  hps: 5937.97994
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1203,6 +1419,22 @@ dps_results: {
   hps: 5339.4538
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 21920.69271
+  tps: 110263.55595
+  hps: 5932.88695
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 21920.69271
+  tps: 110263.55595
+  hps: 5932.88695
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-MagmaPlatedBattlearmor"
  value: {
@@ -1547,6 +1779,22 @@ dps_results: {
   hps: 5421.7964
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 21971.2473
+  tps: 110542.97145
+  hps: 5935.7523
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 21787.85011
+  tps: 109449.94963
+  hps: 5940.27067
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-Rainsong-55854"
  value: {
@@ -1651,6 +1899,54 @@ dps_results: {
   hps: 5316.47195
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-RuneofCinderglacier-3369"
+ value: {
+  dps: 19940.67842
+  tps: 98981.54635
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-RuneofRazorice-3370"
+ value: {
+  dps: 20015.80611
+  tps: 99293.42629
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-RuneofSpellbreaking-3595"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-RuneofSpellshattering-3367"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-RuneofSwordbreaking-3594"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5087.13635
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-RuneofSwordshattering-3365"
+ value: {
+  dps: 19797.65327
+  tps: 98266.42059
+  hps: 5087.13635
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-RuneofZeth-68998"
  value: {
@@ -1659,6 +1955,22 @@ dps_results: {
   hps: 5312.95606
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-RuneoftheNerubianCarapace-3883"
+ value: {
+  dps: 19813.80437
+  tps: 98358.5439
+  hps: 5126.35865
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-RuneoftheStoneskinGargoyle-3847"
+ value: {
+  dps: 19829.95546
+  tps: 98450.6672
+  hps: 5165.58095
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-RuthlessGladiator'sBadgeofConquest-70399"
  value: {
@@ -1755,6 +2067,14 @@ dps_results: {
   hps: 5300.29889
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 22134.32179
+  tps: 111422.13682
+  hps: 5935.7523
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-ScalesofLife-68915"
  value: {
@@ -2035,6 +2355,30 @@ dps_results: {
   hps: 5339.4538
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-SunScope-3607"
+ value: {
+  dps: 22045.37207
+  tps: 110942.59207
+  hps: 5935.7523
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 21997.47732
+  tps: 110698.80218
+  hps: 5932.88695
+ }
+}
+dps_results: {
+ key: "TestBlood-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 22102.61807
+  tps: 111273.92325
+  hps: 5932.88695
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-SymbioticWorm-59332"
  value: {
@@ -2211,6 +2555,14 @@ dps_results: {
   hps: 5444.55387
  }
 }
+dps_results: {
+ key: "TestBlood-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 21971.2473
+  tps: 110542.97145
+  hps: 5935.7523
+ }
+}
 dps_results: {
  key: "TestBlood-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/death_knight/frost/TestFrost.results b/sim/death_knight/frost/TestFrost.results
index 71536c5e60..201bc7701d 100644
--- a/sim/death_knight/frost/TestFrost.results
+++ b/sim/death_knight/frost/TestFrost.results
@@ -451,6 +451,22 @@ dps_results: {
   hps: 1665.75456
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 51698.8978
+  tps: 48824.72387
+  hps: 1691.98054
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 51698.8978
+  tps: 48824.72387
+  hps: 1691.98054
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -547,6 +563,14 @@ dps_results: {
   hps: 1694.60314
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 51805.10345
+  tps: 48921.49499
+  hps: 1692.85474
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -595,6 +619,14 @@ dps_results: {
   hps: 1620.27784
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 47933.26112
+  tps: 45278.44738
+  hps: 1074.56777
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -603,6 +635,174 @@ dps_results: {
   hps: 1692.85474
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 51702.36892
+  tps: 48817.42482
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 51684.01187
+  tps: 48800.40341
+  hps: 1697.12464
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 51768.369
+  tps: 48884.76054
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 51683.33357
+  tps: 48799.72512
+  hps: 1694.98969
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 51698.8978
+  tps: 47848.22939
+  hps: 1691.98054
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 51606.84554
+  tps: 49708.1114
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 48931.4343
+  tps: 46048.53154
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 48840.1601
+  tps: 45957.25733
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 48712.8891
+  tps: 45821.08559
+  hps: 1686.66037
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 48827.65616
+  tps: 45944.75339
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 49054.28153
+  tps: 46139.2584
+  hps: 1716.57059
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 48746.43376
+  tps: 45863.53099
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 49127.19675
+  tps: 46244.29398
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1700.72254
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1692.85474
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -755,6 +955,14 @@ dps_results: {
   hps: 1692.85474
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 51805.10345
+  tps: 48921.49499
+  hps: 1692.85474
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-FluidDeath-58181"
  value: {
@@ -835,6 +1043,14 @@ dps_results: {
   hps: 1720.82856
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 51805.10345
+  tps: 48921.49499
+  hps: 1692.85474
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-GraceoftheHerald-55266"
  value: {
@@ -963,6 +1179,14 @@ dps_results: {
   hps: 1672.3298
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 51854.42215
+  tps: 48966.90909
+  hps: 1694.60314
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1203,6 +1427,22 @@ dps_results: {
   hps: 1705.09053
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 51698.8978
+  tps: 48824.72387
+  hps: 1691.98054
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 51698.8978
+  tps: 48824.72387
+  hps: 1691.98054
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-MagmaPlatedBattlearmor"
  value: {
@@ -1571,6 +1811,22 @@ dps_results: {
   hps: 1697.79404
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 47933.26112
+  tps: 45278.44738
+  hps: 1074.56777
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 52007.90899
+  tps: 49092.98383
+  hps: 1706.9169
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-Rainsong-55854"
  value: {
@@ -1675,6 +1931,46 @@ dps_results: {
   hps: 1690.49755
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-RuneofCinderglacier-3369"
+ value: {
+  dps: 49159.39643
+  tps: 46276.49366
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-RuneofSpellbreaking-3595"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-RuneofSpellshattering-3367"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-RuneofSwordbreaking-3594"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-RuneofSwordshattering-3365"
+ value: {
+  dps: 48613.42283
+  tps: 45730.52006
+  hps: 1692.85474
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-RuneofZeth-68998"
  value: {
@@ -1683,6 +1979,22 @@ dps_results: {
   hps: 1689.20499
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-RuneoftheNerubianCarapace-3883"
+ value: {
+  dps: 48637.7891
+  tps: 45754.88633
+  hps: 1705.61747
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-RuneoftheStoneskinGargoyle-3847"
+ value: {
+  dps: 48662.15536
+  tps: 45779.2526
+  hps: 1718.38021
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-RuthlessGladiator'sBadgeofConquest-70399"
  value: {
@@ -1779,6 +2091,14 @@ dps_results: {
   hps: 1664.65244
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 52154.03737
+  tps: 49252.46729
+  hps: 1692.85474
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-ScalesofLife-68915"
  value: {
@@ -2083,6 +2403,30 @@ dps_results: {
   hps: 1705.09053
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-SunScope-3607"
+ value: {
+  dps: 51963.70978
+  tps: 49071.93695
+  hps: 1692.85474
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 51858.11229
+  tps: 48983.93836
+  hps: 1691.98054
+ }
+}
+dps_results: {
+ key: "TestFrost-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 52072.93314
+  tps: 49198.75921
+  hps: 1691.98054
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-SymbioticWorm-59332"
  value: {
@@ -2259,6 +2603,14 @@ dps_results: {
   hps: 1795.54542
  }
 }
+dps_results: {
+ key: "TestFrost-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 47933.26112
+  tps: 45278.44738
+  hps: 1074.56777
+ }
+}
 dps_results: {
  key: "TestFrost-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/death_knight/unholy/TestUnholy.results b/sim/death_knight/unholy/TestUnholy.results
index f8ad4d28c0..34740a7d7d 100644
--- a/sim/death_knight/unholy/TestUnholy.results
+++ b/sim/death_knight/unholy/TestUnholy.results
@@ -451,6 +451,22 @@ dps_results: {
   hps: 690.18846
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 54065.46504
+  tps: 37938.56158
+  hps: 714.96446
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 54065.42888
+  tps: 37938.49288
+  hps: 714.96446
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -547,6 +563,14 @@ dps_results: {
   hps: 717.61903
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 54236.95072
+  tps: 38072.33591
+  hps: 717.61903
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -595,6 +619,14 @@ dps_results: {
   hps: 642.48384
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 54236.95072
+  tps: 38072.33591
+  hps: 717.61903
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -603,6 +635,159 @@ dps_results: {
   hps: 717.61903
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 49810.24131
+  tps: 34909.23966
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 53937.22929
+  tps: 37837.57396
+  hps: 709.65531
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 53898.29103
+  tps: 37808.90945
+  hps: 711.42372
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 53981.41959
+  tps: 37886.8796
+  hps: 709.65531
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 53898.29103
+  tps: 37808.90945
+  hps: 710.53952
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 54065.46504
+  tps: 37179.79035
+  hps: 714.96446
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 54031.45177
+  tps: 38681.30506
+  hps: 717.61903
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 50040.46471
+  tps: 35106.19503
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 49993.16459
+  tps: 35092.11573
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 49990.03537
+  tps: 34897.83505
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 49810.24131
+  tps: 34909.23966
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 49931.13005
+  tps: 35000.53639
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 49810.24131
+  tps: 34909.23966
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 49810.29353
+  tps: 34909.33888
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 50294.53794
+  tps: 35070.92739
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 49796.21018
+  tps: 34845.96511
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 50249.23352
+  tps: 35350.05659
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 49810.24131
+  tps: 34909.23966
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 49810.24131
+  tps: 34909.23966
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 49810.24131
+  tps: 34909.23966
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 49810.17549
+  tps: 34909.11461
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -755,6 +940,14 @@ dps_results: {
   hps: 717.61903
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 54236.95072
+  tps: 38072.33591
+  hps: 717.61903
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-FluidDeath-58181"
  value: {
@@ -835,6 +1028,14 @@ dps_results: {
   hps: 690.18846
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 54236.95072
+  tps: 38072.33591
+  hps: 717.61903
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-GraceoftheHerald-55266"
  value: {
@@ -955,6 +1156,14 @@ dps_results: {
   hps: 697.26732
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 54335.11
+  tps: 38144.43263
+  hps: 717.61903
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1187,6 +1396,22 @@ dps_results: {
   hps: 690.18846
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 54065.54257
+  tps: 37938.70887
+  hps: 714.96446
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 54065.46504
+  tps: 37938.56158
+  hps: 714.96446
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-MagmaPlatedBattlearmor"
  value: {
@@ -1531,6 +1756,22 @@ dps_results: {
   hps: 701.6916
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 54236.95072
+  tps: 38072.33591
+  hps: 717.61903
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 54236.95072
+  tps: 38072.33591
+  hps: 717.61903
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-Rainsong-55854"
  value: {
@@ -1635,6 +1876,48 @@ dps_results: {
   hps: 706.11589
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-RuneofCinderglacier-3369"
+ value: {
+  dps: 50435.7762
+  tps: 35588.10148
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-RuneofRazorice-3370"
+ value: {
+  dps: 50237.49208
+  tps: 35330.59636
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-RuneofSpellbreaking-3595"
+ value: {
+  dps: 49810.24131
+  tps: 34909.23966
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-RuneofSpellshattering-3367"
+ value: {
+  dps: 49810.24131
+  tps: 34909.23966
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-RuneofSwordbreaking-3594"
+ value: {
+  dps: 49810.24131
+  tps: 34909.23966
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-RuneofSwordshattering-3365"
+ value: {
+  dps: 49810.24131
+  tps: 34909.23966
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-RuneofZeth-68998"
  value: {
@@ -1643,6 +1926,20 @@ dps_results: {
   hps: 702.57646
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-RuneoftheNerubianCarapace-3883"
+ value: {
+  dps: 49825.60661
+  tps: 34924.52756
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-RuneoftheStoneskinGargoyle-3847"
+ value: {
+  dps: 49840.97191
+  tps: 34939.81546
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-RuthlessGladiator'sBadgeofConquest-70399"
  value: {
@@ -1739,6 +2036,14 @@ dps_results: {
   hps: 691.95817
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 54598.62886
+  tps: 38335.43448
+  hps: 717.61903
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-ScalesofLife-68915"
  value: {
@@ -2027,6 +2332,30 @@ dps_results: {
   hps: 690.18846
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-SunScope-3607"
+ value: {
+  dps: 54401.34987
+  tps: 38191.92617
+  hps: 717.61903
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 54191.18289
+  tps: 38055.43633
+  hps: 714.96446
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 54353.71084
+  tps: 38211.69052
+  hps: 714.96446
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-SymbioticWorm-59332"
  value: {
@@ -2203,6 +2532,14 @@ dps_results: {
   hps: 733.54645
  }
 }
+dps_results: {
+ key: "TestUnholy-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 54236.95072
+  tps: 38072.33591
+  hps: 717.61903
+ }
+}
 dps_results: {
  key: "TestUnholy-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results
index 7af333a769..5f723b2590 100644
--- a/sim/druid/balance/TestBalance.results
+++ b/sim/druid/balance/TestBalance.results
@@ -400,6 +400,20 @@ dps_results: {
   tps: 44824.66784
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 48287.90298
+  tps: 44991.15199
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 48287.08877
+  tps: 44990.05841
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -498,6 +512,13 @@ dps_results: {
   tps: 44602.85724
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 48980.11726
+  tps: 45646.00675
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -526,6 +547,13 @@ dps_results: {
   tps: 42104.68621
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 48980.11726
+  tps: 45646.00675
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -533,6 +561,139 @@ dps_results: {
   tps: 44724.43555
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 48377.99778
+  tps: 45076.6736
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 48886.71271
+  tps: 45559.05183
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 48886.71271
+  tps: 45559.05183
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 48886.71271
+  tps: 45559.05183
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 48287.90298
+  tps: 44100.82311
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 48518.99876
+  tps: 46202.3206
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 48322.21987
+  tps: 45091.29402
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 48377.99778
+  tps: 45076.6736
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 48458.88927
+  tps: 45188.29555
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 48377.99778
+  tps: 45076.6736
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 48377.99778
+  tps: 45076.6736
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 48377.99778
+  tps: 45076.6736
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 48377.28418
+  tps: 45076.6736
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 48937.66873
+  tps: 45469.92189
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 48377.99778
+  tps: 45076.6736
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 48377.99778
+  tps: 45076.6736
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 48377.99778
+  tps: 45076.6736
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 48378.41559
+  tps: 45076.56664
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 48377.99778
+  tps: 45076.6736
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -673,6 +834,13 @@ dps_results: {
   tps: 44643.65641
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 48980.11726
+  tps: 45646.00675
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-FluidDeath-58181"
  value: {
@@ -750,6 +918,13 @@ dps_results: {
   tps: 42286.34885
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 48980.11726
+  tps: 45646.00675
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-GraceoftheHerald-55266"
  value: {
@@ -848,6 +1023,13 @@ dps_results: {
   tps: 45646.00675
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 49096.32182
+  tps: 45749.9046
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1072,6 +1254,13 @@ dps_results: {
   tps: 41523.36017
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 48575.60418
+  tps: 45253.02655
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1366,6 +1555,20 @@ dps_results: {
   tps: 41523.36017
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 48980.11726
+  tps: 45646.00675
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 48980.11726
+  tps: 45646.00675
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-Rainsong-55854"
  value: {
@@ -1569,6 +1772,13 @@ dps_results: {
   tps: 41523.36017
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 48980.11726
+  tps: 45646.00675
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-ScalesofLife-68915"
  value: {
@@ -1830,6 +2040,27 @@ dps_results: {
   tps: 42694.0521
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-SunScope-3607"
+ value: {
+  dps: 48980.11726
+  tps: 45646.00675
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 48287.90298
+  tps: 44990.05841
+ }
+}
+dps_results: {
+ key: "TestBalance-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 48287.90298
+  tps: 44990.05841
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-SymbioticWorm-59332"
  value: {
@@ -2005,6 +2236,13 @@ dps_results: {
   tps: 41523.36017
  }
 }
+dps_results: {
+ key: "TestBalance-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 48980.11726
+  tps: 45646.00675
+ }
+}
 dps_results: {
  key: "TestBalance-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results
index 59de997071..b9d309c4e3 100644
--- a/sim/druid/feral/TestFeral.results
+++ b/sim/druid/feral/TestFeral.results
@@ -451,6 +451,22 @@ dps_results: {
   hps: 29.58881
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 53188.04124
+  tps: 74243.08926
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 53178.96474
+  tps: 74334.73142
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -563,6 +579,14 @@ dps_results: {
   hps: 26.77086
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 53313.72086
+  tps: 74428.13534
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -603,6 +627,14 @@ dps_results: {
   hps: 26.77086
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 53313.72086
+  tps: 74428.13534
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -611,6 +643,174 @@ dps_results: {
   hps: 27.06519
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 52616.18218
+  tps: 73338.89884
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 53251.72763
+  tps: 74326.37921
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 53112.54544
+  tps: 74132.49693
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 53181.68919
+  tps: 74246.69513
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 53112.54544
+  tps: 74132.49693
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 53188.04124
+  tps: 72757.99527
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 53184.78908
+  tps: 75698.95317
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 52795.7362
+  tps: 73335.24995
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 52839.32353
+  tps: 72992.41382
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 52608.29879
+  tps: 73252.85145
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 52616.18218
+  tps: 73338.89884
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 52672.20538
+  tps: 73205.72955
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 52616.18218
+  tps: 73338.89884
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 52616.18218
+  tps: 73338.89884
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 52680.73839
+  tps: 70773.34359
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 52699.8069
+  tps: 73473.28124
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 52974.14152
+  tps: 72742.09885
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 52616.18218
+  tps: 73338.89884
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 52611.97313
+  tps: 73333.90244
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 52620.95149
+  tps: 73166.27431
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 52536.72008
+  tps: 73385.35736
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -771,6 +971,14 @@ dps_results: {
   hps: 26.77086
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 53313.72086
+  tps: 74428.13534
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-FluidDeath-58181"
  value: {
@@ -859,6 +1067,14 @@ dps_results: {
   hps: 27.77377
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 53313.72086
+  tps: 74428.13534
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-GraceoftheHerald-55266"
  value: {
@@ -971,6 +1187,14 @@ dps_results: {
   hps: 26.77086
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 53393.35501
+  tps: 74517.10176
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1227,6 +1451,22 @@ dps_results: {
   hps: 26.77086
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 53173.66539
+  tps: 73916.70575
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 53188.04124
+  tps: 74243.4129
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1563,6 +1803,22 @@ dps_results: {
   hps: 26.77086
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 53313.72086
+  tps: 74428.13534
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 53313.72086
+  tps: 74428.13534
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-Rainsong-55854"
  value: {
@@ -1795,6 +2051,14 @@ dps_results: {
   hps: 26.77086
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 53482.95997
+  tps: 74665.68355
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-ScalesofLife-68915"
  value: {
@@ -2091,6 +2355,30 @@ dps_results: {
   hps: 26.77086
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-SunScope-3607"
+ value: {
+  dps: 53390.64773
+  tps: 74536.1118
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 53177.32421
+  tps: 74294.7289
+  hps: 26.77086
+ }
+}
+dps_results: {
+ key: "TestFeral-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 53638.87227
+  tps: 74791.81157
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-SymbioticWorm-59332"
  value: {
@@ -2291,6 +2579,14 @@ dps_results: {
   hps: 26.77086
  }
 }
+dps_results: {
+ key: "TestFeral-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 53313.72086
+  tps: 74428.13534
+  hps: 26.77086
+ }
+}
 dps_results: {
  key: "TestFeral-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/druid/guardian/TestGuardian.results b/sim/druid/guardian/TestGuardian.results
index 100a1cb80f..bd99d9ef15 100644
--- a/sim/druid/guardian/TestGuardian.results
+++ b/sim/druid/guardian/TestGuardian.results
@@ -451,6 +451,22 @@ dps_results: {
   hps: 356.7355
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -563,6 +579,14 @@ dps_results: {
   hps: 355.12858
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -603,6 +627,14 @@ dps_results: {
   hps: 353.52167
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -611,6 +643,158 @@ dps_results: {
   hps: 355.12858
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 10630.98792
+  tps: 53221.54003
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 10601.44821
+  tps: 52012.42942
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 10601.44821
+  tps: 54134.86186
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 10861.47342
+  tps: 54376.5992
+  hps: 358.34242
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 10676.49101
+  tps: 53448.85963
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 10681.8887
+  tps: 53476.72913
+  hps: 358.34242
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 10778.88472
+  tps: 53961.959
+  hps: 356.7355
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 10779.62515
+  tps: 53965.63577
+  hps: 353.52167
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 10739.75963
+  tps: 53766.29501
+  hps: 358.34242
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 10749.10362
+  tps: 53811.92271
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 353.52167
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 10601.91875
+  tps: 53104.87079
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -771,6 +955,14 @@ dps_results: {
   hps: 355.12858
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-FluidDeath-58181"
  value: {
@@ -859,6 +1051,14 @@ dps_results: {
   hps: 369.60167
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-GraceoftheHerald-55266"
  value: {
@@ -971,6 +1171,14 @@ dps_results: {
   hps: 356.7355
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 10612.78886
+  tps: 53130.20891
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1227,6 +1435,22 @@ dps_results: {
   hps: 355.12858
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 10598.25671
+  tps: 53091.11141
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1563,6 +1787,22 @@ dps_results: {
   hps: 356.7355
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 10789.29141
+  tps: 54013.83537
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-Rainsong-55854"
  value: {
@@ -1795,6 +2035,14 @@ dps_results: {
   hps: 355.12858
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 10640.32184
+  tps: 53268.01379
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-ScalesofLife-68915"
  value: {
@@ -2083,6 +2331,30 @@ dps_results: {
   hps: 355.12858
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-SunScope-3607"
+ value: {
+  dps: 10619.11804
+  tps: 53161.9948
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 10651.02203
+  tps: 53321.51474
+  hps: 355.12858
+ }
+}
+dps_results: {
+ key: "TestGuardian-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 10720.26883
+  tps: 53667.74874
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-SymbioticWorm-59332"
  value: {
@@ -2283,6 +2555,14 @@ dps_results: {
   hps: 358.34242
  }
 }
+dps_results: {
+ key: "TestGuardian-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 10601.44821
+  tps: 53073.64564
+  hps: 355.12858
+ }
+}
 dps_results: {
  key: "TestGuardian-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/hunter/beast_mastery/TestBM.results b/sim/hunter/beast_mastery/TestBM.results
index c30eae1334..f2726b00b9 100644
--- a/sim/hunter/beast_mastery/TestBM.results
+++ b/sim/hunter/beast_mastery/TestBM.results
@@ -428,6 +428,20 @@ dps_results: {
   tps: 15514.71535
  }
 }
+dps_results: {
+ key: "TestBM-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 25737.60513
+  tps: 15977.83343
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 25737.60513
+  tps: 15977.83343
+ }
+}
 dps_results: {
  key: "TestBM-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -512,6 +526,13 @@ dps_results: {
   tps: 15750.11527
  }
 }
+dps_results: {
+ key: "TestBM-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 25640.7413
+  tps: 15943.40107
+ }
+}
 dps_results: {
  key: "TestBM-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -547,6 +568,13 @@ dps_results: {
   tps: 15060.9254
  }
 }
+dps_results: {
+ key: "TestBM-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 25813.1764
+  tps: 16029.36098
+ }
+}
 dps_results: {
  key: "TestBM-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -554,6 +582,153 @@ dps_results: {
   tps: 15714.73596
  }
 }
+dps_results: {
+ key: "TestBM-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 25777.67689
+  tps: 16001.10283
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 25704.1361
+  tps: 15968.76045
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 25730.30472
+  tps: 15968.76045
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 25704.1361
+  tps: 15968.76045
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 25737.60513
+  tps: 15658.27676
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 25746.3762
+  tps: 16300.44944
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 25439.16931
+  tps: 15836.22245
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 25364.51275
+  tps: 15816.83683
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 25431.08558
+  tps: 15838.13142
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 25407.64377
+  tps: 15804.50019
+ }
+}
 dps_results: {
  key: "TestBM-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -701,6 +876,13 @@ dps_results: {
   tps: 15714.73596
  }
 }
+dps_results: {
+ key: "TestBM-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 26046.78965
+  tps: 16296.2587
+ }
+}
 dps_results: {
  key: "TestBM-AllItems-FluidDeath-58181"
  value: {
@@ -897,6 +1079,13 @@ dps_results: {
   tps: 16124.9819
  }
 }
+dps_results: {
+ key: "TestBM-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 25695.09465
+  tps: 15977.80051
+ }
+}
 dps_results: {
  key: "TestBM-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1128,6 +1317,20 @@ dps_results: {
   tps: 15491.5623
  }
 }
+dps_results: {
+ key: "TestBM-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 25737.60513
+  tps: 15977.83343
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 25737.60513
+  tps: 15977.83343
+ }
+}
 dps_results: {
  key: "TestBM-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1429,6 +1632,20 @@ dps_results: {
   tps: 16082.23748
  }
 }
+dps_results: {
+ key: "TestBM-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 25813.1764
+  tps: 16029.36098
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 25613.43084
+  tps: 15916.09061
+ }
+}
 dps_results: {
  key: "TestBM-AllItems-Rainsong-55854"
  value: {
@@ -1632,6 +1849,13 @@ dps_results: {
   tps: 15060.9254
  }
 }
+dps_results: {
+ key: "TestBM-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 25711.47657
+  tps: 15959.37177
+ }
+}
 dps_results: {
  key: "TestBM-AllItems-ScalesofLife-68915"
  value: {
@@ -1907,6 +2131,27 @@ dps_results: {
   tps: 15271.56301
  }
 }
+dps_results: {
+ key: "TestBM-AllItems-SunScope-3607"
+ value: {
+  dps: 25703.25387
+  tps: 15981.26831
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 25868.49015
+  tps: 16055.31247
+ }
+}
+dps_results: {
+ key: "TestBM-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 26054.65151
+  tps: 16165.67675
+ }
+}
 dps_results: {
  key: "TestBM-AllItems-SymbioticWorm-59332"
  value: {
@@ -2082,6 +2327,13 @@ dps_results: {
   tps: 15162.20999
  }
 }
+dps_results: {
+ key: "TestBM-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 25813.1764
+  tps: 16029.36098
+ }
+}
 dps_results: {
  key: "TestBM-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/hunter/marksmanship/TestMM.results b/sim/hunter/marksmanship/TestMM.results
index 8ce499b5d1..bbc3860709 100644
--- a/sim/hunter/marksmanship/TestMM.results
+++ b/sim/hunter/marksmanship/TestMM.results
@@ -428,6 +428,20 @@ dps_results: {
   tps: 20641.232
  }
 }
+dps_results: {
+ key: "TestMM-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 24042.0797
+  tps: 21602.0012
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 24042.05453
+  tps: 21601.97603
+ }
+}
 dps_results: {
  key: "TestMM-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -512,6 +526,13 @@ dps_results: {
   tps: 21202.02411
  }
 }
+dps_results: {
+ key: "TestMM-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 23950.67204
+  tps: 21524.70825
+ }
+}
 dps_results: {
  key: "TestMM-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -547,6 +568,13 @@ dps_results: {
   tps: 20253.42057
  }
 }
+dps_results: {
+ key: "TestMM-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 24101.199
+  tps: 21653.78721
+ }
+}
 dps_results: {
  key: "TestMM-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -554,6 +582,153 @@ dps_results: {
   tps: 21154.17763
  }
 }
+dps_results: {
+ key: "TestMM-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 23760.19298
+  tps: 21348.7384
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 24071.64061
+  tps: 21627.6824
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 24007.6544
+  tps: 21571.62769
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 24145.0975
+  tps: 21698.05398
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 24007.6544
+  tps: 21571.62769
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 24042.0797
+  tps: 21169.96118
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 24047.43603
+  tps: 22038.97788
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 23804.79802
+  tps: 21392.90389
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 23760.19298
+  tps: 21348.7384
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 23792.95181
+  tps: 21369.39648
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 23760.19298
+  tps: 21348.7384
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 23760.19298
+  tps: 21348.7384
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 23760.19298
+  tps: 21348.7384
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 23760.16808
+  tps: 21348.71351
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 23833.03345
+  tps: 21420.14644
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 23760.19298
+  tps: 21348.7384
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 23760.19298
+  tps: 21348.7384
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 23760.19298
+  tps: 21348.7384
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 23760.17123
+  tps: 21348.61287
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 23760.19298
+  tps: 21348.7384
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 23760.19298
+  tps: 21348.7384
+ }
+}
 dps_results: {
  key: "TestMM-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -701,6 +876,13 @@ dps_results: {
   tps: 21191.72872
  }
 }
+dps_results: {
+ key: "TestMM-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 23913.6699
+  tps: 21461.3019
+ }
+}
 dps_results: {
  key: "TestMM-AllItems-FluidDeath-58181"
  value: {
@@ -897,6 +1079,13 @@ dps_results: {
   tps: 21791.74936
  }
 }
+dps_results: {
+ key: "TestMM-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 24018.73617
+  tps: 21586.64616
+ }
+}
 dps_results: {
  key: "TestMM-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1128,6 +1317,20 @@ dps_results: {
   tps: 21100.25418
  }
 }
+dps_results: {
+ key: "TestMM-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 24047.58516
+  tps: 21607.50667
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 24042.05453
+  tps: 21601.97603
+ }
+}
 dps_results: {
  key: "TestMM-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1429,6 +1632,20 @@ dps_results: {
   tps: 21618.23677
  }
 }
+dps_results: {
+ key: "TestMM-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 24101.199
+  tps: 21653.78721
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 23916.22479
+  tps: 21490.261
+ }
+}
 dps_results: {
  key: "TestMM-AllItems-Rainsong-55854"
  value: {
@@ -1632,6 +1849,13 @@ dps_results: {
   tps: 20253.42057
  }
 }
+dps_results: {
+ key: "TestMM-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 24028.50218
+  tps: 21590.41781
+ }
+}
 dps_results: {
  key: "TestMM-AllItems-ScalesofLife-68915"
  value: {
@@ -1907,6 +2131,27 @@ dps_results: {
   tps: 20482.89413
  }
 }
+dps_results: {
+ key: "TestMM-AllItems-SunScope-3607"
+ value: {
+  dps: 23972.68292
+  tps: 21528.93071
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 24163.63486
+  tps: 21709.61534
+ }
+}
+dps_results: {
+ key: "TestMM-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 24333.35832
+  tps: 21858.82234
+ }
+}
 dps_results: {
  key: "TestMM-AllItems-SymbioticWorm-59332"
  value: {
@@ -2082,6 +2327,13 @@ dps_results: {
   tps: 20312.18533
  }
 }
+dps_results: {
+ key: "TestMM-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 24101.199
+  tps: 21653.78721
+ }
+}
 dps_results: {
  key: "TestMM-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/hunter/survival/TestSV.results b/sim/hunter/survival/TestSV.results
index b87d14c5ed..6b06f278e0 100644
--- a/sim/hunter/survival/TestSV.results
+++ b/sim/hunter/survival/TestSV.results
@@ -428,6 +428,20 @@ dps_results: {
   tps: 42548.22141
  }
 }
+dps_results: {
+ key: "TestSV-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 50642.48144
+  tps: 46200.15176
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 50642.48144
+  tps: 46200.15176
+ }
+}
 dps_results: {
  key: "TestSV-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -512,6 +526,13 @@ dps_results: {
   tps: 44960.04951
  }
 }
+dps_results: {
+ key: "TestSV-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 50381.56201
+  tps: 45951.1519
+ }
+}
 dps_results: {
  key: "TestSV-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -547,6 +568,13 @@ dps_results: {
   tps: 42019.82912
  }
 }
+dps_results: {
+ key: "TestSV-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 50752.18438
+  tps: 46298.17692
+ }
+}
 dps_results: {
  key: "TestSV-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -554,6 +582,146 @@ dps_results: {
   tps: 44894.04247
  }
 }
+dps_results: {
+ key: "TestSV-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 50155.49483
+  tps: 45762.67573
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 50640.98776
+  tps: 46200.2243
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 50702.12829
+  tps: 46261.2914
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 50640.98776
+  tps: 46200.2243
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 50642.48144
+  tps: 45276.14873
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 50638.38676
+  tps: 47108.20627
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 50204.94055
+  tps: 45812.20401
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 50155.49483
+  tps: 45762.67573
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 50109.32256
+  tps: 45698.13597
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 50155.49483
+  tps: 45762.67573
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 50152.30451
+  tps: 45759.34837
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 50155.49483
+  tps: 45762.67573
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 50155.49483
+  tps: 45762.67573
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 50392.361
+  tps: 45985.00988
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 50156.92743
+  tps: 45764.0641
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 50155.49483
+  tps: 45762.67573
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 50155.49483
+  tps: 45762.67573
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 50153.71612
+  tps: 45760.83577
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 50155.49483
+  tps: 45762.67573
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 50155.49483
+  tps: 45762.67573
+ }
+}
 dps_results: {
  key: "TestSV-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -778,6 +946,13 @@ dps_results: {
   tps: 42019.82912
  }
 }
+dps_results: {
+ key: "TestSV-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 50595.95194
+  tps: 46140.32749
+ }
+}
 dps_results: {
  key: "TestSV-AllItems-GraceoftheHerald-55266"
  value: {
@@ -897,6 +1072,13 @@ dps_results: {
   tps: 46483.95776
  }
 }
+dps_results: {
+ key: "TestSV-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 50482.19669
+  tps: 46045.22653
+ }
+}
 dps_results: {
  key: "TestSV-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1128,6 +1310,20 @@ dps_results: {
   tps: 36095.81821
  }
 }
+dps_results: {
+ key: "TestSV-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 50642.48144
+  tps: 46200.15176
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 50642.48144
+  tps: 46200.15176
+ }
+}
 dps_results: {
  key: "TestSV-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1429,6 +1625,20 @@ dps_results: {
   tps: 44095.56725
  }
 }
+dps_results: {
+ key: "TestSV-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 50752.18438
+  tps: 46298.17692
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 50354.79713
+  tps: 45924.38702
+ }
+}
 dps_results: {
  key: "TestSV-AllItems-Rainsong-55854"
  value: {
@@ -1632,6 +1842,13 @@ dps_results: {
   tps: 42019.82912
  }
 }
+dps_results: {
+ key: "TestSV-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 50467.15519
+  tps: 46050.98434
+ }
+}
 dps_results: {
  key: "TestSV-AllItems-ScalesofLife-68915"
  value: {
@@ -1909,6 +2126,27 @@ dps_results: {
   tps: 42019.82912
  }
 }
+dps_results: {
+ key: "TestSV-AllItems-SunScope-3607"
+ value: {
+  dps: 50385.24047
+  tps: 45953.5514
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 50803.81862
+  tps: 46345.58524
+ }
+}
+dps_results: {
+ key: "TestSV-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 51036.23164
+  tps: 46553.58789
+ }
+}
 dps_results: {
  key: "TestSV-AllItems-SymbioticWorm-59332"
  value: {
@@ -2084,6 +2322,13 @@ dps_results: {
   tps: 42019.82912
  }
 }
+dps_results: {
+ key: "TestSV-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 50752.18438
+  tps: 46298.17692
+ }
+}
 dps_results: {
  key: "TestSV-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/lib/library.go b/sim/lib/library.go
index 3b7231b9e1..8967a6f0cd 100644
--- a/sim/lib/library.go
+++ b/sim/lib/library.go
@@ -126,6 +126,8 @@ func getDatabase(itemIds *int32, numItems int32, enchantIds *int32, numEnchants
 		simDB.Enchants[i] = &proto.SimEnchant{
 			EffectId: enchant.EffectID,
 			Stats:    enchant.Stats[:],
+			Name:     enchant.Name,
+			Type:     enchant.Type,
 		}
 	}
 	for i, gemId := range gids {
diff --git a/sim/mage/arcane/TestArcane.results b/sim/mage/arcane/TestArcane.results
index 9a8c266b00..fb084b9bbe 100644
--- a/sim/mage/arcane/TestArcane.results
+++ b/sim/mage/arcane/TestArcane.results
@@ -400,6 +400,20 @@ dps_results: {
   tps: 34837.63345
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 37065.81386
+  tps: 34191.21939
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 37096.39243
+  tps: 34202.0213
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -484,6 +498,13 @@ dps_results: {
   tps: 33847.06029
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 37218.98742
+  tps: 34378.71882
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -512,6 +533,13 @@ dps_results: {
   tps: 31876.93442
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 37218.98742
+  tps: 34378.71882
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -519,6 +547,146 @@ dps_results: {
   tps: 33940.51611
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 36736.39931
+  tps: 33964.72312
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 36710.45743
+  tps: 34030.99728
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 36710.45743
+  tps: 34030.99728
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 36774.81398
+  tps: 34091.09829
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 36710.45743
+  tps: 34030.99728
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 37096.47871
+  tps: 33533.89647
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 37097.40292
+  tps: 34935.02092
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 37395.84528
+  tps: 34611.39084
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 36736.39931
+  tps: 33964.72312
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 36747.23539
+  tps: 33991.61201
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 36736.39931
+  tps: 33964.72312
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 36736.39931
+  tps: 33964.72312
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 36736.39931
+  tps: 33964.72312
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 36736.39931
+  tps: 33964.72312
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 36922.43413
+  tps: 34222.12994
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 36736.39931
+  tps: 33964.72312
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 36736.39931
+  tps: 33964.72312
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 36736.39931
+  tps: 33964.72312
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 36764.95085
+  tps: 33980.08843
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 36736.39931
+  tps: 33964.72312
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -673,6 +841,13 @@ dps_results: {
   tps: 33859.91331
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 37218.98742
+  tps: 34378.71882
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-FluidDeath-58181"
  value: {
@@ -743,6 +918,13 @@ dps_results: {
   tps: 32239.61737
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 37218.98742
+  tps: 34378.71882
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-GraceoftheHerald-55266"
  value: {
@@ -862,6 +1044,13 @@ dps_results: {
   tps: 34378.71882
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 37276.66631
+  tps: 34456.60893
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1065,6 +1254,20 @@ dps_results: {
   tps: 31244.88234
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 37288.53029
+  tps: 34374.70785
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 37532.83419
+  tps: 34656.29209
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1345,6 +1548,20 @@ dps_results: {
   tps: 31244.88234
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 37218.98742
+  tps: 34378.71882
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 37218.98742
+  tps: 34378.71882
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-Rainsong-55854"
  value: {
@@ -1548,6 +1765,13 @@ dps_results: {
   tps: 31244.70363
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 37218.98742
+  tps: 34378.71882
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-ScalesofLife-68915"
  value: {
@@ -1816,6 +2040,27 @@ dps_results: {
   tps: 32154.27368
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-SunScope-3607"
+ value: {
+  dps: 37218.98742
+  tps: 34378.71882
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 37096.39243
+  tps: 34202.0213
+ }
+}
+dps_results: {
+ key: "TestArcane-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 37096.39243
+  tps: 34202.0213
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-SymbioticWorm-59332"
  value: {
@@ -1991,6 +2236,13 @@ dps_results: {
   tps: 31244.88234
  }
 }
+dps_results: {
+ key: "TestArcane-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 37218.98742
+  tps: 34378.71882
+ }
+}
 dps_results: {
  key: "TestArcane-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/mage/fire/TestFire.results b/sim/mage/fire/TestFire.results
index 8ad3b865bc..9631642c01 100644
--- a/sim/mage/fire/TestFire.results
+++ b/sim/mage/fire/TestFire.results
@@ -400,6 +400,20 @@ dps_results: {
   tps: 44334.03931
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 49375.08696
+  tps: 44595.92687
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 49375.08696
+  tps: 44591.36021
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -484,6 +498,13 @@ dps_results: {
   tps: 44341.46264
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 50151.18902
+  tps: 45301.32751
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -512,6 +533,13 @@ dps_results: {
   tps: 41136.30934
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 50151.18902
+  tps: 45301.32751
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -519,6 +547,139 @@ dps_results: {
   tps: 44474.82678
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 49315.76637
+  tps: 44538.7892
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 50060.84501
+  tps: 45217.28331
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 50060.84501
+  tps: 45217.28331
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 50060.84501
+  tps: 45217.28331
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 49375.08696
+  tps: 43701.76552
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 49732.32779
+  tps: 45946.0222
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 49154.21113
+  tps: 44477.25843
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 49315.76637
+  tps: 44538.7892
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 49117.19461
+  tps: 44430.72072
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 49315.76637
+  tps: 44538.7892
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 49315.76637
+  tps: 44538.7892
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 49315.76637
+  tps: 44538.7892
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 49315.76637
+  tps: 44538.7892
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 49613.06359
+  tps: 44789.26615
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 49315.76637
+  tps: 44538.7892
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 49315.76637
+  tps: 44538.7892
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 49315.76637
+  tps: 44538.7892
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 49315.81537
+  tps: 44538.676
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 49315.76637
+  tps: 44538.7892
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -673,6 +834,13 @@ dps_results: {
   tps: 44285.55587
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 50151.18902
+  tps: 45301.32751
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-FluidDeath-58181"
  value: {
@@ -743,6 +911,13 @@ dps_results: {
   tps: 41238.15912
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 50151.18902
+  tps: 45301.32751
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-GraceoftheHerald-55266"
  value: {
@@ -862,6 +1037,13 @@ dps_results: {
   tps: 45301.32751
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 50292.73758
+  tps: 45444.38203
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1058,6 +1240,13 @@ dps_results: {
   tps: 40397.94392
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 49644.00742
+  tps: 44867.49629
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1338,6 +1527,20 @@ dps_results: {
   tps: 40397.94392
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 50151.18902
+  tps: 45301.32751
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 50151.18902
+  tps: 45301.32751
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-Rainsong-55854"
  value: {
@@ -1541,6 +1744,13 @@ dps_results: {
   tps: 40397.94392
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 50151.18902
+  tps: 45301.32751
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-ScalesofLife-68915"
  value: {
@@ -1809,6 +2019,27 @@ dps_results: {
   tps: 41925.97092
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-SunScope-3607"
+ value: {
+  dps: 50151.18902
+  tps: 45301.32751
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 49375.08696
+  tps: 44591.36021
+ }
+}
+dps_results: {
+ key: "TestFire-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 49375.08696
+  tps: 44591.36021
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-SymbioticWorm-59332"
  value: {
@@ -1991,6 +2222,13 @@ dps_results: {
   tps: 40397.94392
  }
 }
+dps_results: {
+ key: "TestFire-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 50151.18902
+  tps: 45301.32751
+ }
+}
 dps_results: {
  key: "TestFire-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results
index 2525d0e47f..10d18fd800 100644
--- a/sim/paladin/protection/TestProtection.results
+++ b/sim/paladin/protection/TestProtection.results
@@ -427,6 +427,20 @@ dps_results: {
   tps: 56966.39932
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 10653.18673
+  tps: 53571.00643
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -511,6 +525,13 @@ dps_results: {
   tps: 54152.71061
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -539,6 +560,13 @@ dps_results: {
   tps: 53979.21063
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -546,6 +574,146 @@ dps_results: {
   tps: 53777.96602
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 10735.26669
+  tps: 53979.15504
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 10745.56251
+  tps: 54030.63414
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 10735.2778
+  tps: 52905.68285
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 10735.2778
+  tps: 55052.73841
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 10900.66337
+  tps: 54806.13844
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 10855.78033
+  tps: 54581.72323
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 10749.22379
+  tps: 54051.92275
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 10735.26669
+  tps: 53979.15504
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 10856.05276
+  tps: 54583.08542
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 10735.26669
+  tps: 53979.15504
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 10759.81491
+  tps: 54103.41867
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 10779.50877
+  tps: 54200.36545
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 10975.14823
+  tps: 55178.56273
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 10735.26669
+  tps: 53979.15504
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 10735.26669
+  tps: 53979.15504
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 10713.12097
+  tps: 53868.76793
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -686,6 +854,13 @@ dps_results: {
   tps: 53979.21063
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-FluidDeath-58181"
  value: {
@@ -763,6 +938,13 @@ dps_results: {
   tps: 54067.61776
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-GraceoftheHerald-55266"
  value: {
@@ -854,6 +1036,13 @@ dps_results: {
   tps: 54812.6572
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 10757.2234
+  tps: 54088.93861
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1064,6 +1253,20 @@ dps_results: {
   tps: 56830.93237
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 10747.90308
+  tps: 54042.33702
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 10719.91174
+  tps: 53903.90528
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1365,6 +1568,20 @@ dps_results: {
   tps: 54996.98413
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-Rainsong-55854"
  value: {
@@ -1561,6 +1778,13 @@ dps_results: {
   tps: 57641.63057
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 10868.581
+  tps: 54645.72659
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-ScalesofLife-68915"
  value: {
@@ -1813,6 +2037,27 @@ dps_results: {
   tps: 54308.69024
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-SunScope-3607"
+ value: {
+  dps: 10795.87016
+  tps: 54282.17243
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 10807.37496
+  tps: 54339.69642
+ }
+}
+dps_results: {
+ key: "TestProtection-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 10906.47778
+  tps: 54835.21051
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-SymbioticWorm-59332"
  value: {
@@ -1967,6 +2212,13 @@ dps_results: {
   tps: 54816.23442
  }
 }
+dps_results: {
+ key: "TestProtection-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 10735.2778
+  tps: 53979.21063
+ }
+}
 dps_results: {
  key: "TestProtection-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results
index 4119d513bc..0ad8e49a50 100644
--- a/sim/paladin/retribution/TestRetribution.results
+++ b/sim/paladin/retribution/TestRetribution.results
@@ -428,6 +428,20 @@ dps_results: {
   tps: 45114.09986
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 49633.88511
+  tps: 47106.72912
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 49531.51891
+  tps: 47007.77962
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -512,6 +526,13 @@ dps_results: {
   tps: 46579.36145
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 49728.75064
+  tps: 47202.97794
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -540,6 +561,13 @@ dps_results: {
   tps: 43830.10538
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 49728.75064
+  tps: 47202.97794
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -547,6 +575,146 @@ dps_results: {
   tps: 46582.56798
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 49056.99494
+  tps: 46531.22224
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 49669.11151
+  tps: 47143.33881
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 49607.51776
+  tps: 47081.74505
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 49692.38077
+  tps: 47166.60807
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 49607.51776
+  tps: 47081.74505
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 49593.90606
+  tps: 46134.57234
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 49563.53921
+  tps: 47973.05363
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 49294.30997
+  tps: 46768.53727
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 49363.44236
+  tps: 46837.66966
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 49308.17086
+  tps: 46774.2736
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 49056.99494
+  tps: 46531.22224
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 49257.60362
+  tps: 46731.83091
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 49056.99494
+  tps: 46531.22224
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 49005.97818
+  tps: 46479.91216
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 49623.47144
+  tps: 47064.87959
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 49148.68304
+  tps: 46622.91034
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 49056.99494
+  tps: 46531.22224
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 49056.99494
+  tps: 46531.22224
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 49129.17087
+  tps: 46602.97561
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 49056.99494
+  tps: 46531.22224
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -680,6 +848,13 @@ dps_results: {
   tps: 46599.90102
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 49728.75064
+  tps: 47202.97794
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-FluidDeath-58181"
  value: {
@@ -757,6 +932,13 @@ dps_results: {
   tps: 43994.29974
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 49728.75064
+  tps: 47202.97794
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-GraceoftheHerald-55266"
  value: {
@@ -862,6 +1044,13 @@ dps_results: {
   tps: 44578.38332
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 49836.1883
+  tps: 47309.22506
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1086,6 +1275,20 @@ dps_results: {
   tps: 45226.54664
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 49609.92973
+  tps: 47086.53808
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 49644.19873
+  tps: 47119.67926
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1366,6 +1569,20 @@ dps_results: {
   tps: 45131.2338
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 49728.75064
+  tps: 47202.97794
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 49728.75064
+  tps: 47202.97794
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-Rainsong-55854"
  value: {
@@ -1562,6 +1779,13 @@ dps_results: {
   tps: 45608.30824
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 50019.52275
+  tps: 47493.75005
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-ScalesofLife-68915"
  value: {
@@ -1816,6 +2040,27 @@ dps_results: {
   tps: 44060.71131
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-SunScope-3607"
+ value: {
+  dps: 49860.91978
+  tps: 47335.14708
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 49762.16963
+  tps: 47238.77799
+ }
+}
+dps_results: {
+ key: "TestRetribution-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 49991.7593
+  tps: 47468.36765
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-SymbioticWorm-59332"
  value: {
@@ -1970,6 +2215,13 @@ dps_results: {
   tps: 44922.24683
  }
 }
+dps_results: {
+ key: "TestRetribution-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 49728.75064
+  tps: 47202.97794
+ }
+}
 dps_results: {
  key: "TestRetribution-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results
index ded7c3c063..f5de727955 100644
--- a/sim/priest/shadow/TestShadow.results
+++ b/sim/priest/shadow/TestShadow.results
@@ -406,6 +406,20 @@ dps_results: {
   tps: 46033.77749
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 51273.95538
+  tps: 46361.29532
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 51267.53023
+  tps: 46360.26672
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -490,6 +504,13 @@ dps_results: {
   tps: 45813.01965
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 51877.13442
+  tps: 46961.30992
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -518,6 +539,13 @@ dps_results: {
   tps: 43543.83446
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 51877.13442
+  tps: 46961.30992
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -525,6 +553,139 @@ dps_results: {
   tps: 45982.44417
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 51332.82447
+  tps: 46439.5967
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 51761.94447
+  tps: 46849.48892
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 51761.94447
+  tps: 46849.48892
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 51761.94447
+  tps: 46849.48892
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 51273.95538
+  tps: 45447.81936
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 51663.21023
+  tps: 47673.50855
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 51371.88525
+  tps: 46530.94599
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 51332.82447
+  tps: 46439.5967
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 51430.80962
+  tps: 46609.26457
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 51332.82447
+  tps: 46439.5967
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 51332.82447
+  tps: 46439.5967
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 51332.82447
+  tps: 46439.5967
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 51320.78976
+  tps: 46439.5967
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 51178.11584
+  tps: 46321.63936
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 51332.82447
+  tps: 46439.5967
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 51332.82447
+  tps: 46439.5967
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 51332.82447
+  tps: 46439.5967
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 51330.04102
+  tps: 46436.7978
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 51332.82447
+  tps: 46439.5967
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -665,6 +826,13 @@ dps_results: {
   tps: 45876.89208
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 51877.13442
+  tps: 46961.30992
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-FluidDeath-58181"
  value: {
@@ -749,6 +917,13 @@ dps_results: {
   tps: 43790.77949
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 51877.13442
+  tps: 46961.30992
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-GraceoftheHerald-55266"
  value: {
@@ -847,6 +1022,13 @@ dps_results: {
   tps: 46961.30992
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 51838.84515
+  tps: 46985.73886
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1057,6 +1239,13 @@ dps_results: {
   tps: 43087.1812
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 51542.51081
+  tps: 46597.77739
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1344,6 +1533,20 @@ dps_results: {
   tps: 43087.1812
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 51877.13442
+  tps: 46961.30992
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 51877.13442
+  tps: 46961.30992
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-Rainsong-55854"
  value: {
@@ -1561,6 +1764,13 @@ dps_results: {
   tps: 43087.1812
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 51877.13442
+  tps: 46961.30992
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-ScalesofLife-68915"
  value: {
@@ -1806,6 +2016,27 @@ dps_results: {
   tps: 44244.13551
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-SunScope-3607"
+ value: {
+  dps: 51877.13442
+  tps: 46961.30992
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 51273.95538
+  tps: 46360.26672
+ }
+}
+dps_results: {
+ key: "TestShadow-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 51273.95538
+  tps: 46360.26672
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-SymbioticWorm-59332"
  value: {
@@ -1981,6 +2212,13 @@ dps_results: {
   tps: 43087.1812
  }
 }
+dps_results: {
+ key: "TestShadow-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 51877.13442
+  tps: 46961.30992
+ }
+}
 dps_results: {
  key: "TestShadow-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/rogue/assassination/TestAssassination.results b/sim/rogue/assassination/TestAssassination.results
index e4f648af0b..8b2e252110 100644
--- a/sim/rogue/assassination/TestAssassination.results
+++ b/sim/rogue/assassination/TestAssassination.results
@@ -444,6 +444,20 @@ dps_results: {
   tps: 19613.76083
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 29431.0692
+  tps: 20896.05913
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 29431.0692
+  tps: 20896.05913
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -528,6 +542,13 @@ dps_results: {
   tps: 20616.76281
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 29510.45638
+  tps: 20952.42403
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -556,6 +577,13 @@ dps_results: {
   tps: 19383.45503
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 29043.64167
+  tps: 20620.98559
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -563,6 +591,146 @@ dps_results: {
   tps: 20555.42748
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 28872.11444
+  tps: 20499.20125
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 29472.91161
+  tps: 20925.76724
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 29366.19582
+  tps: 20849.99903
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 29424.72694
+  tps: 20891.55613
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 29366.19582
+  tps: 20849.99903
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 29431.0692
+  tps: 20478.13795
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 29400.62406
+  tps: 21291.93194
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 29092.58847
+  tps: 20655.73782
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 29140.74043
+  tps: 20689.9257
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 29127.6035
+  tps: 20680.59848
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 28872.11444
+  tps: 20499.20125
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 28993.82703
+  tps: 20585.61719
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 28872.11444
+  tps: 20499.20125
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 28872.11444
+  tps: 20499.20125
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 29403.09215
+  tps: 20876.19543
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 28926.62779
+  tps: 20537.90573
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 28872.11444
+  tps: 20499.20125
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 28872.11444
+  tps: 20499.20125
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 28872.11444
+  tps: 20499.20125
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 28872.11444
+  tps: 20499.20125
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -717,6 +885,13 @@ dps_results: {
   tps: 20619.62137
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 29510.45638
+  tps: 20952.42403
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-ForestwalkerIdolofRage-92142"
  value: {
@@ -787,6 +962,13 @@ dps_results: {
   tps: 19383.45503
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 29510.45638
+  tps: 20952.42403
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-Golad,TwilightofAspects-77949"
  value: {
@@ -892,6 +1074,13 @@ dps_results: {
   tps: 20952.42403
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 29538.93278
+  tps: 20972.64227
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1102,6 +1291,20 @@ dps_results: {
   tps: 20289.61115
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 29431.0692
+  tps: 20896.05913
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 29431.0692
+  tps: 20896.05913
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1382,6 +1585,20 @@ dps_results: {
   tps: 20839.62361
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 29043.64167
+  tps: 20620.98559
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 29684.1601
+  tps: 21075.75367
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-Rainsong-55854"
  value: {
@@ -1585,6 +1802,13 @@ dps_results: {
   tps: 19894.10437
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 29646.33037
+  tps: 21048.89456
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-ScalesofLife-68915"
  value: {
@@ -1839,6 +2063,27 @@ dps_results: {
   tps: 19879.17853
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-SunScope-3607"
+ value: {
+  dps: 29572.21728
+  tps: 20996.27427
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 29597.53308
+  tps: 21014.24849
+ }
+}
+dps_results: {
+ key: "TestAssassination-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 29846.39364
+  tps: 21190.93948
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-SymbioticWorm-59332"
  value: {
@@ -2000,6 +2245,13 @@ dps_results: {
   tps: 20304.87502
  }
 }
+dps_results: {
+ key: "TestAssassination-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 29043.64167
+  tps: 20620.98559
+ }
+}
 dps_results: {
  key: "TestAssassination-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/rogue/combat/TestCombat.results b/sim/rogue/combat/TestCombat.results
index b78a42cb43..8570af0d78 100644
--- a/sim/rogue/combat/TestCombat.results
+++ b/sim/rogue/combat/TestCombat.results
@@ -421,6 +421,20 @@ dps_results: {
   tps: 19675.98132
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 29687.43684
+  tps: 21078.08016
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 29687.43684
+  tps: 21078.08016
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -505,6 +519,13 @@ dps_results: {
   tps: 20779.0729
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 29771.68344
+  tps: 21137.89524
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -533,6 +554,13 @@ dps_results: {
   tps: 19675.98132
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 29238.80996
+  tps: 20759.55507
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -540,6 +568,139 @@ dps_results: {
   tps: 20742.05745
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 28907.31514
+  tps: 20524.19375
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 29677.14401
+  tps: 21070.77225
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 29869.85359
+  tps: 21207.59605
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 29677.14401
+  tps: 21070.77225
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 29687.43684
+  tps: 20656.51856
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 29547.84136
+  tps: 21398.54671
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 29128.28868
+  tps: 20681.08496
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 29276.99194
+  tps: 20786.66428
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 28907.31514
+  tps: 20524.19375
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 28907.31514
+  tps: 20524.19375
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 29075.09476
+  tps: 20643.31728
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 28907.31514
+  tps: 20524.19375
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 28907.31514
+  tps: 20524.19375
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 29430.30597
+  tps: 20895.51724
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 28968.33253
+  tps: 20567.5161
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 28907.31514
+  tps: 20524.19375
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 28907.31514
+  tps: 20524.19375
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 28907.31514
+  tps: 20524.19375
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 28907.31514
+  tps: 20524.19375
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -694,6 +855,13 @@ dps_results: {
   tps: 20925.95084
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 29771.68344
+  tps: 21137.89524
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-ForestwalkerIdolofRage-92142"
  value: {
@@ -764,6 +932,13 @@ dps_results: {
   tps: 19675.98132
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 29771.68344
+  tps: 21137.89524
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-Golad,TwilightofAspects-77949"
  value: {
@@ -869,6 +1044,13 @@ dps_results: {
   tps: 21137.89524
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 29816.8175
+  tps: 21169.94043
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1086,6 +1268,20 @@ dps_results: {
   tps: 20453.47409
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 29687.43684
+  tps: 21078.08016
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 29687.43684
+  tps: 21078.08016
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1387,6 +1583,20 @@ dps_results: {
   tps: 21001.81349
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 29238.80996
+  tps: 20759.55507
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 29989.08598
+  tps: 21292.25105
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-Rainsong-55854"
  value: {
@@ -1590,6 +1800,13 @@ dps_results: {
   tps: 20247.87262
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 29910.51776
+  tps: 21236.46761
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-ScalesofLife-68915"
  value: {
@@ -1865,6 +2082,27 @@ dps_results: {
   tps: 20033.4905
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-SunScope-3607"
+ value: {
+  dps: 29834.78995
+  tps: 21182.70086
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 29880.65497
+  tps: 21215.26503
+ }
+}
+dps_results: {
+ key: "TestCombat-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 30157.4353
+  tps: 21411.77906
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-SymbioticWorm-59332"
  value: {
@@ -2026,6 +2264,13 @@ dps_results: {
   tps: 20568.52544
  }
 }
+dps_results: {
+ key: "TestCombat-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 29238.80996
+  tps: 20759.55507
+ }
+}
 dps_results: {
  key: "TestCombat-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/rogue/subtlety/TestSubtlety.results b/sim/rogue/subtlety/TestSubtlety.results
index 5caefe33a7..b8156fef36 100644
--- a/sim/rogue/subtlety/TestSubtlety.results
+++ b/sim/rogue/subtlety/TestSubtlety.results
@@ -407,6 +407,20 @@ dps_results: {
   tps: 17344.37316
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 26348.96853
+  tps: 18707.76766
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 26348.96853
+  tps: 18707.76766
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -491,6 +505,13 @@ dps_results: {
   tps: 18367.07313
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 26491.67489
+  tps: 18809.08917
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -519,6 +540,13 @@ dps_results: {
   tps: 17344.37316
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 26211.13841
+  tps: 18609.90827
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -526,6 +554,139 @@ dps_results: {
   tps: 18275.01619
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 26082.96635
+  tps: 18518.90611
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 26331.81554
+  tps: 18695.58904
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 26362.61255
+  tps: 18717.45491
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 26331.81554
+  tps: 18695.58904
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 26348.96853
+  tps: 18333.6123
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 26362.58156
+  tps: 19091.78157
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 26161.22376
+  tps: 18574.46887
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 26265.23773
+  tps: 18648.31879
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 26082.96635
+  tps: 18518.90611
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 26082.96635
+  tps: 18518.90611
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 26010.51802
+  tps: 18467.4678
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 26082.96635
+  tps: 18518.90611
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 26082.96635
+  tps: 18518.90611
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 26333.72304
+  tps: 18696.94336
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 25804.29343
+  tps: 18321.04834
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 26082.96635
+  tps: 18518.90611
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 26082.96635
+  tps: 18518.90611
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 26082.96635
+  tps: 18518.90611
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 26082.96635
+  tps: 18518.90611
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -673,6 +834,13 @@ dps_results: {
   tps: 18212.64575
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 26491.67489
+  tps: 18809.08917
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-FluidDeath-58181"
  value: {
@@ -750,6 +918,13 @@ dps_results: {
   tps: 17344.37316
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 26491.67489
+  tps: 18809.08917
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-Golad,TwilightofAspects-77949"
  value: {
@@ -855,6 +1030,13 @@ dps_results: {
   tps: 18809.08917
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 26489.4737
+  tps: 18807.52633
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1065,6 +1247,20 @@ dps_results: {
   tps: 17813.08371
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 26348.96853
+  tps: 18707.76766
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 26348.96853
+  tps: 18707.76766
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1345,6 +1541,20 @@ dps_results: {
   tps: 18572.00219
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 26211.13841
+  tps: 18609.90827
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 26483.19658
+  tps: 18803.06957
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-Rainsong-55854"
  value: {
@@ -1548,6 +1758,13 @@ dps_results: {
   tps: 17729.13629
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 26586.76007
+  tps: 18876.59965
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-ScalesofLife-68915"
  value: {
@@ -1802,6 +2019,27 @@ dps_results: {
   tps: 17532.59401
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-SunScope-3607"
+ value: {
+  dps: 26534.89542
+  tps: 18839.77575
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 26489.2844
+  tps: 18807.39192
+ }
+}
+dps_results: {
+ key: "TestSubtlety-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 26683.83083
+  tps: 18945.51989
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-SymbioticWorm-59332"
  value: {
@@ -1963,6 +2201,13 @@ dps_results: {
   tps: 17912.97005
  }
 }
+dps_results: {
+ key: "TestSubtlety-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 26211.13841
+  tps: 18609.90827
+ }
+}
 dps_results: {
  key: "TestSubtlety-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
index 458f40404c..e9e0ab00b8 100644
--- a/sim/shaman/elemental/TestElemental.results
+++ b/sim/shaman/elemental/TestElemental.results
@@ -421,6 +421,20 @@ dps_results: {
   tps: 1520.67218
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 49790.15758
+  tps: 1724.46355
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 49790.15758
+  tps: 1723.15876
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -505,6 +519,13 @@ dps_results: {
   tps: 1751.1669
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 50650.14849
+  tps: 1766.93705
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -533,6 +554,13 @@ dps_results: {
   tps: 635.29546
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 50650.14849
+  tps: 1766.93705
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -540,6 +568,146 @@ dps_results: {
   tps: 1761.59648
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 49962.91763
+  tps: 1720.37483
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 50472.31115
+  tps: 1789.07039
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 50472.31115
+  tps: 1789.07039
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 50623.74085
+  tps: 1768.30252
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 50472.31115
+  tps: 1789.07039
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 49790.15758
+  tps: 1700.57405
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 50472.31115
+  tps: 1812.21658
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 50013.32505
+  tps: 1805.97011
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 49962.91763
+  tps: 1720.37483
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 50270.26516
+  tps: 1730.07725
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 49962.91763
+  tps: 1720.37483
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 49962.91763
+  tps: 1720.37483
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 49962.91763
+  tps: 1720.37483
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 49962.91763
+  tps: 1720.37483
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 50394.18532
+  tps: 1739.27772
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 49962.91763
+  tps: 1720.37483
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 49962.91763
+  tps: 1720.37483
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 49962.91763
+  tps: 1720.37483
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 49960.64273
+  tps: 1719.95805
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 49962.91763
+  tps: 1720.37483
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -680,6 +848,13 @@ dps_results: {
   tps: 1747.7952
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 50650.14849
+  tps: 1766.93705
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-FluidDeath-58181"
  value: {
@@ -757,6 +932,13 @@ dps_results: {
   tps: 625.42239
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 50650.14849
+  tps: 1766.93705
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-GraceoftheHerald-55266"
  value: {
@@ -855,6 +1037,13 @@ dps_results: {
   tps: 1766.93705
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 50718.6744
+  tps: 1766.22689
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1065,6 +1254,13 @@ dps_results: {
   tps: 622.20055
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 50111.67234
+  tps: 1726.6649
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1366,6 +1562,20 @@ dps_results: {
   tps: 622.20055
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 50650.14849
+  tps: 1766.93705
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 50650.14849
+  tps: 1766.93705
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-Rainsong-55854"
  value: {
@@ -1576,6 +1786,13 @@ dps_results: {
   tps: 622.20055
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 50650.14849
+  tps: 1766.93705
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-ScalesofLife-68915"
  value: {
@@ -1851,6 +2068,27 @@ dps_results: {
   tps: 623.40326
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-SunScope-3607"
+ value: {
+  dps: 50650.14849
+  tps: 1766.93705
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 49790.15758
+  tps: 1723.15876
+ }
+}
+dps_results: {
+ key: "TestElemental-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 49790.15758
+  tps: 1723.15876
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-SymbioticWorm-59332"
  value: {
@@ -2033,6 +2271,13 @@ dps_results: {
   tps: 622.20055
  }
 }
+dps_results: {
+ key: "TestElemental-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 50650.14849
+  tps: 1766.93705
+ }
+}
 dps_results: {
  key: "TestElemental-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
index 49fd33d91e..eccd582029 100644
--- a/sim/shaman/enhancement/TestEnhancement.results
+++ b/sim/shaman/enhancement/TestEnhancement.results
@@ -428,6 +428,20 @@ dps_results: {
   tps: 30999.05396
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 49611.86971
+  tps: 33008.55452
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 49611.86971
+  tps: 33007.81212
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -512,6 +526,13 @@ dps_results: {
   tps: 32456.10049
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 49722.29247
+  tps: 33096.49433
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -547,6 +568,13 @@ dps_results: {
   tps: 30043.2693
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 49133.07263
+  tps: 32743.08666
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -554,6 +582,146 @@ dps_results: {
   tps: 32391.47367
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 48986.1435
+  tps: 32663.05884
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 49680.5155
+  tps: 33069.77916
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 49577.80472
+  tps: 33004.72285
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantBoots-Lavawalker-4104"
+ value: {
+  dps: 49671.95909
+  tps: 33050.80612
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 49577.80472
+  tps: 33004.72285
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 49611.86971
+  tps: 32352.51749
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 49546.9388
+  tps: 33666.047
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 49338.50611
+  tps: 33065.66799
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 49311.76148
+  tps: 32854.93211
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 49115.68366
+  tps: 32845.26349
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 48986.1435
+  tps: 32663.05884
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 49039.3306
+  tps: 32859.04574
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 48986.1435
+  tps: 32663.05884
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 48986.1435
+  tps: 32663.05884
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 49404.46328
+  tps: 33027.02583
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 48881.76784
+  tps: 32747.88872
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 48986.1435
+  tps: 32663.05884
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 48997.23691
+  tps: 32674.35211
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 49003.41943
+  tps: 32709.85415
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 48986.1435
+  tps: 32663.05884
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -694,6 +862,13 @@ dps_results: {
   tps: 32459.7322
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 49635.6485
+  tps: 33070.11124
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-FluidDeath-58181"
  value: {
@@ -771,6 +946,13 @@ dps_results: {
   tps: 30021.37016
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 49722.29247
+  tps: 33096.49433
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-GraceoftheHerald-55266"
  value: {
@@ -869,6 +1051,13 @@ dps_results: {
   tps: 33096.49433
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 49818.76214
+  tps: 33153.29591
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1079,6 +1268,20 @@ dps_results: {
   tps: 30661.92065
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 49612.12149
+  tps: 33007.81276
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 49644.5591
+  tps: 33051.7816
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1373,6 +1576,20 @@ dps_results: {
   tps: 31372.90478
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 49133.07263
+  tps: 32743.08666
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 49580.53605
+  tps: 33069.30993
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-Rainsong-55854"
  value: {
@@ -1583,6 +1800,13 @@ dps_results: {
   tps: 30477.3576
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 49877.94868
+  tps: 33189.03446
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-ScalesofLife-68915"
  value: {
@@ -1858,6 +2082,27 @@ dps_results: {
   tps: 30283.18435
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-SunScope-3607"
+ value: {
+  dps: 49793.04529
+  tps: 33138.55803
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 49803.70879
+  tps: 33121.65598
+ }
+}
+dps_results: {
+ key: "TestEnhancement-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 50061.21656
+  tps: 33271.02901
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-SymbioticWorm-59332"
  value: {
@@ -2040,6 +2285,13 @@ dps_results: {
   tps: 31266.01514
  }
 }
+dps_results: {
+ key: "TestEnhancement-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 49133.07263
+  tps: 32743.08666
+ }
+}
 dps_results: {
  key: "TestEnhancement-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/warlock/affliction/TestAffliction.results b/sim/warlock/affliction/TestAffliction.results
index 1d4ab7091a..2212d11e61 100644
--- a/sim/warlock/affliction/TestAffliction.results
+++ b/sim/warlock/affliction/TestAffliction.results
@@ -400,6 +400,20 @@ dps_results: {
   tps: 32041.45122
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 46123.09258
+  tps: 32387.07545
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 46136.71985
+  tps: 32378.01922
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -484,6 +498,13 @@ dps_results: {
   tps: 32098.63611
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 46762.08732
+  tps: 32773.16878
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -512,6 +533,13 @@ dps_results: {
   tps: 29795.98185
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 46762.08732
+  tps: 32773.16878
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -519,6 +547,139 @@ dps_results: {
   tps: 32305.70538
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 46109.09017
+  tps: 32375.70133
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 46706.45427
+  tps: 32722.65693
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 46688.51716
+  tps: 32675.50132
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 46685.4731
+  tps: 32666.61532
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 46136.71985
+  tps: 31736.57632
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 46659.51388
+  tps: 33327.52083
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 46143.57082
+  tps: 32442.31168
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 46109.09017
+  tps: 32375.70133
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 46314.77828
+  tps: 32525.83401
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 46109.09017
+  tps: 32375.70133
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 46109.09017
+  tps: 32375.70133
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 46109.09017
+  tps: 32375.70133
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 46109.09017
+  tps: 32375.70133
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 46659.8482
+  tps: 32713.40841
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 46109.09017
+  tps: 32375.70133
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 46109.09017
+  tps: 32375.70133
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 46109.09017
+  tps: 32375.70133
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 46099.77217
+  tps: 32366.6882
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 46109.09017
+  tps: 32375.70133
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -659,6 +820,13 @@ dps_results: {
   tps: 32103.82428
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 46762.08732
+  tps: 32773.16878
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-FluidDeath-58181"
  value: {
@@ -736,6 +904,13 @@ dps_results: {
   tps: 30097.74381
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 46762.08732
+  tps: 32773.16878
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-GraceoftheHerald-55266"
  value: {
@@ -827,6 +1002,13 @@ dps_results: {
   tps: 29651.18521
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 46854.6543
+  tps: 32826.70621
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1030,6 +1212,13 @@ dps_results: {
   tps: 29651.18521
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 46383.9099
+  tps: 32517.29171
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1310,6 +1499,20 @@ dps_results: {
   tps: 29621.23242
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 46762.08732
+  tps: 32773.16878
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 46762.08732
+  tps: 32773.16878
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-Rainsong-55854"
  value: {
@@ -1492,6 +1695,13 @@ dps_results: {
   tps: 29651.18521
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 46762.08732
+  tps: 32773.16878
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-ScalesofLife-68915"
  value: {
@@ -1746,6 +1956,27 @@ dps_results: {
   tps: 30605.25892
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-SunScope-3607"
+ value: {
+  dps: 46762.08732
+  tps: 32773.16878
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 46136.71985
+  tps: 32378.01922
+ }
+}
+dps_results: {
+ key: "TestAffliction-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 46136.71985
+  tps: 32378.01922
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-SymbioticWorm-59332"
  value: {
@@ -1900,6 +2131,13 @@ dps_results: {
   tps: 29651.18521
  }
 }
+dps_results: {
+ key: "TestAffliction-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 46762.08732
+  tps: 32773.16878
+ }
+}
 dps_results: {
  key: "TestAffliction-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/warlock/demonology/TestDemonology.results b/sim/warlock/demonology/TestDemonology.results
index bb7f2f9a5c..2a83cfea80 100644
--- a/sim/warlock/demonology/TestDemonology.results
+++ b/sim/warlock/demonology/TestDemonology.results
@@ -400,6 +400,20 @@ dps_results: {
   tps: 23388.34415
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 47366.17293
+  tps: 23656.65749
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 47366.17293
+  tps: 23655.17196
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -484,6 +498,13 @@ dps_results: {
   tps: 23666.21276
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 48117.504
+  tps: 24003.47892
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -512,6 +533,13 @@ dps_results: {
   tps: 21352.77362
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 48117.504
+  tps: 24003.47892
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -519,6 +547,139 @@ dps_results: {
   tps: 23721.61367
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 47528.32006
+  tps: 23703.97031
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 47951.17872
+  tps: 23961.38816
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 47951.17872
+  tps: 23961.38816
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 47951.17872
+  tps: 23961.38816
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 47366.17293
+  tps: 23198.32409
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 47898.04893
+  tps: 24387.20022
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 47649.63382
+  tps: 23958.07979
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 47528.32006
+  tps: 23703.97031
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 47747.50192
+  tps: 23769.47984
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 47528.32006
+  tps: 23703.97031
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 47528.32006
+  tps: 23703.97031
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 47528.32006
+  tps: 23703.97031
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 47528.32006
+  tps: 23703.97031
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 47613.50611
+  tps: 23816.20492
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 47528.32006
+  tps: 23703.97031
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 47528.32006
+  tps: 23703.97031
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 47528.32006
+  tps: 23703.97031
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 47535.95504
+  tps: 23712.84049
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 47528.32006
+  tps: 23703.97031
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -659,6 +820,13 @@ dps_results: {
   tps: 23680.58831
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 48117.504
+  tps: 24003.47892
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-FluidDeath-58181"
  value: {
@@ -736,6 +904,13 @@ dps_results: {
   tps: 21403.26778
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 48117.504
+  tps: 24003.47892
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-GraceoftheHerald-55266"
  value: {
@@ -827,6 +1002,13 @@ dps_results: {
   tps: 21104.17057
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 48187.01415
+  tps: 24042.83637
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1030,6 +1212,13 @@ dps_results: {
   tps: 21104.17057
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 47660.52369
+  tps: 23786.77564
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1310,6 +1499,20 @@ dps_results: {
   tps: 21104.17057
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 48117.504
+  tps: 24003.47892
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 48117.504
+  tps: 24003.47892
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-Rainsong-55854"
  value: {
@@ -1492,6 +1695,13 @@ dps_results: {
   tps: 21104.17057
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 48117.504
+  tps: 24003.47892
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-ScalesofLife-68915"
  value: {
@@ -1746,6 +1956,27 @@ dps_results: {
   tps: 21786.22144
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-SunScope-3607"
+ value: {
+  dps: 48117.504
+  tps: 24003.47892
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 47366.17293
+  tps: 23655.17196
+ }
+}
+dps_results: {
+ key: "TestDemonology-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 47366.17293
+  tps: 23655.17196
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-SymbioticWorm-59332"
  value: {
@@ -1900,6 +2131,13 @@ dps_results: {
   tps: 21104.17057
  }
 }
+dps_results: {
+ key: "TestDemonology-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 48117.504
+  tps: 24003.47892
+ }
+}
 dps_results: {
  key: "TestDemonology-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/warlock/destruction/TestDestruction.results b/sim/warlock/destruction/TestDestruction.results
index 85a910a372..01795976e5 100644
--- a/sim/warlock/destruction/TestDestruction.results
+++ b/sim/warlock/destruction/TestDestruction.results
@@ -400,6 +400,20 @@ dps_results: {
   tps: 29008.99063
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 48963.2355
+  tps: 29262.84616
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 48963.2355
+  tps: 29261.9077
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -484,6 +498,13 @@ dps_results: {
   tps: 29249.04613
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 49724.31985
+  tps: 29698.84831
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -512,6 +533,13 @@ dps_results: {
   tps: 27054.52134
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 49724.31985
+  tps: 29698.84831
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -519,6 +547,139 @@ dps_results: {
   tps: 29306.28184
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 48934.29115
+  tps: 29318.59282
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 49654.06112
+  tps: 29654.47664
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 49654.06112
+  tps: 29654.47664
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 49654.06112
+  tps: 29654.47664
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 48963.2355
+  tps: 28696.52719
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 49593.83934
+  tps: 30188.72417
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 48972.8559
+  tps: 29264.66893
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 48934.29115
+  tps: 29318.59282
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 49323.18819
+  tps: 29529.07092
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 48934.29115
+  tps: 29318.59282
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 48934.29115
+  tps: 29318.59282
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 48934.29115
+  tps: 29318.59282
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 48934.29115
+  tps: 29318.59282
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 49339.11868
+  tps: 29448.16072
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 48934.29115
+  tps: 29318.59282
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 48934.29115
+  tps: 29318.59282
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 48934.29115
+  tps: 29318.59282
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 48927.54739
+  tps: 29311.18838
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 48934.29115
+  tps: 29318.59282
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -659,6 +820,13 @@ dps_results: {
   tps: 29251.14105
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 49724.31985
+  tps: 29698.84831
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-FluidDeath-58181"
  value: {
@@ -736,6 +904,13 @@ dps_results: {
   tps: 27204.02237
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 49724.31985
+  tps: 29698.84831
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-GraceoftheHerald-55266"
  value: {
@@ -827,6 +1002,13 @@ dps_results: {
   tps: 26773.69572
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 49831.27894
+  tps: 29764.44157
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1030,6 +1212,13 @@ dps_results: {
   tps: 26773.69572
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 49421.1501
+  tps: 29553.84841
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1310,6 +1499,20 @@ dps_results: {
   tps: 26773.69572
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 49724.31985
+  tps: 29698.84831
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 49724.31985
+  tps: 29698.84831
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-Rainsong-55854"
  value: {
@@ -1492,6 +1695,13 @@ dps_results: {
   tps: 26773.69572
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 49724.31985
+  tps: 29698.84831
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-ScalesofLife-68915"
  value: {
@@ -1746,6 +1956,27 @@ dps_results: {
   tps: 27517.08772
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-SunScope-3607"
+ value: {
+  dps: 49724.31985
+  tps: 29698.84831
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 48963.2355
+  tps: 29261.9077
+ }
+}
+dps_results: {
+ key: "TestDestruction-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 48963.2355
+  tps: 29261.9077
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-SymbioticWorm-59332"
  value: {
@@ -1900,6 +2131,13 @@ dps_results: {
   tps: 26773.69572
  }
 }
+dps_results: {
+ key: "TestDestruction-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 49724.31985
+  tps: 29698.84831
+ }
+}
 dps_results: {
  key: "TestDestruction-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/warrior/arms/TestArms.results b/sim/warrior/arms/TestArms.results
index 65128f057a..4d3fb9e434 100644
--- a/sim/warrior/arms/TestArms.results
+++ b/sim/warrior/arms/TestArms.results
@@ -407,6 +407,20 @@ dps_results: {
   tps: 31769.55222
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 53424.75707
+  tps: 34119.7489
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 53424.75707
+  tps: 34119.7489
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -491,6 +505,13 @@ dps_results: {
   tps: 33926.6909
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 53605.40438
+  tps: 34235.16458
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -533,6 +554,13 @@ dps_results: {
   tps: 31722.99653
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 53605.40438
+  tps: 34235.16458
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -540,6 +568,139 @@ dps_results: {
   tps: 33631.29815
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 52602.32653
+  tps: 33539.6985
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 53359.55518
+  tps: 34219.44854
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 53287.65375
+  tps: 34138.50115
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 53287.65375
+  tps: 34138.50115
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 53424.75707
+  tps: 33437.50291
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 53435.89612
+  tps: 34800.94553
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 52916.89674
+  tps: 33854.2687
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 53042.69954
+  tps: 33838.43702
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 52602.32653
+  tps: 33539.6985
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 52602.32653
+  tps: 33539.6985
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 52869.29191
+  tps: 33806.66388
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 52602.32653
+  tps: 33539.6985
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 52602.32653
+  tps: 33539.6985
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 53058.72309
+  tps: 33931.06611
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 52694.07003
+  tps: 33631.442
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 52602.32653
+  tps: 33539.6985
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 52609.17557
+  tps: 33546.54754
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 52602.32653
+  tps: 33539.6985
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 52602.32653
+  tps: 33539.6985
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -680,6 +841,13 @@ dps_results: {
   tps: 33677.7198
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 53605.40438
+  tps: 34235.16458
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-FluidDeath-58181"
  value: {
@@ -757,6 +925,13 @@ dps_results: {
   tps: 31769.55222
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 53605.40438
+  tps: 34235.16458
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-GraceoftheHerald-55266"
  value: {
@@ -862,6 +1037,13 @@ dps_results: {
   tps: 32187.21772
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 53897.30786
+  tps: 34508.55522
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1072,6 +1254,20 @@ dps_results: {
   tps: 32615.33363
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 53424.75707
+  tps: 34119.7489
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 53424.75707
+  tps: 34119.7489
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1387,6 +1583,20 @@ dps_results: {
   tps: 32954.02769
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 53605.40438
+  tps: 34235.16458
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 53605.40438
+  tps: 34235.16458
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-Rainsong-55854"
  value: {
@@ -1569,6 +1779,13 @@ dps_results: {
   tps: 32939.94675
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 53903.7389
+  tps: 34440.10684
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-ScalesofLife-68915"
  value: {
@@ -1847,6 +2064,27 @@ dps_results: {
   tps: 31769.55222
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-SunScope-3607"
+ value: {
+  dps: 53741.01098
+  tps: 34328.32015
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 53605.45736
+  tps: 34248.17716
+ }
+}
+dps_results: {
+ key: "TestArms-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 53857.57566
+  tps: 34426.93425
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-SymbioticWorm-59332"
  value: {
@@ -2001,6 +2239,13 @@ dps_results: {
   tps: 33052.59501
  }
 }
+dps_results: {
+ key: "TestArms-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 53605.40438
+  tps: 34235.16458
+ }
+}
 dps_results: {
  key: "TestArms-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/warrior/fury/TestFury.results b/sim/warrior/fury/TestFury.results
index 0495c7309b..27fc538944 100644
--- a/sim/warrior/fury/TestFury.results
+++ b/sim/warrior/fury/TestFury.results
@@ -421,6 +421,20 @@ dps_results: {
   tps: 39620.72384
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 62855.80751
+  tps: 44242.97143
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 62855.80751
+  tps: 44242.97143
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -505,6 +519,13 @@ dps_results: {
   tps: 43734.18598
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 62833.24537
+  tps: 44122.52648
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -547,6 +568,13 @@ dps_results: {
   tps: 39620.72384
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 62225.86342
+  tps: 43623.82798
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -554,6 +582,139 @@ dps_results: {
   tps: 43352.82957
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 61732.74334
+  tps: 43225.87712
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 62839.23172
+  tps: 44157.88065
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 62755.53748
+  tps: 44036.99368
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 62755.53748
+  tps: 44036.99368
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 62855.80751
+  tps: 43358.24197
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 62622.33069
+  tps: 44830.30764
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 62057.16181
+  tps: 43550.29558
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 62189.68013
+  tps: 43595.52843
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 61732.74334
+  tps: 43225.87712
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 61732.74334
+  tps: 43225.87712
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 61979.82898
+  tps: 43472.96275
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 61732.74334
+  tps: 43225.87712
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 61732.74334
+  tps: 43225.87712
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 62501.16936
+  tps: 43712.48196
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 61824.7442
+  tps: 43317.87798
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 61732.74334
+  tps: 43225.87712
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 61740.01242
+  tps: 43233.14619
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 61732.74334
+  tps: 43225.87712
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-EnchantWeapon-Windwalk-4098"
+ value: {
+  dps: 61732.74334
+  tps: 43225.87712
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -694,6 +855,13 @@ dps_results: {
   tps: 43486.89219
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 62833.24537
+  tps: 44122.52648
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-FluidDeath-58181"
  value: {
@@ -771,6 +939,13 @@ dps_results: {
   tps: 39620.72384
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 62833.24537
+  tps: 44122.52648
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-GraceoftheHerald-55266"
  value: {
@@ -883,6 +1058,13 @@ dps_results: {
   tps: 44122.52648
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 63231.18692
+  tps: 44475.8084
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1093,6 +1275,20 @@ dps_results: {
   tps: 41506.50682
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 62855.80751
+  tps: 44242.97143
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 62855.80751
+  tps: 44242.97143
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1408,6 +1604,20 @@ dps_results: {
   tps: 41668.05179
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 62225.86342
+  tps: 43623.82798
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 63205.96876
+  tps: 44350.84211
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-Rainsong-55854"
  value: {
@@ -1611,6 +1821,13 @@ dps_results: {
   tps: 41162.87295
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 63204.45521
+  tps: 44423.69137
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-ScalesofLife-68915"
  value: {
@@ -1886,6 +2103,27 @@ dps_results: {
   tps: 40277.75565
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-SunScope-3607"
+ value: {
+  dps: 63001.97711
+  tps: 44259.41961
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 63087.86363
+  tps: 44429.48602
+ }
+}
+dps_results: {
+ key: "TestFury-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 63417.72826
+  tps: 44694.97868
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-SymbioticWorm-59332"
  value: {
@@ -2040,6 +2278,13 @@ dps_results: {
   tps: 41234.06947
  }
 }
+dps_results: {
+ key: "TestFury-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 62225.86342
+  tps: 43623.82798
+ }
+}
 dps_results: {
  key: "TestFury-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
diff --git a/sim/warrior/protection/TestProtectionWarrior.results b/sim/warrior/protection/TestProtectionWarrior.results
index 8864a7dbc4..19aa962561 100644
--- a/sim/warrior/protection/TestProtectionWarrior.results
+++ b/sim/warrior/protection/TestProtectionWarrior.results
@@ -481,6 +481,22 @@ dps_results: {
   hps: 975.96349
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-DarkglowEmbroidery-3728"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-DarkglowEmbroidery-4116"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
@@ -577,6 +593,14 @@ dps_results: {
   hps: 1023.71946
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-Diamond-cutRefractorScope-3843"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-DislodgedForeignObject-50348"
  value: {
@@ -625,6 +649,14 @@ dps_results: {
   hps: 975.96349
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-ElementiumShieldSpike-4215"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-EmberShadowspiritDiamond"
  value: {
@@ -633,6 +665,158 @@ dps_results: {
   hps: 1023.71946
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-Enchant2HWeapon-Scourgebane-3247"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantBoots-Assassin'sStep-4105"
+ value: {
+  dps: 6205.56617
+  tps: 36952.84891
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantBoots-EarthenVitality-4062"
+ value: {
+  dps: 6202.32024
+  tps: 36934.45677
+  hps: 1031.35766
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantBoots-Tuskarr'sVitality-3232"
+ value: {
+  dps: 6201.80414
+  tps: 36931.8763
+  hps: 1030.32547
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantCloak-Wisdom-3296"
+ value: {
+  dps: 6201.28805
+  tps: 36190.71657
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantGloves-Armsman-3253"
+ value: {
+  dps: 6201.28805
+  tps: 37667.87507
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-Avalanche-4067"
+ value: {
+  dps: 6310.87832
+  tps: 37477.04708
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-Berserking-3789"
+ value: {
+  dps: 6249.82638
+  tps: 37228.52826
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-BlackMagic-3790"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-BloodDraining-3870"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-ElementalSlayer-4074"
+ value: {
+  dps: 6273.42504
+  tps: 37290.25075
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-GiantSlayer-3251"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-Heartsong-4084"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-Hurricane-4083"
+ value: {
+  dps: 6260.47286
+  tps: 37407.87549
+  hps: 1042.68246
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-Icebreaker-3239"
+ value: {
+  dps: 6225.59342
+  tps: 37050.7216
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-Landslide-4099"
+ value: {
+  dps: 6297.05913
+  tps: 37516.59039
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-Lifeward-3241"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-Mending-4066"
+ value: {
+  dps: 6201.4448
+  tps: 36930.3147
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-EnchantWeapon-PowerTorrent-4097"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-EnigmaticShadowspiritDiamond"
  value: {
@@ -793,6 +977,14 @@ dps_results: {
   hps: 1023.71946
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-Flintlocke'sWoodchucker-4267"
+ value: {
+  dps: 6253.23384
+  tps: 37212.57809
+  hps: 1029.29328
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-FluidDeath-58181"
  value: {
@@ -881,6 +1073,14 @@ dps_results: {
   hps: 975.96349
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-GnomishX-RayScope-4175"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-GraceoftheHerald-55266"
  value: {
@@ -993,6 +1193,14 @@ dps_results: {
   hps: 1029.29328
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-HeartseekerScope-3608"
+ value: {
+  dps: 6221.44674
+  tps: 37040.21173
+  hps: 1029.29328
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ImpassiveShadowspiritDiamond"
  value: {
@@ -1225,6 +1433,22 @@ dps_results: {
   hps: 1042.61465
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-LightweaveEmbroidery-3722"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-LightweaveEmbroidery-4115"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-MagnetiteMirror-55814"
  value: {
@@ -1585,6 +1809,22 @@ dps_results: {
   hps: 1009.28907
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-PyriumShieldSpike-4216"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-R19Threatfinder-4176"
+ value: {
+  dps: 6279.55124
+  tps: 37507.45967
+  hps: 1037.66152
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-Rainsong-55854"
  value: {
@@ -1814,6 +2054,14 @@ dps_results: {
   hps: 975.96349
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-SafetyCatchRemovalKit-4177"
+ value: {
+  dps: 6265.16939
+  tps: 37322.79682
+  hps: 1029.29328
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-ScalesofLife-68915"
  value: {
@@ -2102,6 +2350,30 @@ dps_results: {
   hps: 1042.61465
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-SunScope-3607"
+ value: {
+  dps: 6230.32502
+  tps: 37108.15991
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-SwordguardEmbroidery-3730"
+ value: {
+  dps: 6237.82689
+  tps: 37156.55239
+  hps: 1029.29328
+ }
+}
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-SwordguardEmbroidery-4118"
+ value: {
+  dps: 6289.65183
+  tps: 37474.96756
+  hps: 1029.29328
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-SymbioticWorm-59332"
  value: {
@@ -2278,6 +2550,14 @@ dps_results: {
   hps: 1061.65784
  }
 }
+dps_results: {
+ key: "TestProtectionWarrior-AllItems-TitaniumShieldSpike-3748"
+ value: {
+  dps: 6201.28805
+  tps: 36929.29582
+  hps: 1029.29328
+ }
+}
 dps_results: {
  key: "TestProtectionWarrior-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {