diff --git a/Omen.lua b/Omen.lua
index fdf934f..f3e5a23 100644
--- a/Omen.lua
+++ b/Omen.lua
@@ -126,7 +126,7 @@ local defaults = {
 			ShowValue = true,
 			UseClassColors = true,
 			BarColor = {r = 1, g = 0, b = 0, a = 1,},
-			UseTankBarColor = true,
+			UseTankBarColor = false,
 			TankBarColor = {r = 1, g = 0, b = 0, a = 1,},
 			AlwaysShowSelf = true,
 			ShowAggroBar = true,
@@ -1205,8 +1205,17 @@ function Omen:UpdateBars()
 
 	if testMode then
 		threatTable = newTable()
+		local classes = self.Options.args.ShowClasses.args.Classes.values
+		local key = next(classes)
 		for i = 1, 25 do
-			threatTable[i] = i*5000
+			if i == 22 then
+				threatTable[UnitGUID("player")] = i*5000
+			else
+				threatTable[i] = i*5000
+				guidNameLookup[i] = classes[key]
+				if key ~= "*NOTINPARTY*" then guidClassLookup[i] = key end
+				key = next(classes, key) or next(classes)
+			end
 		end
 		tankGUID = 25
 		topthreat = 25*5000