diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results
index 9bc9aa069d..65472fb748 100644
--- a/sim/warlock/dps/TestAffliction.results
+++ b/sim/warlock/dps/TestAffliction.results
@@ -50,61 +50,91 @@ character_stats_results: {
 }
 dps_results: {
  key: "TestAffliction-AllItems-TwilightInvoker'sVestments"
- value: {}
+ value: {
+  dps: 5.18892
+ }
 }
 dps_results: {
  key: "TestAffliction-Average-Default"
- value: {}
+ value: {
+  dps: 5.22068
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-AffItemSwap--FullBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 5.26458
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-AffItemSwap--FullBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 5.26458
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-AffItemSwap--FullBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 8.13721
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-AffItemSwap--NoBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 2.74578
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-AffItemSwap--NoBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 2.74578
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-AffItemSwap--NoBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 4.43909
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-Affliction Warlock--FullBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 5.26458
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-Affliction Warlock--FullBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 5.26458
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-Affliction Warlock--FullBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 8.13721
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-Affliction Warlock--NoBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 2.74578
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-Affliction Warlock--NoBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 2.74578
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-destruction-Affliction Warlock--NoBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 4.43909
+ }
 }
 dps_results: {
  key: "TestAffliction-SwitchInFrontOfTarget-Default"
- value: {}
+ value: {
+  dps: 5.26458
+ }
 }
diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results
index 0bd4512d88..2e53a29b6f 100644
--- a/sim/warlock/dps/TestDemonology.results
+++ b/sim/warlock/dps/TestDemonology.results
@@ -50,79 +50,97 @@ character_stats_results: {
 }
 dps_results: {
  key: "TestDemonology-AllItems-TwilightInvoker'sVestments"
- value: {}
+ value: {
+  dps: 7.12805
+ }
 }
 dps_results: {
  key: "TestDemonology-Average-Default"
- value: {}
+ value: {
+  dps: 7.09776
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock--FullBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 7.08943
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock--FullBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 7.08943
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock--FullBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 12.25988
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock--NoBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 3.31839
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock--NoBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 3.31839
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock--NoBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 6.14755
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-FullBuffs-LongMultiTarget"
  value: {
-  dps: 183.07249
-  tps: 448.83249
+  dps: 191.67286
+  tps: 447.60035
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-FullBuffs-LongSingleTarget"
  value: {
-  dps: 147.23652
-  tps: 160.52452
+  dps: 155.49556
+  tps: 158.88375
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 170.0934
-  tps: 174.12006
+  dps: 179.94431
+  tps: 166.52762
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-NoBuffs-LongMultiTarget"
  value: {
-  dps: 98.94392
-  tps: 359.53059
+  dps: 102.94086
+  tps: 359.09518
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-NoBuffs-LongSingleTarget"
  value: {
-  dps: 72.57656
-  tps: 85.6059
+  dps: 76.81762
+  tps: 85.27772
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destruction-Demonology Warlock-destruction-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 91.49857
-  tps: 97.31523
+  dps: 97.03868
+  tps: 94.02896
  }
 }
 dps_results: {
  key: "TestDemonology-SwitchInFrontOfTarget-Default"
- value: {}
+ value: {
+  dps: 7.08943
+ }
 }
diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results
index 5a2e73fbe5..f59ff9997b 100644
--- a/sim/warlock/dps/TestDestruction.results
+++ b/sim/warlock/dps/TestDestruction.results
@@ -50,79 +50,97 @@ character_stats_results: {
 }
 dps_results: {
  key: "TestDestruction-AllItems-TwilightInvoker'sVestments"
- value: {}
+ value: {
+  dps: 7.12805
+ }
 }
 dps_results: {
  key: "TestDestruction-Average-Default"
- value: {}
+ value: {
+  dps: 7.09776
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock--FullBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 7.08943
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock--FullBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 7.08943
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock--FullBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 12.25988
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock--NoBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 3.31839
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock--NoBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 3.31839
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock--NoBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 6.14755
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-FullBuffs-LongMultiTarget"
  value: {
-  dps: 183.07249
-  tps: 448.83249
+  dps: 191.67286
+  tps: 447.60035
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-FullBuffs-LongSingleTarget"
  value: {
-  dps: 147.23652
-  tps: 160.52452
+  dps: 155.49556
+  tps: 158.88375
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 170.0934
-  tps: 174.12006
+  dps: 179.94431
+  tps: 166.52762
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-NoBuffs-LongMultiTarget"
  value: {
-  dps: 98.94392
-  tps: 359.53059
+  dps: 102.94086
+  tps: 359.09518
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-NoBuffs-LongSingleTarget"
  value: {
-  dps: 72.57656
-  tps: 85.6059
+  dps: 76.81762
+  tps: 85.27772
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destruction-Destruction Warlock-destruction-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 91.49857
-  tps: 97.31523
+  dps: 97.03868
+  tps: 94.02896
  }
 }
 dps_results: {
  key: "TestDestruction-SwitchInFrontOfTarget-Default"
- value: {}
+ value: {
+  dps: 7.08943
+ }
 }
diff --git a/sim/warlock/tank/TestAffliction.results b/sim/warlock/tank/TestAffliction.results
index b7665e3087..c4ba3a03b5 100644
--- a/sim/warlock/tank/TestAffliction.results
+++ b/sim/warlock/tank/TestAffliction.results
@@ -50,145 +50,175 @@ character_stats_results: {
 }
 dps_results: {
  key: "TestAffliction-AllItems-TwilightInvoker'sVestments"
- value: {}
+ value: {
+  dps: 5.17184
+ }
 }
 dps_results: {
  key: "TestAffliction-Average-Default"
- value: {}
+ value: {
+  dps: 5.25203
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap--FullBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 5.27614
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap--FullBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 5.27614
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap--FullBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 8.11172
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap--NoBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 2.71874
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap--NoBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 2.71874
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap--NoBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 4.41435
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap-affi.tank-FullBuffs-LongMultiTarget"
  value: {
-  dps: 167.28966
-  tps: 578.5179
+  dps: 171.43576
+  tps: 576.91079
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap-affi.tank-FullBuffs-LongSingleTarget"
  value: {
-  dps: 113.51915
-  tps: 170.14875
+  dps: 116.97501
+  tps: 169.74169
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap-affi.tank-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 117.63789
-  tps: 170.74929
+  dps: 121.60168
+  tps: 167.88712
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap-affi.tank-NoBuffs-LongMultiTarget"
  value: {
-  dps: 107.17941
-  tps: 517.71481
+  dps: 109.5768
+  tps: 515.51446
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap-affi.tank-NoBuffs-LongSingleTarget"
  value: {
-  dps: 68.78945
-  tps: 103.89169
+  dps: 70.97275
+  tps: 104.03623
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-AffItemSwap-affi.tank-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 71.71283
-  tps: 103.25802
+  dps: 73.29689
+  tps: 98.79096
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock--FullBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 5.27614
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock--FullBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 5.27614
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock--FullBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 8.11172
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock--NoBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 2.71874
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock--NoBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 2.71874
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock--NoBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 4.41435
+ }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock-affi.tank-FullBuffs-LongMultiTarget"
  value: {
-  dps: 167.28966
-  tps: 578.5179
+  dps: 171.43576
+  tps: 576.91079
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock-affi.tank-FullBuffs-LongSingleTarget"
  value: {
-  dps: 113.51915
-  tps: 170.14875
+  dps: 116.97501
+  tps: 169.74169
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock-affi.tank-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 117.63789
-  tps: 170.74929
+  dps: 121.60168
+  tps: 167.88712
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock-affi.tank-NoBuffs-LongMultiTarget"
  value: {
-  dps: 107.17941
-  tps: 517.71481
+  dps: 109.5768
+  tps: 515.51446
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock-affi.tank-NoBuffs-LongSingleTarget"
  value: {
-  dps: 68.78945
-  tps: 103.89169
+  dps: 70.97275
+  tps: 104.03623
  }
 }
 dps_results: {
  key: "TestAffliction-Settings-Orc-25-affi.tank-Affliction Warlock-affi.tank-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 71.71283
-  tps: 103.25802
+  dps: 73.29689
+  tps: 98.79096
  }
 }
 dps_results: {
  key: "TestAffliction-SwitchInFrontOfTarget-Default"
- value: {}
+ value: {
+  dps: 5.27614
+ }
 }
diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results
index 82177fe7fa..d3f95d9edf 100644
--- a/sim/warlock/tank/TestDemonology.results
+++ b/sim/warlock/tank/TestDemonology.results
@@ -50,37 +50,55 @@ character_stats_results: {
 }
 dps_results: {
  key: "TestDemonology-AllItems-TwilightInvoker'sVestments"
- value: {}
+ value: {
+  dps: 5.17184
+ }
 }
 dps_results: {
  key: "TestDemonology-Average-Default"
- value: {}
+ value: {
+  dps: 5.25203
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destro.tank-Demonology Warlock--FullBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 5.27614
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destro.tank-Demonology Warlock--FullBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 5.27614
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destro.tank-Demonology Warlock--FullBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 8.11172
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destro.tank-Demonology Warlock--NoBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 2.71874
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destro.tank-Demonology Warlock--NoBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 2.71874
+ }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-25-destro.tank-Demonology Warlock--NoBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 4.41435
+ }
 }
 dps_results: {
  key: "TestDemonology-SwitchInFrontOfTarget-Default"
- value: {}
+ value: {
+  dps: 5.27614
+ }
 }
diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results
index 8340605130..72fac9b8ef 100644
--- a/sim/warlock/tank/TestDestruction.results
+++ b/sim/warlock/tank/TestDestruction.results
@@ -50,79 +50,97 @@ character_stats_results: {
 }
 dps_results: {
  key: "TestDestruction-AllItems-TwilightInvoker'sVestments"
- value: {}
+ value: {
+  dps: 5.17184
+ }
 }
 dps_results: {
  key: "TestDestruction-Average-Default"
- value: {}
+ value: {
+  dps: 5.25203
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock--FullBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 5.27614
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock--FullBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 5.27614
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock--FullBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 8.11172
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock--NoBuffs-LongMultiTarget"
- value: {}
+ value: {
+  dps: 2.71874
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock--NoBuffs-LongSingleTarget"
- value: {}
+ value: {
+  dps: 2.71874
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock--NoBuffs-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 4.41435
+ }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock-destro.tank-FullBuffs-LongMultiTarget"
  value: {
-  dps: 105.69079
-  tps: 530.68921
+  dps: 113.47197
+  tps: 532.1146
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock-destro.tank-FullBuffs-LongSingleTarget"
  value: {
-  dps: 72.43425
-  tps: 176.68078
+  dps: 79.91296
+  tps: 176.73316
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock-destro.tank-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 75.16322
-  tps: 177.82554
+  dps: 83.89505
+  tps: 173.52299
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock-destro.tank-NoBuffs-LongMultiTarget"
  value: {
-  dps: 59.80328
-  tps: 448.04074
+  dps: 64.07491
+  tps: 448.66235
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock-destro.tank-NoBuffs-LongSingleTarget"
  value: {
-  dps: 39.68099
-  tps: 101.99939
+  dps: 44.14443
+  tps: 103.10609
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-25-destro.tank-Destruction Warlock-destro.tank-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 43.07725
-  tps: 104.2374
+  dps: 48.04939
+  tps: 101.54344
  }
 }
 dps_results: {
  key: "TestDestruction-SwitchInFrontOfTarget-Default"
- value: {}
+ value: {
+  dps: 5.27614
+ }
 }