diff --git a/sim/rogue/dps_rogue/TestCombat.results b/sim/rogue/dps_rogue/TestCombat.results
deleted file mode 100644
index ea517709d..000000000
--- a/sim/rogue/dps_rogue/TestCombat.results
+++ /dev/null
@@ -1,196 +0,0 @@
-character_stats_results: {
- key: "TestCombat-Phase5-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 264.385
-  final_stats: 471.845
-  final_stats: 453.882
-  final_stats: 127.765
-  final_stats: 197.90925
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 49.6
-  final_stats: 0
-  final_stats: 21
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1914.23
-  final_stats: 9
-  final_stats: 41.27865
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 2448.69
-  final_stats: 1237.845
-  final_stats: 7
-  final_stats: 5.28
-  final_stats: 0
-  final_stats: 36.83731
-  final_stats: 5.28
-  final_stats: 0
-  final_stats: 6181.82
-  final_stats: 27
-  final_stats: 60
-  final_stats: 60
-  final_stats: 60
-  final_stats: 60
-  final_stats: 484
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
- }
-}
-stat_weights_results: {
- key: "TestCombat-Phase5-Lvl60-StatWeights-Default"
- value: {
-  weights: 0.44874
-  weights: 0.82626
-  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.35474
-  weights: 8.21255
-  weights: 8.09257
-  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: "TestCombat-Phase5-Lvl60-Average-Default"
- value: {
-  dps: 997.22622
-  tps: 708.03062
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget"
- value: {
-  dps: 323.23963
-  tps: 229.50013
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget"
- value: {
-  dps: 268.18556
-  tps: 190.41175
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget"
- value: {
-  dps: 334.11111
-  tps: 237.21889
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongMultiTarget"
- value: {
-  dps: 141.94131
-  tps: 100.77833
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongSingleTarget"
- value: {
-  dps: 119.24857
-  tps: 84.66648
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-ShortSingleTarget"
- value: {
-  dps: 149.4038
-  tps: 106.0767
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget"
- value: {
-  dps: 327.41112
-  tps: 232.46189
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget"
- value: {
-  dps: 267.00814
-  tps: 189.57578
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget"
- value: {
-  dps: 338.27197
-  tps: 240.1731
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongMultiTarget"
- value: {
-  dps: 143.8311
-  tps: 102.12008
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongSingleTarget"
- value: {
-  dps: 118.96115
-  tps: 84.46241
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-ShortSingleTarget"
- value: {
-  dps: 152.81415
-  tps: 108.49805
- }
-}
-dps_results: {
- key: "TestCombat-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 777.6791
-  tps: 552.15216
- }
-}
diff --git a/sim/rogue/dps_rogue/TestCombatDaggers.results b/sim/rogue/dps_rogue/TestCombatDaggers.results
new file mode 100644
index 000000000..27398d6e7
--- /dev/null
+++ b/sim/rogue/dps_rogue/TestCombatDaggers.results
@@ -0,0 +1,210 @@
+character_stats_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-CharacterStats-Default"
+ value: {
+  final_stats: 264.385
+  final_stats: 471.845
+  final_stats: 453.882
+  final_stats: 127.765
+  final_stats: 197.90925
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 49.6
+  final_stats: 0
+  final_stats: 21
+  final_stats: 0
+  final_stats: 0
+  final_stats: 1944.23
+  final_stats: 9
+  final_stats: 46.27865
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 2348.69
+  final_stats: 1267.845
+  final_stats: 0
+  final_stats: 5
+  final_stats: 0
+  final_stats: 35.55731
+  final_stats: 5
+  final_stats: 0
+  final_stats: 6181.82
+  final_stats: 27
+  final_stats: 60
+  final_stats: 60
+  final_stats: 60
+  final_stats: 60
+  final_stats: 384
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+ }
+}
+stat_weights_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-StatWeights-Default"
+ value: {
+  weights: 0.41497
+  weights: 0.54125
+  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.32804
+  weights: 12.93856
+  weights: 2.02513
+  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: "TestCombatDaggers-Phase5-Lvl60-AllItems-DarkmantleArmor"
+ value: {
+  dps: 1011.74426
+  tps: 718.33843
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-AllItems-Madcap'sOutfit"
+ value: {
+  dps: 950.58624
+  tps: 674.91623
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Average-Default"
+ value: {
+  dps: 960.07335
+  tps: 681.65208
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 349.17255
+  tps: 247.91251
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 293.40192
+  tps: 208.31536
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 369.96274
+  tps: 262.67354
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 162.09261
+  tps: 115.08576
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 138.10978
+  tps: 98.05794
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 174.69955
+  tps: 124.03668
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 361.29054
+  tps: 256.51628
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 294.85688
+  tps: 209.34839
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 378.6288
+  tps: 268.82645
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 167.26921
+  tps: 118.76114
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 139.40447
+  tps: 98.97717
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 178.36657
+  tps: 126.64026
+ }
+}
+dps_results: {
+ key: "TestCombatDaggers-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
+ value: {
+  dps: 349.73084
+  tps: 248.30889
+ }
+}
diff --git a/sim/rogue/dps_rogue/TestCombatSinisterStrike.results b/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
new file mode 100644
index 000000000..08d9b403e
--- /dev/null
+++ b/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
@@ -0,0 +1,210 @@
+character_stats_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-CharacterStats-Default"
+ value: {
+  final_stats: 264.385
+  final_stats: 471.845
+  final_stats: 453.882
+  final_stats: 127.765
+  final_stats: 197.90925
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 49.6
+  final_stats: 0
+  final_stats: 21
+  final_stats: 0
+  final_stats: 0
+  final_stats: 1914.23
+  final_stats: 9
+  final_stats: 41.27865
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 2448.69
+  final_stats: 1237.845
+  final_stats: 7
+  final_stats: 5.28
+  final_stats: 0
+  final_stats: 36.83731
+  final_stats: 5.28
+  final_stats: 0
+  final_stats: 6181.82
+  final_stats: 27
+  final_stats: 60
+  final_stats: 60
+  final_stats: 60
+  final_stats: 60
+  final_stats: 484
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+ }
+}
+stat_weights_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-StatWeights-Default"
+ value: {
+  weights: 0.44874
+  weights: 0.82626
+  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.35474
+  weights: 8.21255
+  weights: 8.09257
+  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: "TestCombatSinisterStrike-Phase5-Lvl60-AllItems-DarkmantleArmor"
+ value: {
+  dps: 1069.63707
+  tps: 759.44232
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-AllItems-Madcap'sOutfit"
+ value: {
+  dps: 1010.85977
+  tps: 717.71043
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Average-Default"
+ value: {
+  dps: 997.26606
+  tps: 708.0589
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 323.23963
+  tps: 229.50013
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 268.18556
+  tps: 190.41175
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 334.11111
+  tps: 237.21889
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 141.94131
+  tps: 100.77833
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 119.24857
+  tps: 84.66648
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 149.4038
+  tps: 106.0767
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 327.41112
+  tps: 232.46189
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 267.00814
+  tps: 189.57578
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 338.27197
+  tps: 240.1731
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 143.8311
+  tps: 102.12008
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 118.96115
+  tps: 84.46241
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 152.81415
+  tps: 108.49805
+ }
+}
+dps_results: {
+ key: "TestCombatSinisterStrike-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
+ value: {
+  dps: 777.6791
+  tps: 552.15216
+ }
+}
diff --git a/sim/rogue/dps_rogue/TestDaggers.results b/sim/rogue/dps_rogue/TestDaggers.results
deleted file mode 100644
index 3617db17f..000000000
--- a/sim/rogue/dps_rogue/TestDaggers.results
+++ /dev/null
@@ -1,210 +0,0 @@
-character_stats_results: {
- key: "TestDaggers-Phase5-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 223.3
-  final_stats: 465.3
-  final_stats: 343.2
-  final_stats: 94.6
-  final_stats: 80.85
-  final_stats: 150
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 39.6
-  final_stats: 4
-  final_stats: 2
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1644.6
-  final_stats: 11
-  final_stats: 28.05285
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 2337.6
-  final_stats: 809.3
-  final_stats: 7
-  final_stats: 5.28
-  final_stats: 0
-  final_stats: 37.3857
-  final_stats: 5.28
-  final_stats: 0
-  final_stats: 4775
-  final_stats: 27
-  final_stats: 27
-  final_stats: 27
-  final_stats: 27
-  final_stats: 27
-  final_stats: 384
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
- }
-}
-stat_weights_results: {
- key: "TestDaggers-Phase5-Lvl60-StatWeights-Default"
- value: {
-  weights: 0.30367
-  weights: 0.51983
-  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.27607
-  weights: 4.92834
-  weights: 6.98928
-  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: "TestDaggers-Phase5-Lvl60-AllItems-BloodCorruptedLeathers"
- value: {
-  dps: 701.28929
-  tps: 497.91539
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-AllItems-DarkmantleArmor"
- value: {
-  dps: 744.06019
-  tps: 528.28273
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Average-Default"
- value: {
-  dps: 701.70545
-  tps: 498.21087
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongMultiTarget"
- value: {
-  dps: 240.64916
-  tps: 170.86091
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongSingleTarget"
- value: {
-  dps: 204.22951
-  tps: 145.00295
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-ShortSingleTarget"
- value: {
-  dps: 262.0931
-  tps: 186.0861
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongMultiTarget"
- value: {
-  dps: 128.37565
-  tps: 91.14671
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongSingleTarget"
- value: {
-  dps: 111.07043
-  tps: 78.86001
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Human-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-ShortSingleTarget"
- value: {
-  dps: 141.91119
-  tps: 100.75694
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongMultiTarget"
- value: {
-  dps: 236.86317
-  tps: 168.17285
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-LongSingleTarget"
- value: {
-  dps: 196.97329
-  tps: 139.85103
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-FullBuffs-Classic Consumes-ShortSingleTarget"
- value: {
-  dps: 251.5496
-  tps: 178.60021
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongMultiTarget"
- value: {
-  dps: 131.51355
-  tps: 93.37462
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-LongSingleTarget"
- value: {
-  dps: 111.6404
-  tps: 79.26468
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-Settings-Orc-combat_daggers_60-No Poisons-combat_daggers_60-NoBuffs-Classic Consumes-ShortSingleTarget"
- value: {
-  dps: 140.43962
-  tps: 99.71213
- }
-}
-dps_results: {
- key: "TestDaggers-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 610.21842
-  tps: 433.25508
- }
-}
diff --git a/sim/rogue/dps_rogue/TestSwords.results b/sim/rogue/dps_rogue/TestSwords.results
deleted file mode 100644
index 2e4803784..000000000
--- a/sim/rogue/dps_rogue/TestSwords.results
+++ /dev/null
@@ -1,210 +0,0 @@
-character_stats_results: {
- key: "TestSwords-Phase5-Lvl60-CharacterStats-Default"
- value: {
-  final_stats: 223.3
-  final_stats: 465.3
-  final_stats: 343.2
-  final_stats: 94.6
-  final_stats: 80.85
-  final_stats: 150
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 39.6
-  final_stats: 4
-  final_stats: 2
-  final_stats: 0
-  final_stats: 0
-  final_stats: 1644.6
-  final_stats: 11
-  final_stats: 28.05285
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
-  final_stats: 2337.6
-  final_stats: 809.3
-  final_stats: 7
-  final_stats: 5.28
-  final_stats: 0
-  final_stats: 35.3857
-  final_stats: 7.28
-  final_stats: 0
-  final_stats: 4775
-  final_stats: 27
-  final_stats: 27
-  final_stats: 27
-  final_stats: 27
-  final_stats: 27
-  final_stats: 384
-  final_stats: 0
-  final_stats: 0
-  final_stats: 0
- }
-}
-stat_weights_results: {
- key: "TestSwords-Phase5-Lvl60-StatWeights-Default"
- value: {
-  weights: 0.31972
-  weights: 0.55706
-  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.29065
-  weights: 6.14493
-  weights: 7.28395
-  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: "TestSwords-Phase5-Lvl60-AllItems-BloodCorruptedLeathers"
- value: {
-  dps: 741.76681
-  tps: 526.65444
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-AllItems-DarkmantleArmor"
- value: {
-  dps: 782.42826
-  tps: 555.52406
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Average-Default"
- value: {
-  dps: 739.83692
-  tps: 525.28422
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongMultiTarget"
- value: {
-  dps: 255.03671
-  tps: 181.07606
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongSingleTarget"
- value: {
-  dps: 216.44009
-  tps: 153.67247
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-ShortSingleTarget"
- value: {
-  dps: 277.76124
-  tps: 197.21048
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongMultiTarget"
- value: {
-  dps: 136.07819
-  tps: 96.61552
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongSingleTarget"
- value: {
-  dps: 117.73466
-  tps: 83.59161
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Human-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-ShortSingleTarget"
- value: {
-  dps: 150.42586
-  tps: 106.80236
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongMultiTarget"
- value: {
-  dps: 251.02319
-  tps: 178.22647
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-LongSingleTarget"
- value: {
-  dps: 208.74866
-  tps: 148.21155
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-FullBuffs-Classic Consumes-ShortSingleTarget"
- value: {
-  dps: 266.58632
-  tps: 189.27629
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongMultiTarget"
- value: {
-  dps: 139.40437
-  tps: 98.9771
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-LongSingleTarget"
- value: {
-  dps: 118.33882
-  tps: 84.02056
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-Settings-Orc-combat_swords_60-No Poisons-combat_swords_60-NoBuffs-Classic Consumes-ShortSingleTarget"
- value: {
-  dps: 148.86599
-  tps: 105.69486
- }
-}
-dps_results: {
- key: "TestSwords-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
- value: {
-  dps: 635.5103
-  tps: 451.21232
- }
-}
diff --git a/sim/rogue/dps_rogue/dps_rogue_test.go b/sim/rogue/dps_rogue/dps_rogue_test.go
index 392ac90f0..9ff598f38 100644
--- a/sim/rogue/dps_rogue/dps_rogue_test.go
+++ b/sim/rogue/dps_rogue/dps_rogue_test.go
@@ -11,7 +11,7 @@ func init() {
 	RegisterDpsRogue()
 }
 
-func CombatSinisterStrike(t *testing.T) {
+func TestCombatSinisterStrike(t *testing.T) {
 	core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{
 		{
 			Class:      proto.Class_ClassRogue,
@@ -34,7 +34,7 @@ func CombatSinisterStrike(t *testing.T) {
 	}))
 }
 
-func CombatDaggers(t *testing.T) {
+func TestCombatDaggers(t *testing.T) {
 	core.RunTestSuite(t, t.Name(), core.FullCharacterTestSuiteGenerator([]core.CharacterSuiteConfig{
 		{
 			Class:      proto.Class_ClassRogue,