diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results
index a505555ed4..b3e410712b 100644
--- a/sim/warrior/dps/TestArms.results
+++ b/sim/warrior/dps/TestArms.results
@@ -1,18 +1,18 @@
 character_stats_results: {
  key: "TestArms-CharacterStats-Default"
  value: {
-  final_stats: 1233.232
+  final_stats: 1187.472
   final_stats: 1001
   final_stats: 1878.25
   final_stats: 176
   final_stats: 229.9
-  final_stats: 500
+  final_stats: 546
   final_stats: 109
   final_stats: 141
   final_stats: 1145.55
   final_stats: 243
   final_stats: 0
-  final_stats: 6323.53957
+  final_stats: 6310.86757
   final_stats: 141
   final_stats: 2256.75564
   final_stats: 243
@@ -22,10 +22,10 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 13831.5
-  final_stats: 2945.8
+  final_stats: 3033.8
   final_stats: 0
   final_stats: 0
-  final_stats: 616.616
+  final_stats: 593.736
   final_stats: 534.48245
   final_stats: 0
   final_stats: 0
@@ -46,852 +46,852 @@ character_stats_results: {
 dps_results: {
  key: "TestArms-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-AshtongueTalismanofValor-32485"
  value: {
-  dps: 7720.2445
-  tps: 6337.71068
+  dps: 7725.77379
+  tps: 6350.59965
  }
 }
 dps_results: {
  key: "TestArms-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 7970.36656
-  tps: 6548.92328
+  dps: 8031.31712
+  tps: 6600.00354
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 7889.8053
-  tps: 6473.95409
+  dps: 7906.92924
+  tps: 6496.10138
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
   hps: 90.47701
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
   hps: 90.47701
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 8028.94647
-  tps: 6598.18376
+  dps: 8026.03932
+  tps: 6596.47633
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7848.73855
-  tps: 6450.11987
+  dps: 7826.92581
+  tps: 6428.91097
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlackBruise-50035"
  value: {
-  dps: 6197.68779
-  tps: 5151.02174
+  dps: 6202.45297
+  tps: 5158.45038
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlackBruise-50692"
  value: {
-  dps: 6365.02332
-  tps: 5280.47554
+  dps: 6358.67802
+  tps: 5282.27313
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 6726.66959
-  tps: 5525.68853
+  dps: 6721.25626
+  tps: 5519.57309
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6637.73204
-  tps: 5453.07705
+  dps: 6633.08015
+  tps: 5448.80352
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 6344.45116
-  tps: 5217.26559
+  dps: 6395.62831
+  tps: 5264.71824
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6423.62884
+  dps: 8014.849
+  tps: 6454.59423
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 8193.92409
-  tps: 6731.3355
+  dps: 8218.64965
+  tps: 6748.83167
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 8193.92409
-  tps: 6731.3355
+  dps: 8218.64965
+  tps: 6748.83167
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 8193.92409
-  tps: 6731.3355
+  dps: 8218.64965
+  tps: 6748.83167
  }
 }
 dps_results: {
  key: "TestArms-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7705.53052
-  tps: 6328.49172
+  dps: 7682.60172
+  tps: 6316.02094
   hps: 64
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7789.80013
-  tps: 6399.67905
+  dps: 7774.1035
+  tps: 6393.56301
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7848.12626
-  tps: 6446.75315
+  dps: 7806.16953
+  tps: 6418.99466
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Death'sChoice-47464"
  value: {
-  dps: 8298.77968
-  tps: 6814.52714
+  dps: 8259.26661
+  tps: 6787.07993
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7781.06508
-  tps: 6390.12877
+  dps: 7768.79134
+  tps: 6389.38408
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 8213.04818
-  tps: 6744.08063
+  dps: 8209.49482
+  tps: 6746.89707
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 8336.97243
-  tps: 6850.61259
+  dps: 8244.27567
+  tps: 6769.00517
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7721.64678
-  tps: 6342.5613
+  dps: 7718.63801
+  tps: 6348.16082
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 8041.04962
-  tps: 6608.91578
+  dps: 8021.66663
+  tps: 6592.42755
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7901.30906
-  tps: 6490.9814
+  dps: 7919.26656
+  tps: 6507.28507
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7874.68646
-  tps: 6472.16461
+  dps: 7889.27461
+  tps: 6478.11903
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DreadnaughtBattlegear"
  value: {
-  dps: 7507.81256
-  tps: 6177.58592
+  dps: 7483.02671
+  tps: 6158.52646
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DreadnaughtPlate"
  value: {
-  dps: 6601.97431
-  tps: 5404.86491
+  dps: 6547.41159
+  tps: 5364.51487
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 8028.94647
-  tps: 6598.18376
+  dps: 8026.03932
+  tps: 6596.47633
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 8026.59958
-  tps: 6595.96893
+  dps: 8023.32484
+  tps: 6593.96866
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7817.08218
-  tps: 6422.61182
+  dps: 7801.01599
+  tps: 6410.23982
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7837.71053
-  tps: 6438.14578
+  dps: 7811.666
+  tps: 6423.27519
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7799.06607
-  tps: 6407.2932
+  dps: 7763.57482
+  tps: 6384.69388
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7790.05913
-  tps: 6399.999
+  dps: 7752.06064
+  tps: 6375.94499
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 7924.21618
-  tps: 6504.96299
+  dps: 7920.98725
+  tps: 6508.95794
  }
 }
 dps_results: {
  key: "TestArms-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Gladiator'sBattlegear"
  value: {
-  dps: 7840.63166
-  tps: 6405.99783
+  dps: 7824.58828
+  tps: 6397.93187
  }
 }
 dps_results: {
  key: "TestArms-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7829.77437
-  tps: 6432.14341
+  dps: 7789.22453
+  tps: 6406.73956
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Heartpierce-49982"
  value: {
-  dps: 8193.92409
-  tps: 6731.3355
+  dps: 8218.64965
+  tps: 6748.83167
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Heartpierce-50641"
  value: {
-  dps: 8193.92409
-  tps: 6731.3355
+  dps: 8218.64965
+  tps: 6748.83167
  }
 }
 dps_results: {
  key: "TestArms-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 8028.94647
-  tps: 6598.18376
+  dps: 8026.03932
+  tps: 6596.47633
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 8026.59958
-  tps: 6595.96893
+  dps: 8023.32484
+  tps: 6593.96866
  }
 }
 dps_results: {
  key: "TestArms-AllItems-IncisorFragment-37723"
  value: {
-  dps: 7934.74794
-  tps: 6517.98758
+  dps: 7887.69076
+  tps: 6486.26064
  }
 }
 dps_results: {
  key: "TestArms-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 8031.26626
-  tps: 6598.45286
+  dps: 8034.11274
+  tps: 6601.34812
   hps: 14.6381
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 7881.44867
-  tps: 6477.40782
+  dps: 7895.52985
+  tps: 6492.8106
  }
 }
 dps_results: {
  key: "TestArms-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7850.04052
-  tps: 6452.06608
+  dps: 7796.40949
+  tps: 6415.17756
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7716.24541
-  tps: 6337.09898
+  dps: 7719.8841
+  tps: 6349.39674
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OnslaughtArmor"
  value: {
-  dps: 5403.53267
-  tps: 4441.92424
+  dps: 5347.71717
+  tps: 4393.85271
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OnslaughtBattlegear"
  value: {
-  dps: 6253.2988
-  tps: 5122.69278
+  dps: 6273.82817
+  tps: 5155.10852
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 8011.43808
-  tps: 6582.84938
+  dps: 8051.20492
+  tps: 6615.36518
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 8020.10646
-  tps: 6590.78364
+  dps: 8049.22916
+  tps: 6613.17091
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7782.65151
-  tps: 6391.82426
+  dps: 7767.73474
+  tps: 6386.59848
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7788.03759
-  tps: 6396.21335
+  dps: 7765.33137
+  tps: 6384.08585
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 8186.71417
-  tps: 6723.55124
+  dps: 8209.84549
+  tps: 6740.99672
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7709.12641
-  tps: 6331.4875
+  dps: 7688.32769
+  tps: 6319.20778
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Shadowmourne-49623"
  value: {
-  dps: 8193.92409
-  tps: 6731.3355
+  dps: 8218.64965
+  tps: 6748.83167
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SiegebreakerBattlegear"
  value: {
-  dps: 7871.97207
-  tps: 6470.265
+  dps: 7787.4904
+  tps: 6404.45416
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SiegebreakerPlate"
  value: {
-  dps: 6783.17198
-  tps: 5559.03838
+  dps: 6773.49888
+  tps: 5551.13101
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7792.58639
-  tps: 6402.04646
+  dps: 7766.25166
+  tps: 6386.9397
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SparkofLife-37657"
  value: {
-  dps: 7781.63918
-  tps: 6398.2141
+  dps: 7805.02496
+  tps: 6410.80122
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7992.49206
-  tps: 6566.07527
+  dps: 7978.98101
+  tps: 6556.13654
  }
 }
 dps_results: {
  key: "TestArms-AllItems-StormshroudArmor"
  value: {
-  dps: 6341.22593
-  tps: 5208.3079
+  dps: 6321.42138
+  tps: 5193.58057
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 8020.10646
-  tps: 6590.78364
+  dps: 8049.22916
+  tps: 6613.17091
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 8011.43808
-  tps: 6582.84938
+  dps: 8051.20492
+  tps: 6615.36518
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 7978.65099
-  tps: 6554.99651
+  dps: 8027.24502
+  tps: 6596.53339
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheFistsofFury"
  value: {
-  dps: 4749.77155
-  tps: 3991.5529
+  dps: 4719.75569
+  tps: 3972.52195
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5008.662
-  tps: 4206.26568
+  dps: 5018.60417
+  tps: 4215.77602
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8025.56999
-  tps: 6595.53031
+  dps: 8028.51085
+  tps: 6598.39329
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 8160.07801
-  tps: 6704.67475
+  dps: 8154.75679
+  tps: 6697.16643
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 8257.47134
-  tps: 6776.64919
+  dps: 8144.85549
+  tps: 6684.57521
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7824.68041
-  tps: 6429.39381
+  dps: 7721.45466
+  tps: 6346.05005
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 7978.88399
-  tps: 6554.64378
+  dps: 8014.849
+  tps: 6586.24289
  }
 }
 dps_results: {
  key: "TestArms-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6635.4589
-  tps: 5449.60306
+  dps: 6619.85661
+  tps: 5440.89209
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 5155.8869
-  tps: 4354.00585
+  dps: 5196.13673
+  tps: 4391.66498
  }
 }
 dps_results: {
  key: "TestArms-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7705.55304
-  tps: 6328.51424
+  dps: 7682.62424
+  tps: 6316.04346
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Wrynn'sBattlegear"
  value: {
-  dps: 8039.43681
-  tps: 6595.20671
+  dps: 8049.05069
+  tps: 6598.4421
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Wrynn'sPlate"
  value: {
-  dps: 6752.86949
-  tps: 5526.74391
+  dps: 6775.55914
+  tps: 5551.74821
  }
 }
 dps_results: {
  key: "TestArms-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 8431.34414
-  tps: 6930.26321
+  dps: 8453.60764
+  tps: 6958.62602
  }
 }
 dps_results: {
  key: "TestArms-AllItems-YmirjarLord'sPlate"
  value: {
-  dps: 7023.7822
-  tps: 5760.68425
+  dps: 6962.41316
+  tps: 5709.58122
  }
 }
 dps_results: {
  key: "TestArms-Average-Default"
  value: {
-  dps: 8214.26703
-  tps: 6749.65977
+  dps: 8195.53881
+  tps: 6735.98379
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 10911.08187
-  tps: 9314.1144
+  dps: 10914.11286
+  tps: 9309.57413
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8145.1283
-  tps: 6693.83995
+  dps: 8187.58312
+  tps: 6724.39352
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8584.07126
-  tps: 7126.73544
+  dps: 8576.1007
+  tps: 7120.20208
  }
 }
 dps_results: {
@@ -918,22 +918,22 @@ dps_results: {
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 10950.8395
-  tps: 9346.1374
+  dps: 11006.47005
+  tps: 9390.32243
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8193.92409
-  tps: 6731.3355
+  dps: 8218.64965
+  tps: 6748.83167
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8615.20731
-  tps: 7153.89752
+  dps: 8622.529
+  tps: 7161.40019
  }
 }
 dps_results: {
@@ -960,7 +960,7 @@ dps_results: {
 dps_results: {
  key: "TestArms-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7646.51623
-  tps: 6273.19648
+  dps: 7642.06959
+  tps: 6275.10249
  }
 }
diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results
index 043248da37..473b2ab8af 100644
--- a/sim/warrior/dps/TestFury.results
+++ b/sim/warrior/dps/TestFury.results
@@ -1,18 +1,18 @@
 character_stats_results: {
  key: "TestFury-CharacterStats-Default"
  value: {
-  final_stats: 1422.96
+  final_stats: 1370.16
   final_stats: 1001
   final_stats: 1878.25
   final_stats: 176
   final_stats: 229.9
-  final_stats: 500
+  final_stats: 546
   final_stats: 109
   final_stats: 141
   final_stats: 1145.55
   final_stats: 243
   final_stats: 0
-  final_stats: 6740.94117
+  final_stats: 6712.78117
   final_stats: 239.37
   final_stats: 2394.48564
   final_stats: 243
@@ -22,10 +22,10 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 13831.5
-  final_stats: 2945.8
+  final_stats: 3033.8
   final_stats: 0
   final_stats: 0
-  final_stats: 711.48
+  final_stats: 685.08
   final_stats: 534.48245
   final_stats: 0
   final_stats: 0
@@ -46,921 +46,921 @@ character_stats_results: {
 dps_results: {
  key: "TestFury-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-AshtongueTalismanofValor-32485"
  value: {
-  dps: 6481.37599
-  tps: 4799.29244
+  dps: 6448.19519
+  tps: 4773.59605
  }
 }
 dps_results: {
  key: "TestFury-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6661.91249
-  tps: 4935.39202
+  dps: 6631.16119
+  tps: 4911.85815
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 6639.14274
-  tps: 4910.48918
+  dps: 6578.22939
+  tps: 4866.34629
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
   hps: 90.47701
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
   hps: 90.47701
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6660.72249
-  tps: 4935.18656
+  dps: 6630.62326
+  tps: 4908.94884
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 6493.17179
-  tps: 4811.79947
+  dps: 6438.56254
+  tps: 4770.73181
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlackBruise-50035"
  value: {
-  dps: 5831.50415
-  tps: 4332.31289
+  dps: 5794.92784
+  tps: 4301.53013
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlackBruise-50692"
  value: {
-  dps: 5881.40127
-  tps: 4368.96692
+  dps: 5853.70542
+  tps: 4344.27475
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 5307.78493
-  tps: 3946.93959
+  dps: 5267.93986
+  tps: 3912.67782
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 5271.55182
-  tps: 3920.29181
+  dps: 5268.69989
+  tps: 3917.62278
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 4963.24794
-  tps: 3697.07804
+  dps: 4900.9859
+  tps: 3647.23856
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4842.57082
+  dps: 6620.16287
+  tps: 4804.63133
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 6832.90559
-  tps: 5060.65385
+  dps: 6772.12428
+  tps: 5014.22445
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 6832.90559
-  tps: 5060.65385
+  dps: 6772.12428
+  tps: 5014.22445
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6832.90559
-  tps: 5060.65385
+  dps: 6772.12428
+  tps: 5014.22445
  }
 }
 dps_results: {
  key: "TestFury-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
   hps: 64
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6614.90797
-  tps: 4895.3793
+  dps: 6580.26664
+  tps: 4870.13881
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 6653.76078
-  tps: 4923.14547
+  dps: 6584.84149
+  tps: 4872.09713
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Death'sChoice-47464"
  value: {
-  dps: 6985.35515
-  tps: 5163.48307
+  dps: 6928.03621
+  tps: 5118.0116
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 6575.22055
-  tps: 4865.93815
+  dps: 6502.46247
+  tps: 4812.02159
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 6971.44572
-  tps: 5158.28001
+  dps: 6936.24848
+  tps: 5129.10828
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 7015.82317
-  tps: 5184.93847
+  dps: 7039.88812
+  tps: 5204.43156
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Defender'sCode-40257"
  value: {
-  dps: 6421.03052
-  tps: 4756.28434
+  dps: 6410.72404
+  tps: 4745.7986
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6677.89117
-  tps: 4947.694
+  dps: 6646.94772
+  tps: 4920.48846
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 6622.55058
-  tps: 4903.11462
+  dps: 6570.94191
+  tps: 4862.06183
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 6585.2615
-  tps: 4875.58628
+  dps: 6575.82383
+  tps: 4866.72798
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DreadnaughtBattlegear"
  value: {
-  dps: 6081.81705
-  tps: 4514.87268
+  dps: 6003.17285
+  tps: 4451.89366
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DreadnaughtPlate"
  value: {
-  dps: 5215.81883
-  tps: 3877.74525
+  dps: 5167.05416
+  tps: 3840.97477
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6660.72249
-  tps: 4935.18656
+  dps: 6630.62326
+  tps: 4908.94884
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6659.29511
-  tps: 4934.69569
+  dps: 6626.36888
+  tps: 4906.78892
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 6574.81624
-  tps: 4870.40416
+  dps: 6513.48526
+  tps: 4822.64476
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 6633.50081
-  tps: 4908.66418
+  dps: 6595.46016
+  tps: 4879.78626
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6592.02197
-  tps: 4879.38093
+  dps: 6549.61826
+  tps: 4847.74776
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6567.6082
-  tps: 4860.87128
+  dps: 6521.89058
+  tps: 4828.65601
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 6683.85718
-  tps: 4945.23118
+  dps: 6637.01066
+  tps: 4908.25128
  }
 }
 dps_results: {
  key: "TestFury-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Gladiator'sBattlegear"
  value: {
-  dps: 6367.76045
-  tps: 4717.17008
+  dps: 6344.66672
+  tps: 4696.75814
  }
 }
 dps_results: {
  key: "TestFury-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 6624.74724
-  tps: 4901.31271
+  dps: 6579.87022
+  tps: 4869.52715
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Heartpierce-49982"
  value: {
-  dps: 6832.90559
-  tps: 5060.65385
+  dps: 6772.12428
+  tps: 5014.22445
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Heartpierce-50641"
  value: {
-  dps: 6832.90559
-  tps: 5060.65385
+  dps: 6772.12428
+  tps: 5014.22445
  }
 }
 dps_results: {
  key: "TestFury-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6660.72249
-  tps: 4935.18656
+  dps: 6630.62326
+  tps: 4908.94884
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6659.29511
-  tps: 4934.69569
+  dps: 6626.36888
+  tps: 4906.78892
  }
 }
 dps_results: {
  key: "TestFury-AllItems-IncisorFragment-37723"
  value: {
-  dps: 6635.16123
-  tps: 4912.99765
+  dps: 6597.22133
+  tps: 4883.9345
  }
 }
 dps_results: {
  key: "TestFury-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6700.73465
-  tps: 4962.25245
+  dps: 6652.8754
+  tps: 4929.51671
   hps: 14.6381
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 6621.35252
-  tps: 4900.75614
+  dps: 6602.49893
+  tps: 4886.70233
  }
 }
 dps_results: {
  key: "TestFury-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 6655.47964
-  tps: 4925.74033
+  dps: 6601.25952
+  tps: 4884.51276
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 6452.3156
-  tps: 4778.8415
+  dps: 6398.89035
+  tps: 4738.96824
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OnslaughtArmor"
  value: {
-  dps: 4049.23259
-  tps: 3024.36598
+  dps: 4012.18778
+  tps: 2997.59955
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OnslaughtBattlegear"
  value: {
-  dps: 4869.57575
-  tps: 3626.99997
+  dps: 4804.43346
+  tps: 3574.47075
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6660.05143
-  tps: 4934.2729
+  dps: 6644.45395
+  tps: 4922.77521
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6686.2122
-  tps: 4952.45411
+  dps: 6652.77921
+  tps: 4929.26061
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 6491.03224
-  tps: 4806.80889
+  dps: 6446.82198
+  tps: 4771.35577
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 6495.89786
-  tps: 4810.65093
+  dps: 6449.20513
+  tps: 4771.86792
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6825.42249
-  tps: 5056.40941
+  dps: 6769.25525
+  tps: 5012.61197
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 6450.20269
-  tps: 4775.92432
+  dps: 6412.30114
+  tps: 4748.90847
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Shadowmourne-49623"
  value: {
-  dps: 6832.90559
-  tps: 5060.65385
+  dps: 6772.12428
+  tps: 5014.22445
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SiegebreakerBattlegear"
  value: {
-  dps: 6368.43137
-  tps: 4717.85884
+  dps: 6305.14744
+  tps: 4669.22853
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SiegebreakerPlate"
  value: {
-  dps: 5387.86066
-  tps: 4003.89412
+  dps: 5339.5151
+  tps: 3964.88934
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SoulPreserver-37111"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SouloftheDead-40382"
  value: {
-  dps: 6595.89658
-  tps: 4882.13133
+  dps: 6555.80025
+  tps: 4851.92115
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SparkofLife-37657"
  value: {
-  dps: 6563.1271
-  tps: 4860.30269
+  dps: 6526.72813
+  tps: 4831.66522
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 6674.66101
-  tps: 4939.96528
+  dps: 6654.714
+  tps: 4924.12954
  }
 }
 dps_results: {
  key: "TestFury-AllItems-StormshroudArmor"
  value: {
-  dps: 4916.68214
-  tps: 3661.1873
+  dps: 4870.51237
+  tps: 3624.61489
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6686.2122
-  tps: 4952.45411
+  dps: 6652.77921
+  tps: 4929.26061
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6660.05143
-  tps: 4934.2729
+  dps: 6644.45395
+  tps: 4922.77521
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6658.67782
-  tps: 4931.16315
+  dps: 6651.40341
+  tps: 4926.64919
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TheFistsofFury"
  value: {
-  dps: 4972.58066
-  tps: 3694.62252
+  dps: 4902.31095
+  tps: 3642.54859
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5316.69249
-  tps: 3945.16095
+  dps: 5262.7339
+  tps: 3903.08278
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6712.14156
-  tps: 4972.73651
+  dps: 6652.72639
+  tps: 4926.23776
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6818.5214
-  tps: 5039.7778
+  dps: 6807.63061
+  tps: 5031.23862
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6895.82342
-  tps: 5099.08107
+  dps: 6831.42471
+  tps: 5048.27666
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 6504.00478
-  tps: 4814.99854
+  dps: 6478.47867
+  tps: 4797.16973
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6670.30629
-  tps: 4941.01641
+  dps: 6620.16287
+  tps: 4902.30047
  }
 }
 dps_results: {
  key: "TestFury-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 5236.15662
-  tps: 3894.46337
+  dps: 5224.01979
+  tps: 3884.24242
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 5192.54362
-  tps: 3902.50044
+  dps: 5137.3553
+  tps: 3861.80104
  }
 }
 dps_results: {
  key: "TestFury-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6429.11567
-  tps: 4760.8109
+  dps: 6395.9003
+  tps: 4735.80732
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Wrynn'sBattlegear"
  value: {
-  dps: 6524.10653
-  tps: 4833.21675
+  dps: 6459.42853
+  tps: 4783.80499
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Wrynn'sPlate"
  value: {
-  dps: 5379.07434
-  tps: 3999.0807
+  dps: 5336.79169
+  tps: 3964.51458
  }
 }
 dps_results: {
  key: "TestFury-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 7109.33671
-  tps: 5265.04162
+  dps: 7053.53279
+  tps: 5221.56498
  }
 }
 dps_results: {
  key: "TestFury-AllItems-YmirjarLord'sPlate"
  value: {
-  dps: 5619.93587
-  tps: 4172.88164
+  dps: 5578.46703
+  tps: 4136.70992
  }
 }
 dps_results: {
  key: "TestFury-Average-Default"
  value: {
-  dps: 6877.84223
-  tps: 5090.75173
+  dps: 6835.36964
+  tps: 5056.69891
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 9208.28097
-  tps: 7407.24616
+  dps: 9202.73554
+  tps: 7402.99223
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6768.16677
-  tps: 5014.37236
+  dps: 6722.43494
+  tps: 4977.90161
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7519.17708
-  tps: 5565.82197
+  dps: 7482.37822
+  tps: 5534.90339
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 4608.96688
-  tps: 3805.49946
+  dps: 4591.51237
+  tps: 3790.22676
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3014.94713
-  tps: 2262.01884
+  dps: 2994.68796
+  tps: 2244.29207
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3126.41365
-  tps: 2346.7123
+  dps: 3100.29641
+  tps: 2323.85972
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 9332.35301
-  tps: 7502.8816
+  dps: 9310.87911
+  tps: 7489.48353
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6832.90559
-  tps: 5060.65385
+  dps: 6772.12428
+  tps: 5014.22445
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7641.50093
-  tps: 5647.50559
+  dps: 7623.35274
+  tps: 5632.12062
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 4684.40032
-  tps: 3863.22446
+  dps: 4667.3774
+  tps: 3848.32941
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3081.40916
-  tps: 2311.27104
+  dps: 3060.63494
+  tps: 2293.09361
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3160.32418
-  tps: 2370.10427
+  dps: 3135.01969
+  tps: 2347.96284
  }
 }
 dps_results: {
  key: "TestFury-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6313.38867
-  tps: 4677.2382
+  dps: 6267.21583
+  tps: 4643.50106
  }
 }
diff --git a/sim/warrior/dps/dps_warrior_test.go b/sim/warrior/dps/dps_warrior_test.go
index 3d9c7b39ee..0d6abb55d6 100644
--- a/sim/warrior/dps/dps_warrior_test.go
+++ b/sim/warrior/dps/dps_warrior_test.go
@@ -73,7 +73,7 @@ func BenchmarkSimulate(b *testing.B) {
 				Equipment:     FuryP1Gear,
 				Consumes:      FullConsumes,
 				Spec:          PlayerOptionsFury,
-				TalentsString: "32002301233-305053000520310053120500351",
+				TalentsString: FuryTalents,
 				Buffs:         core.FullIndividualBuffs,
 			},
 			core.FullPartyBuffs,
@@ -91,11 +91,11 @@ func BenchmarkSimulate(b *testing.B) {
 	core.RaidBenchmark(b, rsr)
 }
 
-var FuryTalents = "32002301233-305053000520310053120500351"
+var FuryTalents = "30202301233-305053000520310053120500351"
 var FuryGlyphs = &proto.Glyphs{
 	Major1: int32(proto.WarriorMajorGlyph_GlyphOfWhirlwind),
 	Major2: int32(proto.WarriorMajorGlyph_GlyphOfHeroicStrike),
-	Major3: int32(proto.WarriorMajorGlyph_GlyphOfExecution),
+	Major3: int32(proto.WarriorMajorGlyph_GlyphOfRending),
 }
 var ArmsTalents = "3022032023335100102012213231251-305-2033"
 var ArmsGlyphs = &proto.Glyphs{
@@ -168,9 +168,9 @@ var warriorOptions = &proto.Warrior_Options{
 
 var FullConsumes = &proto.Consumes{
 	Flask:         proto.Flask_FlaskOfEndlessRage,
-	DefaultPotion: proto.Potions_IndestructiblePotion,
+	DefaultPotion: proto.Potions_PotionOfSpeed,
 	PrepopPotion:  proto.Potions_PotionOfSpeed,
-	Food:          proto.Food_FoodDragonfinFilet,
+	Food:          proto.Food_FoodFishFeast,
 }
 
 var FuryP1Gear = core.EquipmentSpecFromJsonString(`{"items": [