diff --git a/sim/warrior/dps_warrior/TestP1DPSWarrior.results b/sim/warrior/dps_warrior/TestP1DPSWarrior.results
index 7811c55a5..1984c5aca 100644
--- a/sim/warrior/dps_warrior/TestP1DPSWarrior.results
+++ b/sim/warrior/dps_warrior/TestP1DPSWarrior.results
@@ -1,7 +1,7 @@
 character_stats_results: {
  key: "TestP1DPSWarrior-Phase1-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 466.9
+  final_stats: 462.3
   final_stats: 318.55
   final_stats: 526.355
   final_stats: 102.35
@@ -18,22 +18,22 @@ character_stats_results: {
   final_stats: 21
   final_stats: 0
   final_stats: 0
-  final_stats: 1803.8
+  final_stats: 1794.6
   final_stats: 0
-  final_stats: 38.9275
+  final_stats: 37.9275
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 4943.1
+  final_stats: 4843.1
   final_stats: 620
-  final_stats: 7
-  final_stats: 5.28
   final_stats: 0
-  final_stats: 16.2075
-  final_stats: 5.28
+  final_stats: 5
+  final_stats: 0
+  final_stats: 15.9275
+  final_stats: 5
   final_stats: 0
   final_stats: 7072.55
   final_stats: 35
@@ -41,30 +41,156 @@ character_stats_results: {
   final_stats: 68
   final_stats: 68
   final_stats: 68
-  final_stats: 484
+  final_stats: 384
   final_stats: 0
   final_stats: 0
   final_stats: 0
  }
 }
+stat_weights_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-StatWeights-Default"
+ value: {
+  weights: 0.49761
+  weights: 0.26243
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: -0.09142
+  weights: 0
+  weights: 3.0773
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Average-Default"
+ value: {
+  dps: 252.15479
+  tps: 220.34291
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 33.99834
+  tps: 119.61369
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 30.8644
+  tps: 31.88411
+ }
+}
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 36.58352
-  tps: 41.35192
+  dps: 78.32938
+  tps: 73.13359
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 15.19081
+  tps: 104.56766
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 12.89581
+  tps: 17.50924
  }
 }
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Human-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 1.52378
-  tps: 31.04537
+  dps: 32.9784
+  tps: 36.85281
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 36.5712
+  tps: 121.67198
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 33.43726
+  tps: 33.9424
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 83.96505
+  tps: 77.64213
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 16.24178
+  tps: 105.40844
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 13.94678
+  tps: 18.35001
  }
 }
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-DPS-p1-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 1.96832
-  tps: 30.96791
+  dps: 35.86584
+  tps: 39.16276
+ }
+}
+dps_results: {
+ key: "TestP1DPSWarrior-Phase1-Lvl60-SwitchInFrontOfTarget-Default"
+ value: {
+  dps: 200.34625
+  tps: 176.81359
  }
 }
diff --git a/sim/warrior/tank_warrior/TestP1TankWarrior.results b/sim/warrior/tank_warrior/TestP1TankWarrior.results
index 81693b1bc..4d9233881 100644
--- a/sim/warrior/tank_warrior/TestP1TankWarrior.results
+++ b/sim/warrior/tank_warrior/TestP1TankWarrior.results
@@ -1,7 +1,7 @@
 character_stats_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 466.9
+  final_stats: 462.3
   final_stats: 318.55
   final_stats: 526.355
   final_stats: 102.35
@@ -18,22 +18,22 @@ character_stats_results: {
   final_stats: 21
   final_stats: 0
   final_stats: 0
-  final_stats: 1803.8
+  final_stats: 1794.6
   final_stats: 0
-  final_stats: 34.9275
+  final_stats: 33.9275
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 4943.1
+  final_stats: 4843.1
   final_stats: 620
-  final_stats: 17
-  final_stats: 10.68
+  final_stats: 10
+  final_stats: 10.4
   final_stats: 0
-  final_stats: 16.6075
-  final_stats: 5.68
+  final_stats: 16.3275
+  final_stats: 5.4
   final_stats: 0
   final_stats: 8272.55
   final_stats: 35
@@ -41,7 +41,7 @@ character_stats_results: {
   final_stats: 68
   final_stats: 68
   final_stats: 68
-  final_stats: 484
+  final_stats: 384
   final_stats: 0
   final_stats: 0
   final_stats: 0
@@ -50,7 +50,7 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-StatWeights-Default"
  value: {
-  weights: 0.33185
+  weights: 0.4118
   weights: 0
   weights: 0
   weights: 0
@@ -67,7 +67,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.1389
+  weights: 0.34766
   weights: 0
   weights: 0
   weights: 0
@@ -99,98 +99,98 @@ stat_weights_results: {
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Average-Default"
  value: {
-  dps: 346.44605
-  tps: 520.13985
+  dps: 197.59846
+  tps: 322.92702
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Human-p0.bis-Protection-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 0.23399
-  tps: 42.93425
+  dps: 26.25922
+  tps: 151.69927
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Human-p0.bis-Protection-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 0.01272
-  tps: 4.24878
+  dps: 23.01814
+  tps: 44.96815
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Human-p0.bis-Protection-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 0.06358
-  tps: 19.53095
+  dps: 33.13206
+  tps: 64.84212
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Human-p0.bis-Protection-p1-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 2.92545
-  tps: 144.52657
+  dps: 11.63948
+  tps: 129.84277
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Human-p0.bis-Protection-p1-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 0.14107
-  tps: 38.4179
+  dps: 9.27833
+  tps: 24.42714
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Human-p0.bis-Protection-p1-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 0.18563
-  tps: 56.45677
+  dps: 11.78536
+  tps: 32.92882
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-Protection-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 0.23436
-  tps: 37.85919
+  dps: 28.19751
+  tps: 149.59702
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-Protection-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 0.01309
-  tps: 2.82172
+  dps: 24.95643
+  tps: 47.6159
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-Protection-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 0.06543
-  tps: 12.10563
+  dps: 36.01982
+  tps: 67.90932
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-Protection-p1-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 2.92545
-  tps: 138.35598
+  dps: 12.34613
+  tps: 125.89922
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-Protection-p1-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 0.14107
-  tps: 36.99731
+  dps: 9.98498
+  tps: 25.23359
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-Settings-Orc-p0.bis-Protection-p1-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 0.18563
-  tps: 48.70352
+  dps: 12.82153
+  tps: 33.22788
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 181.07024
-  tps: 273.22144
+  dps: 166.45011
+  tps: 274.27352
  }
 }