10 files changed, 33 insertions, 24 deletions
diff --git a/IRCSharp.Tests/State/Cap.cs b/IRCSharp.Tests/State/Cap.cs
index 3c0faba..ea2c718 100644
--- a/IRCSharp.Tests/State/Cap.cs
+++ b/IRCSharp.Tests/State/Cap.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+using IRCStates;
 using IRCTokens;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace IRCStates.Tests
+namespace IRCSharp.Tests.State
 {
     [TestClass]
     public class Cap
@@ -25,7 +26,7 @@ namespace IRCStates.Tests
         }
 
         [TestMethod]
-        public void LSTwoLines()
+        public void LsTwoLines()
         {
             _server.Parse(new Line("CAP * LS * :a b"));
             CollectionAssert.AreEqual(new Dictionary<string, string>(), _server.AvailableCaps);
@@ -36,7 +37,7 @@ namespace IRCStates.Tests
         }
 
         [TestMethod]
-        public void LSValues()
+        public void LsValues()
         {
             _server.Parse(new Line("CAP * LS :a b= c=1"));
             CollectionAssert.AreEqual(new Dictionary<string, string> {{"a", ""}, {"b", ""}, {"c", "1"}},
@@ -61,7 +62,7 @@ namespace IRCStates.Tests
         }
 
         [TestMethod]
-        public void ACKNotLS()
+        public void ACKNotLs()
         {
             _server.Parse(new Line("CAP * LS a"));
             _server.Parse(new Line("CAP * ACK b"));
@@ -69,14 +70,14 @@ namespace IRCStates.Tests
         }
 
         [TestMethod]
-        public void NEWNoLS()
+        public void NewNoLs()
         {
             _server.Parse(new Line("CAP * NEW :a"));
             CollectionAssert.AreEqual(new Dictionary<string, string> {{"a", ""}}, _server.AvailableCaps);
         }
 
         [TestMethod]
-        public void NEWOneLine()
+        public void NewOneLine()
         {
             _server.Parse(new Line("CAP * LS :a"));
             _server.Parse(new Line("CAP * NEW :b"));
@@ -84,7 +85,7 @@ namespace IRCStates.Tests
         }
 
         [TestMethod]
-        public void NEWTwoLines()
+        public void NewTwoLines()
         {
             _server.Parse(new Line("CAP * LS :a"));
             _server.Parse(new Line("CAP * NEW :b c"));
@@ -93,7 +94,7 @@ namespace IRCStates.Tests
         }
 
         [TestMethod]
-        public void DELNotAcked()
+        public void DelNotAcked()
         {
             _server.Parse(new Line("CAP * DEL a"));
         }
@@ -109,7 +110,7 @@ namespace IRCStates.Tests
         }
 
         [TestMethod]
-        public void DELTwoLS()
+        public void DelTwoLs()
         {
             _server.Parse(new Line("CAP * LS :a b"));
             _server.Parse(new Line("CAP * ACK :a b"));
@@ -119,7 +120,7 @@ namespace IRCStates.Tests
         }
 
         [TestMethod]
