--- a/Tests.lua	Sun Apr 19 02:50:40 2009 +1000
+++ b/Tests.lua	Thu Apr 23 04:11:42 2009 +1000
@@ -16,38 +16,44 @@
 --]]
 --
 
-SquawkTester = LibStub("AceAddon-3.0", "AceComm-3.0", "AceConsole-3.0")
+SquawkTester = LibStub("AceAddon-3.0"):NewAddon("SquawkTester", "AceComm-3.0", "AceConsole-3.0")
 
 local Test = SquawkTester
+local Controller = Squawk.Controller
+local Settings = Squawk.Model.UserSettings
 
 function Test:OnInitialize()
-	self:RegisterComm("Squawk", ReceiveMessage)
-	self:RegisterSlashCommand("TestSquawk", "RunTests")
+	self:RegisterComm("Squawk", "ReceiveMessage")
+	self:RegisterChatCommand("TS", "RunTests")
+	self:Print("Initialising Tester")
+
+	self.Tests = { ["a"] = SquawkTester.AddPublicFollower,
+								["b"] = SquawkTester.RemovePublicFollower,
+								["c"] = SquawkTester.AddPrivateFollower,
+								["d"] = SquawkTester.ApprovePendingRequest
+							}
 end
-
-function Test:RunTests()
-	AddPublicFollower()
-	RemovePublicFollower()
-	AddPrivateFollower()
-	ApprovePendingRequest()
+function Test:RunTests(TestNumber)
+	self:Print(TestNumber)
+	self.Tests[TestNumber](Test)
 end
 
 function Test:AddPublicFollower()
-	Squawk.Settings.Private = false
-	Squawk.Controller:IWantToFollowThem(UnitName("player"))
+	Settings:TogglePrivate()
+	Controller:IWantToFollowThem(UnitName("player"))
 end
 
 function Test:RemovePublicFollower()
-	Squawk.Controller:IWantToUnfollowThem(UnitName("player"))
+	Controller:IWantToUnfollowThem(UnitName("player"))
 end
 
 function Test:AddPrivateFollower()
-	Squawk.Settings.Private = true
-	Squawk.Controller:IWantToFollowThem(UnitName("player"))
+	Settings:TogglePrivate()
+	Controller:IWantToFollowThem(UnitName("player"))
 end
 
 function Test:ApprovePendingRequest()
-	Squawk.Controller:ApprovePendingRequest(Name)
+	Controller:ApprovePendingRequest(UnitName("player"))
 end
 
 function Test:ReceiveMessage(Prefix, Message, Distribution, Sender)