-        public void DELTwoDEL()
+        public void DelTwoDel()
         {
             _server.Parse(new Line("CAP * LS :a b"));
             _server.Parse(new Line("CAP * ACK :a b"));
diff --git a/IRCSharp.Tests/State/Casemap.cs b/IRCSharp.Tests/State/Casemap.cs
index 4a02444..29b84d6 100644
--- a/IRCSharp.Tests/State/Casemap.cs
+++ b/IRCSharp.Tests/State/Casemap.cs
@@ -1,7 +1,8 @@
-using IRCTokens;
+using IRCStates;
+using IRCTokens;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace IRCStates.Tests
+namespace IRCSharp.Tests.State
 {
     [TestClass]
     public class Casemap
diff --git a/IRCSharp.Tests/State/Channel.cs b/IRCSharp.Tests/State/Channel.cs
index 6868e0f..10d8a57 100644
--- a/IRCSharp.Tests/State/Channel.cs
+++ b/IRCSharp.Tests/State/Channel.cs
@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using IRCStates;
 using IRCTokens;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace IRCStates.Tests
+namespace IRCSharp.Tests.State
 {
     [TestClass]
     public class Channel
@@ -30,7 +31,6 @@ namespace IRCStates.Tests
             var user = _server.Users["nickname"];
             var chan = _server.Channels["#chan"];
             Assert.IsTrue(chan.Users.ContainsKey(user.NickNameLower));
-            var chanUser = chan.Users[user.NickNameLower];
             CollectionAssert.AreEqual(new List<string> {chan.NameLower}, user.Channels.ToList());
         }
 
diff --git a/IRCSharp.Tests/State/Emit.cs b/IRCSharp.Tests/State/Emit.cs
index 07fea8c..2b4d559 100644
--- a/IRCSharp.Tests/State/Emit.cs
+++ b/IRCSharp.Tests/State/Emit.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+using IRCStates;
 using IRCTokens;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace IRCStates.Tests
+namespace IRCSharp.Tests.State
 {
     [TestClass]
     public class Emit
diff --git a/IRCSharp.Tests/State/ISupport.cs b/IRCSharp.Tests/State/ISupport.cs
index 5cdcc61..a25cba8 100644
--- a/IRCSharp.Tests/State/ISupport.cs
+++ b/IRCSharp.Tests/State/ISupport.cs
@@ -1,10 +1,11 @@
 using System.Collections.Generic;
+using IRCStates;
 using IRCTokens;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 // ReSharper disable InconsistentNaming
 
-namespace IRCStates.Tests
+namespace IRCSharp.Tests.State
 {
     [TestClass]
     public class ISupport
diff --git a/IRCSharp.Tests/State/Mode.cs b/IRCSharp.Tests/State/Mode.cs
index 90763fa..79b8dba 100644
--- a/IRCSharp.Tests/State/Mode.cs
+++ b/IRCSharp.Tests/State/Mode.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+using IRCStates;
 using IRCTokens;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace IRCStates.Tests
+namespace IRCSharp.Tests.State
 {
     [TestClass]
     public class Mode
diff --git a/IRCSharp.Tests/State/Motd.cs b/IRCSharp.Tests/State/Motd.cs
index 2d75982..3efbce7 100644
--- a/IRCSharp.Tests/State/Motd.cs
+++ b/IRCSharp.Tests/State/Motd.cs
@@ -1,8 +1,9 @@
 using System.Collections.Generic;
+using IRCStates;
 using IRCTokens;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace IRCStates.Tests
+namespace IRCSharp.Tests.State
 {
     [TestClass]
     public class Motd
diff --git a/IRCSharp.Tests/State/Sasl.cs b/IRCSharp.Tests/State/Sasl.cs
index 151ccdf..3056a58 100644
--- a/IRCSharp.Tests/State/Sasl.cs
+++ b/IRCSharp.Tests/State/Sasl.cs
@@ -1,7 +1,8 @@
-using IRCTokens;
+using IRCStates;
+using IRCTokens;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace IRCStates.Tests
+namespace IRCSharp.Tests.State
 {
     [TestClass]
     public class Sasl
diff --git a/IRCSharp.Tests/State/User.cs b/IRCSharp.Tests/State/User.cs
index 61d7157..b1c1caf 100644
--- a/IRCSharp.Tests/State/User.cs
+++ b/IRCSharp.Tests/State/User.cs
@@ -1,7 +1,8 @@
-using IRCTokens;
+using IRCStates;
+using IRCTokens;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace IRCStates.Tests
+namespace IRCSharp.Tests.State
 {
     [TestClass]
     public class User
diff --git a/IRCSharp.Tests/State/Who.cs b/IRCSharp.Tests/State/Who.cs
index d091785..2220b12 100644
--- a/IRCSharp.Tests/State/Who.cs
+++ b/IRCSharp.Tests/State/Who.cs
@@ -1,7 +1,8 @@
-using IRCTokens;
+using IRCStates;
+using IRCTokens;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace IRCStates.Tests
+namespace IRCSharp.Tests.State
 {
     [TestClass]
     public class Who