diff --git a/src/SWTOR.Parser.Tests/ParserTests.cs b/src/SWTOR.Parser.Tests/ParserTests.cs
index 34c95be..b98bed1 100644
--- a/src/SWTOR.Parser.Tests/ParserTests.cs
+++ b/src/SWTOR.Parser.Tests/ParserTests.cs
@@ -124,8 +124,8 @@ public class OneLineAndParry_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.AppendLine("[03/17/2012 19:48:55] [@Invi] [@Argorash] " + 
-                "[Assault {898601647603712}] " + 
+            bldr.AppendLine("[16:17:36.125] [@Rivder] [Krayt Street Thrasher {670156632096768}] " + 
+                "[Ravage {1261367470325760}] " + 
                 "[ApplyEffect {836045448945477}: Damage {836045448945501}] (0 -parry {836045448945503}) <1>");
         }
 
@@ -141,13 +141,14 @@ public void Parse_Should_Return_Entry_Correctly()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(new DateTime(2012, 3, 17, 19, 48, 55, DateTimeKind.Unspecified), entry.timestamp);
-            Assert.AreEqual("Invi", entry.source.name);
+            Assert.AreEqual(new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 16, 17, 36, 125, DateTimeKind.Unspecified), entry.timestamp);
+            Assert.AreEqual("Rivder", entry.source.name);
             Assert.AreEqual(true, entry.source.isPlayer);
-            Assert.AreEqual("Argorash", entry.target.name);
-            Assert.AreEqual(true, entry.target.isPlayer);
-            Assert.AreEqual("Assault", entry.ability.name);
-            Assert.AreEqual(898601647603712, entry.ability.number);
+            Assert.AreEqual("Krayt Street Thrasher", entry.target.name);
+            Assert.AreEqual(670156632096768, entry.target.number);
+            Assert.AreEqual(false, entry.target.isPlayer);
+            Assert.AreEqual("Ravage", entry.ability.name);
+            Assert.AreEqual(1261367470325760, entry.ability.number);
             Assert.AreEqual("ApplyEffect", entry.@event.name);
             Assert.AreEqual(836045448945477, entry.@event.number);
             Assert.AreEqual("Damage", entry.effect.name);
@@ -166,7 +167,7 @@ public class OneLineAndColonInEffect_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.AppendLine("[03/17/2012 19:45:01] [@Argorash] [@Argorash] " + 
+            bldr.AppendLine("[16:37:43.177] [@Rivder] [@Rivder] " +
                 "[Heroic Moment: Call on the Force {1412666283261952}] " + 
                 "[ApplyEffect {836045448945477}: Heroic Moment: Call on the Force {1412666283261952}] ()");
         }
@@ -182,10 +183,10 @@ public void Parse_Should_Return_Entry_Correctly()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(new DateTime(2012, 3, 17, 19, 45, 1, DateTimeKind.Unspecified), entry.timestamp);
-            Assert.AreEqual("Argorash", entry.source.name);
+            Assert.AreEqual(new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 16, 37, 43, 177, DateTimeKind.Unspecified), entry.timestamp);
+            Assert.AreEqual("Rivder", entry.source.name);
             Assert.AreEqual(true, entry.source.isPlayer);
-            Assert.AreEqual("Argorash", entry.target.name);
+            Assert.AreEqual("Rivder", entry.target.name);
             Assert.AreEqual(true, entry.target.isPlayer);
             Assert.AreEqual("Heroic Moment: Call on the Force", entry.ability.name);
             Assert.AreEqual(1412666283261952, entry.ability.number);
@@ -206,9 +207,9 @@ public class OneRowWithZeroDamageButHangingDash_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.AppendLine("[03/01/2012 14:47:11] [@Twos] [@Khantni] " + 
-                "[Affliction (Force) {808192586023173}] " + 
-                "[ApplyEffect {836045448945477}: Damage {836045448945501}] (0 -) <209>");
+            bldr.AppendLine("[01:39:39.776] [@Rivshot] [@Darklink] " +
+                "[Fragmentation Grenade {1624614329384960}] " +
+                "[ApplyEffect {836045448945477}: Damage {836045448945501}] (0 -) <1>");
         }
 
         [TestMethod]
@@ -222,13 +223,13 @@ public void Parse_Should_Return_Entry_Correctly()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(new DateTime(2012, 3, 1, 14, 47, 11, DateTimeKind.Unspecified), entry.timestamp);
-            Assert.AreEqual("Twos", entry.source.name);
+            Assert.AreEqual(new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 1, 39, 39, 776, DateTimeKind.Unspecified), entry.timestamp);
+            Assert.AreEqual("Rivshot", entry.source.name);
             Assert.AreEqual(true, entry.source.isPlayer);
-            Assert.AreEqual("Khantni", entry.target.name);
+            Assert.AreEqual("Darklink", entry.target.name);
             Assert.AreEqual(true, entry.target.isPlayer);
-            Assert.AreEqual("Affliction (Force)", entry.ability.name);
-            Assert.AreEqual(808192586023173, entry.ability.number);
+            Assert.AreEqual("Fragmentation Grenade", entry.ability.name);
+            Assert.AreEqual(1624614329384960, entry.ability.number);
             Assert.AreEqual("ApplyEffect", entry.@event.name);
             Assert.AreEqual(836045448945477, entry.@event.number);
             Assert.AreEqual("Damage", entry.effect.name);
@@ -238,7 +239,7 @@ public void Parse_Should_Return_Entry_Correctly()
             Assert.AreEqual(false, entry.result.isCritical);
             Assert.AreEqual("", entry.result.name);
             Assert.AreEqual("", entry.mitigation.name);
-            Assert.AreEqual(209, entry.threat);
+            Assert.AreEqual(1, entry.threat);
         }
     }
 
@@ -247,9 +248,9 @@ public class OneRowWithCritHeal_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.AppendLine("[03/01/2012 14:41:33] [@Twos] [@Twos] " + 
-                "[Resurgence {808699392163840}] " + 
-                "[ApplyEffect {836045448945477}: Heal {836045448945500}] (1485*)");
+            bldr.AppendLine("[01:39:40.383] [@Zartok] [@Rivshot] " +
+                "[Revivification {808703687131136}] " +
+                "[ApplyEffect {836045448945477}: Heal {836045448945500}] (347*) <147>");
         }
 
         [TestMethod]
@@ -263,23 +264,23 @@ public void Parse_Should_Return_Entry_Correctly()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(new DateTime(2012, 3, 1, 14, 41, 33, DateTimeKind.Unspecified), entry.timestamp);
-            Assert.AreEqual("Twos", entry.source.name);
+            Assert.AreEqual(new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 1, 39, 40, 383, DateTimeKind.Unspecified), entry.timestamp);
+            Assert.AreEqual("Zartok", entry.source.name);
             Assert.AreEqual(true, entry.source.isPlayer);
-            Assert.AreEqual("Twos", entry.target.name);
+            Assert.AreEqual("Rivshot", entry.target.name);
             Assert.AreEqual(true, entry.target.isPlayer);
-            Assert.AreEqual("Resurgence", entry.ability.name);
-            Assert.AreEqual(808699392163840, entry.ability.number);
+            Assert.AreEqual("Revivification", entry.ability.name);
+            Assert.AreEqual(808703687131136, entry.ability.number);
             Assert.AreEqual("ApplyEffect", entry.@event.name);
             Assert.AreEqual(836045448945477, entry.@event.number);
             Assert.AreEqual("Heal", entry.effect.name);
             Assert.AreEqual("", entry.effect.subtype);
             Assert.AreEqual(836045448945500, entry.effect.number);
-            Assert.AreEqual(1485, entry.result.amount);
+            Assert.AreEqual(347, entry.result.amount);
             Assert.AreEqual(true, entry.result.isCritical);
             Assert.AreEqual("", entry.result.name);
             Assert.AreEqual("", entry.mitigation.name);
-            Assert.AreEqual(0, entry.threat);
+            Assert.AreEqual(147, entry.threat);
         }
     }
 
@@ -288,8 +289,8 @@ public class OneRowWithNoTarget_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.AppendLine("[03/01/2012 14:25:55] [@Idrurrez] [] " + 
-                "[Seethe {808226945761280}] " + 
+            bldr.AppendLine("[01:41:08.649] [@Rivshot] [] " +
+                "[Deliverance {880116108361728}] " +
                 "[Event {836045448945472}: AbilityInterrupt {836045448945482}] ()");
         }
 
@@ -304,12 +305,12 @@ public void Parse_Should_Return_Entry_Correctly()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(new DateTime(2012, 3, 1, 14, 25, 55, DateTimeKind.Unspecified), entry.timestamp);
-            Assert.AreEqual("Idrurrez", entry.source.name);
+            Assert.AreEqual(new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 1, 41, 8, 649, DateTimeKind.Unspecified), entry.timestamp);
+            Assert.AreEqual("Rivshot", entry.source.name);
             Assert.AreEqual(true, entry.source.isPlayer);
             Assert.AreEqual("", entry.target.name);
-            Assert.AreEqual("Seethe", entry.ability.name);
-            Assert.AreEqual(808226945761280, entry.ability.number);
+            Assert.AreEqual("Deliverance", entry.ability.name);
+            Assert.AreEqual(880116108361728, entry.ability.number);
             Assert.AreEqual("Event", entry.@event.name);
             Assert.AreEqual(836045448945472, entry.@event.number);
             Assert.AreEqual("AbilityInterrupt", entry.effect.name);
@@ -329,9 +330,9 @@ public class OneRowWithAbsorption_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.AppendLine("[03/01/2012 14:25:53] [@Idrurrez] [@Khantni] " +
-                "[Saber Throw {812165430771712}] [ApplyEffect {836045448945477}: Damage {836045448945501}] " +
-                "(1903* energy {836045448940874} (1903 absorbed {836045448945511})) <1903>");
+            bldr.AppendLine("[01:42:38.840] [@Rivshot] [@Sandals] " +
+                "[Fragmentation Grenade {1624614329384960}] [ApplyEffect {836045448945477}: Damage {836045448945501}] " +
+                "(745 kinetic {836045448940873} (223 absorbed {836045448945511})) <745>");
         }
 
         [TestMethod]
@@ -345,26 +346,26 @@ public void Parse_Should_Return_Entry_Correctly()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(new DateTime(2012, 3, 1, 14, 25, 53, DateTimeKind.Unspecified), entry.timestamp);
-            Assert.AreEqual("Idrurrez", entry.source.name);
+            Assert.AreEqual(new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 1, 42, 38, 840, DateTimeKind.Unspecified), entry.timestamp);
+            Assert.AreEqual("Rivshot", entry.source.name);
             Assert.AreEqual(true, entry.source.isPlayer);
-            Assert.AreEqual("Khantni", entry.target.name);
+            Assert.AreEqual("Sandals", entry.target.name);
             Assert.AreEqual(true, entry.target.isPlayer);
-            Assert.AreEqual("Saber Throw", entry.ability.name);
-            Assert.AreEqual(812165430771712, entry.ability.number);
+            Assert.AreEqual("Fragmentation Grenade", entry.ability.name);
+            Assert.AreEqual(1624614329384960, entry.ability.number);
             Assert.AreEqual("ApplyEffect", entry.@event.name);
             Assert.AreEqual(836045448945477, entry.@event.number);
             Assert.AreEqual("Damage", entry.effect.name);
             Assert.AreEqual("", entry.effect.subtype);
             Assert.AreEqual(836045448945501, entry.effect.number);
-            Assert.AreEqual(1903, entry.result.amount);
-            Assert.AreEqual(true, entry.result.isCritical);
-            Assert.AreEqual("energy", entry.result.name);
-            Assert.AreEqual(836045448940874, entry.result.number);
-            Assert.AreEqual(1903, entry.mitigation.amount);
+            Assert.AreEqual(745, entry.result.amount);
+            Assert.AreEqual(false, entry.result.isCritical);
+            Assert.AreEqual("kinetic", entry.result.name);
+            Assert.AreEqual(836045448940873, entry.result.number);
+            Assert.AreEqual(223, entry.mitigation.amount);
             Assert.AreEqual("absorbed", entry.mitigation.name);
             Assert.AreEqual(836045448945511, entry.mitigation.number);
-            Assert.AreEqual(1903, entry.threat);
+            Assert.AreEqual(745, entry.threat);
         }
     }
 
@@ -373,7 +374,7 @@ public class OneRowWithResultDefenseAndMitigation_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.AppendLine("[03/17/2012 19:49:20] [@Psyfe] [@Argorash] " + 
+            bldr.AppendLine("[09:16:35.166] [@Psyfe] [@Argorash] " + 
                 "[Series of Shots {2299572734918656}] " + 
                 "[ApplyEffect {836045448945477}: Damage {836045448945501}] " + 
                 "(234 energy {836045448940874} -glance {836045448945509} (234 absorbed {836045448945511})) " + 
@@ -391,7 +392,7 @@ public void Parse_Should_Return_Entry_Correctly()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(new DateTime(2012, 3, 17, 19, 49, 20, DateTimeKind.Unspecified), entry.timestamp);
+            Assert.AreEqual(new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 9, 16, 35, 166, DateTimeKind.Unspecified), entry.timestamp);
             Assert.AreEqual("Psyfe", entry.source.name);
             Assert.AreEqual(true, entry.source.isPlayer);
             Assert.AreEqual("Argorash", entry.target.name);
@@ -421,9 +422,9 @@ public class OneRowWithCompanionData_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.AppendLine("[03/17/2012 19:45:10] [@Argorash] [@Argorash:Lieutenant Pierce {493302763749376}] " + 
-                "[Heroic Moment: Call on the Force {1412666283261952}] " + 
-                "[ApplyEffect {836045448945477}: Heal {836045448945500}] (378)");
+            bldr.AppendLine("[16:24:12.706] [@Rivder:Malavai Quinn {493307058716672}] [@Rivder] " +
+                "[Imperial Medical Probe {2466118681755907}] " +
+                "[ApplyEffect {836045448945477}: Heal {836045448945500}] (61) <23>");
         }
 
         [TestMethod]
@@ -437,23 +438,24 @@ public void Parse_Should_Return_Entry_Correctly()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(new DateTime(2012, 3, 17, 19, 45, 10, DateTimeKind.Unspecified), entry.timestamp);
-            Assert.AreEqual("Argorash", entry.source.name);
+            Assert.AreEqual(new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 16, 24, 12, 706, DateTimeKind.Unspecified), entry.timestamp);
+            Assert.AreEqual("Rivder:Malavai Quinn", entry.source.name);
+            Assert.AreEqual(493307058716672, entry.source.number);
             Assert.AreEqual(true, entry.source.isPlayer);
-            Assert.AreEqual("Argorash:Lieutenant Pierce", entry.target.name);
-            Assert.AreEqual(493302763749376, entry.target.number);
+            Assert.AreEqual("Rivder", entry.target.name);
+            Assert.AreEqual(0, entry.target.number);
             Assert.AreEqual(true, entry.target.isPlayer);
-            Assert.AreEqual("Heroic Moment: Call on the Force", entry.ability.name);
-            Assert.AreEqual(1412666283261952, entry.ability.number);
+            Assert.AreEqual("Imperial Medical Probe", entry.ability.name);
+            Assert.AreEqual(2466118681755907, entry.ability.number);
             Assert.AreEqual("ApplyEffect", entry.@event.name);
             Assert.AreEqual(836045448945477, entry.@event.number);
             Assert.AreEqual("Heal", entry.effect.name);
             Assert.AreEqual("", entry.effect.subtype);
             Assert.AreEqual(836045448945500, entry.effect.number);
-            Assert.AreEqual(378, entry.result.amount);
+            Assert.AreEqual(61, entry.result.amount);
             Assert.AreEqual("", entry.result.name);
             Assert.AreEqual(0, entry.result.number);
-            Assert.AreEqual(0, entry.threat);
+            Assert.AreEqual(23, entry.threat);
         }
     }
 
@@ -462,9 +464,9 @@ public class OneRowAmountTypeAndNumberAndMore_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.AppendLine("[03/01/2012 14:23:49] [@Idrurrez] [Elite Tastybobble {846623953387520}] " + 
-                "[Saber Throw {812165430771712}]" + 
-                " [ApplyEffect {836045448945477}: Damage {836045448945501}] (1002 energy {836045448940874}) <1002>");
+            bldr.AppendLine("[16:24:12.606] [Krayt Street Thrasher {670156632096768}] [@Rivder] " +
+                "[Melee Attack {813445331025920}] " +
+                "[ApplyEffect {836045448945477}: Damage {836045448945501}] (48 kinetic {836045448940873}) <48>");
         }
 
         [TestMethod]
@@ -478,23 +480,24 @@ public void Parse_Should_Return_Entry_Correctly()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(new DateTime(2012, 3, 1, 14, 23, 49, DateTimeKind.Unspecified), entry.timestamp);
-            Assert.AreEqual("Idrurrez", entry.source.name);
-            Assert.AreEqual(true, entry.source.isPlayer);
-            Assert.AreEqual("Elite Tastybobble", entry.target.name);
-            Assert.AreEqual(846623953387520, entry.target.number);
-            Assert.AreEqual(false, entry.target.isPlayer);
-            Assert.AreEqual("Saber Throw", entry.ability.name);
-            Assert.AreEqual(812165430771712, entry.ability.number);
+            Assert.AreEqual(new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 16, 24, 12, 606, DateTimeKind.Unspecified), entry.timestamp);
+            Assert.AreEqual("Krayt Street Thrasher", entry.source.name);
+            Assert.AreEqual(670156632096768, entry.source.number);
+            Assert.AreEqual(false, entry.source.isPlayer);
+            Assert.AreEqual("Rivder", entry.target.name);
+            Assert.AreEqual(0, entry.target.number);
+            Assert.AreEqual(true, entry.target.isPlayer);
+            Assert.AreEqual("Melee Attack", entry.ability.name);
+            Assert.AreEqual(813445331025920, entry.ability.number);
             Assert.AreEqual("ApplyEffect", entry.@event.name);
             Assert.AreEqual(836045448945477, entry.@event.number);
             Assert.AreEqual("Damage", entry.effect.name);
             Assert.AreEqual("", entry.effect.subtype);
             Assert.AreEqual(836045448945501, entry.effect.number);
-            Assert.AreEqual(1002, entry.result.amount);
-            Assert.AreEqual("energy", entry.result.name);
-            Assert.AreEqual(836045448940874, entry.result.number);
-            Assert.AreEqual(1002, entry.threat);
+            Assert.AreEqual(48, entry.result.amount);
+            Assert.AreEqual("kinetic", entry.result.name);
+            Assert.AreEqual(836045448940873, entry.result.number);
+            Assert.AreEqual(48, entry.threat);
         }
     }
 
@@ -503,8 +506,8 @@ public class OneRowNullAbility_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.AppendLine("[03/01/2012 14:23:49] [@Idrurrez] [@Idrurrez] [] " + 
-                "[Restore {836045448945476}: focus point {836045448938496}] (3)");
+            bldr.AppendLine("[16:24:13.762] [@Rivder] [@Rivder] [] " +
+                "[Restore {836045448945476}: rage point {836045448938497}] (1)");
         }
 
 
@@ -519,18 +522,18 @@ public void Parse_Should_Return_Entry_Correctly()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(new DateTime(2012, 3, 1, 14, 23, 49, DateTimeKind.Unspecified), entry.timestamp);
-            Assert.AreEqual("Idrurrez", entry.source.name);
+            Assert.AreEqual(new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 16, 24, 13, 762, DateTimeKind.Unspecified), entry.timestamp);
+            Assert.AreEqual("Rivder", entry.source.name);
             Assert.AreEqual(true, entry.source.isPlayer);
-            Assert.AreEqual("Idrurrez", entry.target.name);
+            Assert.AreEqual("Rivder", entry.target.name);
             Assert.AreEqual(true, entry.target.isPlayer);
             Assert.AreEqual("", entry.ability.name);
             Assert.AreEqual("Restore", entry.@event.name);
             Assert.AreEqual(836045448945476, entry.@event.number);
-            Assert.AreEqual("focus point", entry.effect.name);
+            Assert.AreEqual("rage point", entry.effect.name);
             Assert.AreEqual("", entry.effect.subtype);
-            Assert.AreEqual(836045448938496, entry.effect.number);
-            Assert.AreEqual(3, entry.result.amount);
+            Assert.AreEqual(836045448938497, entry.effect.number);
+            Assert.AreEqual(1, entry.result.amount);
         }
     }
 
@@ -539,9 +542,9 @@ public class OneRowNoSubtype_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.AppendLine("[03/01/2012 14:19:14] [@Idrurrez] [@Idrurrez] " + 
-                "[Force Might {1781496599805952}] " + 
-                "[ApplyEffect {836045448945477}: Lucky Shots {1781496599806223}] ()");
+            bldr.AppendLine("[16:16:52.674] [@Rivder] [@Rivder] " +
+                "[Ravage {1261367470325760}] " +
+                "[ApplyEffect {836045448945477}: Unshakable {1261367470326274}] ()");
         }
 
         [TestMethod]
@@ -555,19 +558,20 @@ public void Parse_Should_Return_Entry_Correctly()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(new DateTime(2012, 3, 1, 14, 19, 14, DateTimeKind.Unspecified), entry.timestamp);
-            Assert.AreEqual("Idrurrez", entry.source.name);
+            Assert.AreEqual(new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 16, 16, 52, 674, DateTimeKind.Unspecified), entry.timestamp);
+            Assert.AreEqual("Rivder", entry.source.name);
             Assert.AreEqual(true, entry.source.isPlayer);
-            Assert.AreEqual("Idrurrez", entry.target.name);
+            Assert.AreEqual("Rivder", entry.target.name);
             Assert.AreEqual(true, entry.target.isPlayer);
-            Assert.AreEqual("Force Might", entry.ability.name);
-            Assert.AreEqual(1781496599805952, entry.ability.number);
+            Assert.AreEqual("Ravage", entry.ability.name);
+            Assert.AreEqual(1261367470325760, entry.ability.number);
             Assert.AreEqual("ApplyEffect", entry.@event.name);
             Assert.AreEqual(836045448945477, entry.@event.number);
-            Assert.AreEqual("Lucky Shots", entry.effect.name);
+            Assert.AreEqual("Unshakable", entry.effect.name);
             Assert.AreEqual("", entry.effect.subtype);
-            Assert.AreEqual(1781496599806223, entry.effect.number);
+            Assert.AreEqual(1261367470326274, entry.effect.number);
             Assert.AreEqual(0, entry.result.amount);
+            Assert.AreEqual(0, entry.threat);
         }
     }
 
@@ -576,9 +580,9 @@ public class OneRow_ParserTests : BaseParserTest
     {
         public override void BuildTestString(StringBuilder bldr)
         {
-            bldr.Append("[03/01/2012 14:35:20] [@Idrurrez] [@Khantni] " +
-                         "[Force Clap {2848585519464448}] " +
-                         "[ApplyEffect {836045448945477}: Stunned (Physical) {2848585519464704}] ()");
+            bldr.Append("[16:17:39.833] [@Rivder] [Krayt Slicer {670139452227584}] " +
+                         "[Smash {807801743998976}] " +
+                         "[ApplyEffect {836045448945477}: Stunned (Physical) {807801743999258}] ()");
         }
 
         [TestMethod]
@@ -606,8 +610,8 @@ public void Parse_Should_Return_ForceClap_Ability()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual(entry.ability.name, "Force Clap");
-            Assert.AreEqual(entry.ability.number, 2848585519464448);
+            Assert.AreEqual(entry.ability.name, "Smash");
+            Assert.AreEqual(entry.ability.number, 807801743998976);
         }
 
         [TestMethod]
@@ -625,11 +629,11 @@ public void Parse_Should_Return_ApplyEffect_Event()
             Assert.AreEqual(entry.@event.number, 836045448945477);
             Assert.AreEqual(entry.effect.name, "Stunned");
             Assert.AreEqual(entry.effect.subtype, "Physical");
-            Assert.AreEqual(entry.effect.number, 2848585519464704);
+            Assert.AreEqual(entry.effect.number, 807801743999258);
         }
 
         [TestMethod]
-        public void Parse_Should_Return_Player_Khantni_As_Target()
+        public void Parse_Should_Return_Krayt_Slicer_As_Target()
         {
             // Arrange
             
@@ -639,12 +643,13 @@ public void Parse_Should_Return_Player_Khantni_As_Target()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual("Khantni", entry.target.name);
-            Assert.AreEqual(true, entry.target.isPlayer);
+            Assert.AreEqual("Krayt Slicer", entry.target.name);
+            Assert.AreEqual(false, entry.target.isPlayer);
+            Assert.AreEqual(670139452227584, entry.target.number);
         }
 
         [TestMethod]
-        public void Parse_Should_Return_Player_Idrurrez_As_Source()
+        public void Parse_Should_Return_Player_Rivder_As_Source()
         {
             // Arrange
 
@@ -653,7 +658,7 @@ public void Parse_Should_Return_Player_Idrurrez_As_Source()
 
             // Assert
             var entry = list.First();
-            Assert.AreEqual("Idrurrez", entry.source.name);
+            Assert.AreEqual("Rivder", entry.source.name);
             Assert.AreEqual(true, entry.source.isPlayer);
         }
 
@@ -679,7 +684,8 @@ public void Parse_Should_Return_Correct_Timestamp()
 
             // Assert
             var entry = list.First();
-            var expected = new DateTime(2012, 3, 1, 14, 35, 20, DateTimeKind.Unspecified);
+            var expected = new DateTime(DateTime.Today.Year, DateTime.Today.Month, DateTime.Today.Day, 16, 17, 39, 833, DateTimeKind.Unspecified);
+
             Assert.AreEqual(expected, entry.timestamp);
         }
 
diff --git a/src/SWTOR.Parser.Tests/SWTOR.Parser.Tests.csproj b/src/SWTOR.Parser.Tests/SWTOR.Parser.Tests.csproj
index 8686edb..58772d6 100644
--- a/src/SWTOR.Parser.Tests/SWTOR.Parser.Tests.csproj
+++ b/src/SWTOR.Parser.Tests/SWTOR.Parser.Tests.csproj
@@ -1,56 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>
+    </ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{204E1E03-BABB-4B2E-AC43-7B6D3C87E918}</ProjectGuid>
+    <ProjectGuid>{A8A3BA9C-CB80-45DD-8B97-8B5C0D0692BD}</ProjectGuid>
     <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SWTOR.Parser.Tests</RootNamespace>
     <AssemblyName>SWTOR.Parser.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;</DefineConstants>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -58,7 +38,14 @@
       <HintPath>..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BaseCombatParserIntegrationTest.cs" />
@@ -66,47 +53,34 @@
     <Compile Include="BaseParserTest.cs" />
     <Compile Include="CombatParserTests.cs" />
     <Compile Include="ParserTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
+    <ProjectReference Include="..\SWTOR.Parser\SWTOR.Parser.csproj">
+      <Project>{00D4D026-DA8C-4CB7-A402-6ECA0039DC30}</Project>
+      <Name>SWTOR.Parser</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Samples\LogFileThree.txt" />
     <EmbeddedResource Include="Samples\LogFileOne.txt" />
+    <EmbeddedResource Include="Samples\LogFileThree.txt" />
     <EmbeddedResource Include="Samples\LogFileTwo.txt" />
-  </ItemGroup>
-  <ItemGroup>
+    <EmbeddedResource Include="Samples\oneCombat.txt" />
+    <EmbeddedResource Include="Samples\PTRLargeLog.txt" />
     <EmbeddedResource Include="Samples\PTRMediumLog.txt" />
+    <EmbeddedResource Include="Samples\PTRSmallLog.txt" />
     <EmbeddedResource Include="Samples\PTRXLargeLog.txt" />
     <EmbeddedResource Include="Samples\PTRXXLargeLog.txt" />
-    <EmbeddedResource Include="Samples\PTRSmallLog.txt" />
-    <EmbeddedResource Include="Samples\PTRLargeLog.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SWTOR.Parser\SWTOR.Parser.csproj">
-      <Project>{00D4D026-DA8C-4CB7-A402-6ECA0039DC30}</Project>
-      <Name>SWTOR.Parser</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Samples\oneCombat.txt" />
   </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
\ No newline at end of file
diff --git a/src/SWTOR.Parser.Tests/SWTOR.Parser.Tests.pidb b/src/SWTOR.Parser.Tests/SWTOR.Parser.Tests.pidb
deleted file mode 100644
index ec843a7..0000000
Binary files a/src/SWTOR.Parser.Tests/SWTOR.Parser.Tests.pidb and /dev/null differ
diff --git a/src/SWTOR.Parser.Tests/SWTOR.Parser.mdproj b/src/SWTOR.Parser.Tests/SWTOR.Parser.mdproj
deleted file mode 100644
index a602c0f..0000000
--- a/src/SWTOR.Parser.Tests/SWTOR.Parser.mdproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Default</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ItemType>NUnitAssemblyGroupProject</ItemType>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{F7952F2C-99F2-4BDD-9F1F-07FBE16A6268}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Default|AnyCPU' ">
-    <Assemblies>
-      <Assemblies>
-        <Assembly Path="/Volumes/Storage/Tim/Projects/SWTOR.Parser/bin/Debug/SWTOR.Parser.dll" />
-      </Assemblies>
-    </Assemblies>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/SWTOR.Parser.Tests/packages.config b/src/SWTOR.Parser.Tests/packages.config
index c6de8c3..6ef3640 100644
--- a/src/SWTOR.Parser.Tests/packages.config
+++ b/src/SWTOR.Parser.Tests/packages.config
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.0.12054" />
   <package id="RhinoMocks" version="3.6.1" />
 </packages>
\ No newline at end of file
diff --git a/src/SWTOR.Parser.Tests/test-results/SWTOR.Parser.Tests.csproj-Debug-2012-03-15.xml b/src/SWTOR.Parser.Tests/test-results/SWTOR.Parser.Tests.csproj-Debug-2012-03-15.xml
deleted file mode 100644
index 5a5549d..0000000
--- a/src/SWTOR.Parser.Tests/test-results/SWTOR.Parser.Tests.csproj-Debug-2012-03-15.xml
+++ /dev/null
@@ -1,1133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TestRecord xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <Results>
-    <UnitTestResult>
-      <TestDate>2012-03-15T15:47:29</TestDate>
-      <Status>Failure</Status>
-      <TotalFailures>1</TotalFailures>
-      <TotalSuccess>0</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-      <Message>Child test failed</Message>
-    </UnitTestResult>
-    <UnitTestResult>
-      <TestDate>2012-03-15T15:48:21</TestDate>
-      <Status>Failure</Status>
-      <TotalFailures>1</TotalFailures>
-      <TotalSuccess>0</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-      <Message>Child test failed</Message>
-    </UnitTestResult>
-    <UnitTestResult>
-      <TestDate>2012-03-15T15:48:55</TestDate>
-      <Status>Failure</Status>
-      <TotalFailures>1</TotalFailures>
-      <TotalSuccess>0</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-      <Message>Child test failed</Message>
-    </UnitTestResult>
-    <UnitTestResult>
-      <TestDate>2012-03-15T15:49:05</TestDate>
-      <Status>Failure</Status>
-      <TotalFailures>1</TotalFailures>
-      <TotalSuccess>0</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-      <Message>Child test failed</Message>
-    </UnitTestResult>
-    <UnitTestResult>
-      <TestDate>2012-03-15T15:49:38</TestDate>
-      <Status>Success</Status>
-      <TotalFailures>0</TotalFailures>
-      <TotalSuccess>1</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-    </UnitTestResult>
-    <UnitTestResult>
-      <TestDate>2012-03-15T16:20:09</TestDate>
-      <Status>Success Failure</Status>
-      <TotalFailures>1</TotalFailures>
-      <TotalSuccess>2</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-      <Message>Child test failed</Message>
-    </UnitTestResult>
-    <UnitTestResult>
-      <TestDate>2012-03-15T16:24:10</TestDate>
-      <Status>Success Failure</Status>
-      <TotalFailures>1</TotalFailures>
-      <TotalSuccess>2</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-      <Message>Child test failed</Message>
-    </UnitTestResult>
-    <UnitTestResult>
-      <TestDate>2012-03-15T16:24:59</TestDate>
-      <Status>Success Failure</Status>
-      <TotalFailures>1</TotalFailures>
-      <TotalSuccess>2</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-      <Message>Child test failed</Message>
-    </UnitTestResult>
-    <UnitTestResult>
-      <TestDate>2012-03-15T16:25:42</TestDate>
-      <Status>Success</Status>
-      <TotalFailures>0</TotalFailures>
-      <TotalSuccess>3</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-    </UnitTestResult>
-    <UnitTestResult>
-      <TestDate>2012-03-15T16:37:57</TestDate>
-      <Status>Success Failure</Status>
-      <TotalFailures>1</TotalFailures>
-      <TotalSuccess>3</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-      <Message>Child test failed</Message>
-    </UnitTestResult>
-    <UnitTestResult>
-      <TestDate>2012-03-15T16:57:36</TestDate>
-      <Status>Success Failure</Status>
-      <TotalFailures>1</TotalFailures>
-      <TotalSuccess>3</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-      <Message>Child test failed</Message>
-    </UnitTestResult>
-    <UnitTestResult>
-      <TestDate>2012-03-15T16:58:13</TestDate>
-      <Status>Success</Status>
-      <TotalFailures>0</TotalFailures>
-      <TotalSuccess>4</TotalSuccess>
-      <TotalIgnored>0</TotalIgnored>
-      <Time />
-    </UnitTestResult>
-  </Results>
-  <Tests>
-    <TestRecord Name="SWTOR">
-      <Results>
-        <UnitTestResult>
-          <TestDate>2012-03-15T15:47:29</TestDate>
-          <Status>Failure</Status>
-          <TotalFailures>1</TotalFailures>
-          <TotalSuccess>0</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-          <Message>Child test failed</Message>
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T15:48:21</TestDate>
-          <Status>Failure</Status>
-          <TotalFailures>1</TotalFailures>
-          <TotalSuccess>0</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-          <Message>Child test failed</Message>
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T15:48:55</TestDate>
-          <Status>Failure</Status>
-          <TotalFailures>1</TotalFailures>
-          <TotalSuccess>0</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-          <Message>Child test failed</Message>
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T15:49:05</TestDate>
-          <Status>Failure</Status>
-          <TotalFailures>1</TotalFailures>
-          <TotalSuccess>0</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-          <Message>Child test failed</Message>
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T15:49:38</TestDate>
-          <Status>Success</Status>
-          <TotalFailures>0</TotalFailures>
-          <TotalSuccess>1</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T15:57:09</TestDate>
-          <Status>Success Failure</Status>
-          <TotalFailures>1</TotalFailures>
-          <TotalSuccess>1</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-          <Message>Child test failed</Message>
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T16:04:16</TestDate>
-          <Status>Success</Status>
-          <TotalFailures>0</TotalFailures>
-          <TotalSuccess>2</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T16:20:09</TestDate>
-          <Status>Success Failure</Status>
-          <TotalFailures>1</TotalFailures>
-          <TotalSuccess>2</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-          <Message>Child test failed</Message>
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T16:24:10</TestDate>
-          <Status>Success Failure</Status>
-          <TotalFailures>1</TotalFailures>
-          <TotalSuccess>2</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-          <Message>Child test failed</Message>
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T16:24:59</TestDate>
-          <Status>Success Failure</Status>
-          <TotalFailures>1</TotalFailures>
-          <TotalSuccess>2</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-          <Message>Child test failed</Message>
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T16:25:42</TestDate>
-          <Status>Success</Status>
-          <TotalFailures>0</TotalFailures>
-          <TotalSuccess>3</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T16:37:57</TestDate>
-          <Status>Success Failure</Status>
-          <TotalFailures>1</TotalFailures>
-          <TotalSuccess>3</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-          <Message>Child test failed</Message>
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T16:57:36</TestDate>
-          <Status>Success Failure</Status>
-          <TotalFailures>1</TotalFailures>
-          <TotalSuccess>3</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-          <Message>Child test failed</Message>
-        </UnitTestResult>
-        <UnitTestResult>
-          <TestDate>2012-03-15T16:58:13</TestDate>
-          <Status>Success</Status>
-          <TotalFailures>0</TotalFailures>
-          <TotalSuccess>4</TotalSuccess>
-          <TotalIgnored>0</TotalIgnored>
-          <Time />
-        </UnitTestResult>
-      </Results>
-      <Tests>
-        <TestRecord Name="Parser">
-          <Results>
-            <UnitTestResult>
-              <TestDate>2012-03-15T15:47:29</TestDate>
-              <Status>Failure</Status>
-              <TotalFailures>1</TotalFailures>
-              <TotalSuccess>0</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-              <Message>Child test failed</Message>
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T15:48:21</TestDate>
-              <Status>Failure</Status>
-              <TotalFailures>1</TotalFailures>
-              <TotalSuccess>0</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-              <Message>Child test failed</Message>
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T15:48:55</TestDate>
-              <Status>Failure</Status>
-              <TotalFailures>1</TotalFailures>
-              <TotalSuccess>0</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-              <Message>Child test failed</Message>
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T15:49:05</TestDate>
-              <Status>Failure</Status>
-              <TotalFailures>1</TotalFailures>
-              <TotalSuccess>0</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-              <Message>Child test failed</Message>
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T15:49:38</TestDate>
-              <Status>Success</Status>
-              <TotalFailures>0</TotalFailures>
-              <TotalSuccess>1</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T15:57:09</TestDate>
-              <Status>Success Failure</Status>
-              <TotalFailures>1</TotalFailures>
-              <TotalSuccess>1</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-              <Message>Child test failed</Message>
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T16:04:16</TestDate>
-              <Status>Success</Status>
-              <TotalFailures>0</TotalFailures>
-              <TotalSuccess>2</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T16:20:09</TestDate>
-              <Status>Success Failure</Status>
-              <TotalFailures>1</TotalFailures>
-              <TotalSuccess>2</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-              <Message>Child test failed</Message>
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T16:24:10</TestDate>
-              <Status>Success Failure</Status>
-              <TotalFailures>1</TotalFailures>
-              <TotalSuccess>2</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-              <Message>Child test failed</Message>
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T16:24:59</TestDate>
-              <Status>Success Failure</Status>
-              <TotalFailures>1</TotalFailures>
-              <TotalSuccess>2</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-              <Message>Child test failed</Message>
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T16:25:42</TestDate>
-              <Status>Success</Status>
-              <TotalFailures>0</TotalFailures>
-              <TotalSuccess>3</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T16:37:57</TestDate>
-              <Status>Success Failure</Status>
-              <TotalFailures>1</TotalFailures>
-              <TotalSuccess>3</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-              <Message>Child test failed</Message>
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T16:57:36</TestDate>
-              <Status>Success Failure</Status>
-              <TotalFailures>1</TotalFailures>
-              <TotalSuccess>3</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-              <Message>Child test failed</Message>
-            </UnitTestResult>
-            <UnitTestResult>
-              <TestDate>2012-03-15T16:58:13</TestDate>
-              <Status>Success</Status>
-              <TotalFailures>0</TotalFailures>
-              <TotalSuccess>4</TotalSuccess>
-              <TotalIgnored>0</TotalIgnored>
-              <Time />
-            </UnitTestResult>
-          </Results>
-          <Tests>
-            <TestRecord Name="Tests">
-              <Results>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T15:47:29</TestDate>
-                  <Status>Failure</Status>
-                  <TotalFailures>1</TotalFailures>
-                  <TotalSuccess>0</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                  <Message>Child test failed</Message>
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T15:48:21</TestDate>
-                  <Status>Failure</Status>
-                  <TotalFailures>1</TotalFailures>
-                  <TotalSuccess>0</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                  <Message>Child test failed</Message>
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T15:48:55</TestDate>
-                  <Status>Failure</Status>
-                  <TotalFailures>1</TotalFailures>
-                  <TotalSuccess>0</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                  <Message>Child test failed</Message>
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T15:49:05</TestDate>
-                  <Status>Failure</Status>
-                  <TotalFailures>1</TotalFailures>
-                  <TotalSuccess>0</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                  <Message>Child test failed</Message>
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T15:49:38</TestDate>
-                  <Status>Success</Status>
-                  <TotalFailures>0</TotalFailures>
-                  <TotalSuccess>1</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T15:57:09</TestDate>
-                  <Status>Success Failure</Status>
-                  <TotalFailures>1</TotalFailures>
-                  <TotalSuccess>1</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                  <Message>Child test failed</Message>
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T16:04:16</TestDate>
-                  <Status>Success</Status>
-                  <TotalFailures>0</TotalFailures>
-                  <TotalSuccess>2</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T16:20:09</TestDate>
-                  <Status>Success Failure</Status>
-                  <TotalFailures>1</TotalFailures>
-                  <TotalSuccess>2</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                  <Message>Child test failed</Message>
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T16:24:10</TestDate>
-                  <Status>Success Failure</Status>
-                  <TotalFailures>1</TotalFailures>
-                  <TotalSuccess>2</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                  <Message>Child test failed</Message>
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T16:24:59</TestDate>
-                  <Status>Success Failure</Status>
-                  <TotalFailures>1</TotalFailures>
-                  <TotalSuccess>2</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                  <Message>Child test failed</Message>
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T16:25:42</TestDate>
-                  <Status>Success</Status>
-                  <TotalFailures>0</TotalFailures>
-                  <TotalSuccess>3</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T16:37:57</TestDate>
-                  <Status>Success Failure</Status>
-                  <TotalFailures>1</TotalFailures>
-                  <TotalSuccess>3</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                  <Message>Child test failed</Message>
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T16:57:36</TestDate>
-                  <Status>Success Failure</Status>
-                  <TotalFailures>1</TotalFailures>
-                  <TotalSuccess>3</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                  <Message>Child test failed</Message>
-                </UnitTestResult>
-                <UnitTestResult>
-                  <TestDate>2012-03-15T16:58:13</TestDate>
-                  <Status>Success</Status>
-                  <TotalFailures>0</TotalFailures>
-                  <TotalSuccess>4</TotalSuccess>
-                  <TotalIgnored>0</TotalIgnored>
-                  <Time />
-                </UnitTestResult>
-              </Results>
-              <Tests>
-                <TestRecord Name="ParserTests">
-                  <Results>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T15:47:29</TestDate>
-                      <Status>Failure</Status>
-                      <TotalFailures>1</TotalFailures>
-                      <TotalSuccess>0</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                      <Message>Child test failed</Message>
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T15:48:21</TestDate>
-                      <Status>Failure</Status>
-                      <TotalFailures>1</TotalFailures>
-                      <TotalSuccess>0</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                      <Message>Child test failed</Message>
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T15:48:55</TestDate>
-                      <Status>Failure</Status>
-                      <TotalFailures>1</TotalFailures>
-                      <TotalSuccess>0</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                      <Message>Child test failed</Message>
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T15:49:05</TestDate>
-                      <Status>Failure</Status>
-                      <TotalFailures>1</TotalFailures>
-                      <TotalSuccess>0</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                      <Message>Child test failed</Message>
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T15:49:38</TestDate>
-                      <Status>Success</Status>
-                      <TotalFailures>0</TotalFailures>
-                      <TotalSuccess>1</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T15:57:09</TestDate>
-                      <Status>Success Failure</Status>
-                      <TotalFailures>1</TotalFailures>
-                      <TotalSuccess>1</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                      <Message>Child test failed</Message>
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T16:04:16</TestDate>
-                      <Status>Success</Status>
-                      <TotalFailures>0</TotalFailures>
-                      <TotalSuccess>2</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T16:20:09</TestDate>
-                      <Status>Success Failure</Status>
-                      <TotalFailures>1</TotalFailures>
-                      <TotalSuccess>2</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                      <Message>Child test failed</Message>
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T16:24:10</TestDate>
-                      <Status>Success Failure</Status>
-                      <TotalFailures>1</TotalFailures>
-                      <TotalSuccess>2</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                      <Message>Child test failed</Message>
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T16:24:59</TestDate>
-                      <Status>Success Failure</Status>
-                      <TotalFailures>1</TotalFailures>
-                      <TotalSuccess>2</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                      <Message>Child test failed</Message>
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T16:25:42</TestDate>
-                      <Status>Success</Status>
-                      <TotalFailures>0</TotalFailures>
-                      <TotalSuccess>3</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                    </UnitTestResult>
-                  </Results>
-                  <Tests>
-                    <TestRecord Name="Parse_Should_Throw_When_TextReader_Is_Null">
-                      <Results>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T15:47:29</TestDate>
-                          <Status>Failure</Status>
-                          <TotalFailures>1</TotalFailures>
-                          <TotalSuccess>0</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test failed</Message>
-                          <StackTrace>  at NUnit.Framework.Assert.Fail (System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.Fail () [0x00000] in &lt;filename unknown&gt;:0 
-  at SWTOR.Parser.Tests.ParserTests.Parse_Should_Throw_When_TextReader_Is_Null () [0x0000e] in /Volumes/Storage/Tim/Projects/SWTOR.Parser/SWTOR.Parser.Tests/ParserTests.cs:20 
-  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&amp;)
-  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in &lt;filename unknown&gt;:0 </StackTrace>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T15:48:21</TestDate>
-                          <Status>Failure</Status>
-                          <TotalFailures>1</TotalFailures>
-                          <TotalSuccess>0</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test failed</Message>
-                          <StackTrace>  at NUnit.Framework.Assert.Fail (System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.Fail () [0x00000] in &lt;filename unknown&gt;:0 
-  at SWTOR.Parser.Tests.ParserTests.Parse_Should_Throw_When_TextReader_Is_Null () [0x0000e] in /Volumes/Storage/Tim/Projects/SWTOR.Parser/SWTOR.Parser.Tests/ParserTests.cs:20 
-  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&amp;)
-  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in &lt;filename unknown&gt;:0 </StackTrace>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T15:48:55</TestDate>
-                          <Status>Failure</Status>
-                          <TotalFailures>1</TotalFailures>
-                          <TotalSuccess>0</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test failed</Message>
-                          <StackTrace>  at NUnit.Framework.Assert.Fail (System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.Fail () [0x00000] in &lt;filename unknown&gt;:0 
-  at SWTOR.Parser.Tests.ParserTests.Parse_Should_Throw_When_TextReader_Is_Null () [0x0000e] in /Volumes/Storage/Tim/Projects/SWTOR.Parser/SWTOR.Parser.Tests/ParserTests.cs:20 
-  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&amp;)
-  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in &lt;filename unknown&gt;:0 </StackTrace>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T15:49:05</TestDate>
-                          <Status>Failure</Status>
-                          <TotalFailures>1</TotalFailures>
-                          <TotalSuccess>0</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test failed</Message>
-                          <StackTrace>  at NUnit.Framework.Assert.Fail (System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.Fail () [0x00000] in &lt;filename unknown&gt;:0 
-  at SWTOR.Parser.Tests.ParserTests.Parse_Should_Throw_When_TextReader_Is_Null () [0x0000e] in /Volumes/Storage/Tim/Projects/SWTOR.Parser/SWTOR.Parser.Tests/ParserTests.cs:20 
-  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&amp;)
-  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in &lt;filename unknown&gt;:0 </StackTrace>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T15:49:38</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T15:57:09</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:04:16</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:20:09</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:24:10</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:24:59</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:25:42</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                      </Results>
-                      <Tests />
-                    </TestRecord>
-                    <TestRecord Name="Parse_Should_Return_One_Row_When_Rdr_Has_One_Line">
-                      <Results>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T15:57:09</TestDate>
-                          <Status>Failure</Status>
-                          <TotalFailures>1</TotalFailures>
-                          <TotalSuccess>0</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>System.NullReferenceException : Object reference not set to an instance of an object</Message>
-                          <StackTrace>  at SWTOR.Parser.Tests.ParserTests.Parse_Should_Return_One_Row_When_Rdr_Has_One_Line () [0x0001f] in /Volumes/Storage/Tim/Projects/SWTOR.Parser/SWTOR.Parser.Tests/ParserTests.cs:46 
-  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&amp;)
-  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in &lt;filename unknown&gt;:0 </StackTrace>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:04:16</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.01ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                      </Results>
-                      <Tests />
-                    </TestRecord>
-                    <TestRecord Name="Parse_One_Row_Should_Return_Correct_Timestamp">
-                      <Results>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:20:09</TestDate>
-                          <Status>Failure</Status>
-                          <TotalFailures>1</TotalFailures>
-                          <TotalSuccess>0</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>  Expected: same as 2012-03-01 14:35:20.000
-  But was:  0001-01-01 00:00:00.000
-</Message>
-                          <StackTrace>  at NUnit.Framework.Assert.That (System.Object actual, NUnit.Framework.Constraints.Constraint constraint, System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.AreSame (System.Object expected, System.Object actual, System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.AreSame (System.Object expected, System.Object actual) [0x00000] in &lt;filename unknown&gt;:0 
-  at SWTOR.Parser.Tests.ParserTests.Parse_One_Row_Should_Return_Correct_Timestamp () [0x0003b] in /Volumes/Storage/Tim/Projects/SWTOR.Parser/SWTOR.Parser.Tests/ParserTests.cs:63 
-  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&amp;)
-  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in &lt;filename unknown&gt;:0 </StackTrace>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:24:10</TestDate>
-                          <Status>Failure</Status>
-                          <TotalFailures>1</TotalFailures>
-                          <TotalSuccess>0</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>  Expected: same as 2012-03-01 14:35:20.000
-  But was:  2012-03-01 14:35:20.000
-</Message>
-                          <StackTrace>  at NUnit.Framework.Assert.That (System.Object actual, NUnit.Framework.Constraints.Constraint constraint, System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.AreSame (System.Object expected, System.Object actual, System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.AreSame (System.Object expected, System.Object actual) [0x00000] in &lt;filename unknown&gt;:0 
-  at SWTOR.Parser.Tests.ParserTests.Parse_One_Row_Should_Return_Correct_Timestamp () [0x0003b] in /Volumes/Storage/Tim/Projects/SWTOR.Parser/SWTOR.Parser.Tests/ParserTests.cs:63 
-  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&amp;)
-  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in &lt;filename unknown&gt;:0 </StackTrace>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:24:59</TestDate>
-                          <Status>Failure</Status>
-                          <TotalFailures>1</TotalFailures>
-                          <TotalSuccess>0</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>  Expected: same as 2012-03-01 14:35:20.000
-  But was:  2012-03-01 14:35:20.000
-</Message>
-                          <StackTrace>  at NUnit.Framework.Assert.That (System.Object actual, NUnit.Framework.Constraints.Constraint constraint, System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.AreSame (System.Object expected, System.Object actual, System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.AreSame (System.Object expected, System.Object actual) [0x00000] in &lt;filename unknown&gt;:0 
-  at SWTOR.Parser.Tests.ParserTests.Parse_One_Row_Should_Return_Correct_Timestamp () [0x0003b] in /Volumes/Storage/Tim/Projects/SWTOR.Parser/SWTOR.Parser.Tests/ParserTests.cs:63 
-  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&amp;)
-  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in &lt;filename unknown&gt;:0 </StackTrace>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:25:42</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.02ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                      </Results>
-                    </TestRecord>
-                    <TestRecord Name="Parse_One_Row_Should_Return_One_Entry">
-                      <Results>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:20:09</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.01ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:24:10</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:24:59</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:25:42</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                      </Results>
-                    </TestRecord>
-                  </Tests>
-                </TestRecord>
-                <TestRecord Name="OneRow_ParserTests">
-                  <Results>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T16:37:57</TestDate>
-                      <Status>Success Failure</Status>
-                      <TotalFailures>1</TotalFailures>
-                      <TotalSuccess>3</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                      <Message>Child test failed</Message>
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T16:57:36</TestDate>
-                      <Status>Success Failure</Status>
-                      <TotalFailures>1</TotalFailures>
-                      <TotalSuccess>3</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                      <Message>Child test failed</Message>
-                    </UnitTestResult>
-                    <UnitTestResult>
-                      <TestDate>2012-03-15T16:58:13</TestDate>
-                      <Status>Success</Status>
-                      <TotalFailures>0</TotalFailures>
-                      <TotalSuccess>4</TotalSuccess>
-                      <TotalIgnored>0</TotalIgnored>
-                      <Time />
-                    </UnitTestResult>
-                  </Results>
-                  <Tests>
-                    <TestRecord Name="Parse_Should_Return_Correct_Timestamp">
-                      <Results>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:37:57</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.02ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:57:36</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.02ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:58:13</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.02ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                      </Results>
-                    </TestRecord>
-                    <TestRecord Name="Parse_Should_Return_One_Entry">
-                      <Results>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:37:57</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:57:36</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:58:13</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                      </Results>
-                    </TestRecord>
-                    <TestRecord Name="Parse_Should_Return_Player_Idrurrez_As_Source">
-                      <Results>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:37:57</TestDate>
-                          <Status>Failure</Status>
-                          <TotalFailures>1</TotalFailures>
-                          <TotalSuccess>0</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>System.NullReferenceException : Object reference not set to an instance of an object</Message>
-                          <StackTrace>  at SWTOR.Parser.Tests.OneRow_ParserTests.Parse_Should_Return_Player_Idrurrez_As_Source () [0x00012] in /Volumes/Storage/Tim/Projects/SWTOR.Parser/SWTOR.Parser.Tests/ParserTests.cs:36 
-  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&amp;)
-  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in &lt;filename unknown&gt;:0 </StackTrace>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:57:36</TestDate>
-                          <Status>Failure</Status>
-                          <TotalFailures>1</TotalFailures>
-                          <TotalSuccess>0</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>  Expected string length 8 but was 11. Strings differ at index 8.
-  Expected: "Idrurrez"
-  But was:  "Idrurrez] ["
-  -------------------^
-</Message>
-                          <StackTrace>  at NUnit.Framework.Assert.That (System.Object actual, NUnit.Framework.Constraints.Constraint constraint, System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.AreEqual (System.Object expected, System.Object actual, System.String message, System.Object[] args) [0x00000] in &lt;filename unknown&gt;:0 
-  at NUnit.Framework.Assert.AreEqual (System.Object expected, System.Object actual) [0x00000] in &lt;filename unknown&gt;:0 
-  at SWTOR.Parser.Tests.OneRow_ParserTests.Parse_Should_Return_Player_Idrurrez_As_Source () [0x00019] in /Volumes/Storage/Tim/Projects/SWTOR.Parser/SWTOR.Parser.Tests/ParserTests.cs:37 
-  at (wrapper managed-to-native) System.Reflection.MonoMethod:InternalInvoke (System.Reflection.MonoMethod,object,object[],System.Exception&amp;)
-  at System.Reflection.MonoMethod.Invoke (System.Object obj, BindingFlags invokeAttr, System.Reflection.Binder binder, System.Object[] parameters, System.Globalization.CultureInfo culture) [0x00000] in &lt;filename unknown&gt;:0 </StackTrace>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:58:13</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                      </Results>
-                    </TestRecord>
-                    <TestRecord Name="Parse_Should_Throw_When_TextReader_Is_Null">
-                      <Results>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:37:57</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:57:36</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                        <UnitTestResult>
-                          <TestDate>2012-03-15T16:58:13</TestDate>
-                          <Status>Success</Status>
-                          <TotalFailures>0</TotalFailures>
-                          <TotalSuccess>1</TotalSuccess>
-                          <TotalIgnored>0</TotalIgnored>
-                          <Time />
-                          <Message>Test successful
-
-Execution time: 0.00ms</Message>
-                          <ConsoleOutput />
-                          <ConsoleError />
-                        </UnitTestResult>
-                      </Results>
-                    </TestRecord>
-                  </Tests>
-                </TestRecord>
-              </Tests>
-            </TestRecord>
-          </Tests>
-        </TestRecord>
-      </Tests>
-    </TestRecord>
-  </Tests>
-</TestRecord>
\ No newline at end of file
diff --git a/src/SWTOR.Parser.Tests/test-results/SWTOR.Parser.Tests.csproj.test-cache b/src/SWTOR.Parser.Tests/test-results/SWTOR.Parser.Tests.csproj.test-cache
deleted file mode 100644
index 1582201..0000000
Binary files a/src/SWTOR.Parser.Tests/test-results/SWTOR.Parser.Tests.csproj.test-cache and /dev/null differ
diff --git a/src/SWTOR.Parser.sln b/src/SWTOR.Parser.sln
index 9e3797b..18e2684 100644
--- a/src/SWTOR.Parser.sln
+++ b/src/SWTOR.Parser.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWTOR.Parser", "SWTOR.Parser\SWTOR.Parser.csproj", "{00D4D026-DA8C-4CB7-A402-6ECA0039DC30}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWTOR.Parser.Tests", "SWTOR.Parser.Tests\SWTOR.Parser.Tests.csproj", "{204E1E03-BABB-4B2E-AC43-7B6D3C87E918}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWTOR.Web", "SWTOR.Web\SWTOR.Web.csproj", "{F217B7A9-EEF9-48AF-944E-15D915A8CDF4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3FCDD13C-714A-48E1-B97A-CFE0AD74F8C0}"
@@ -17,6 +15,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWTOR.Web.Tests", "SWTOR.Web.Tests\SWTOR.Web.Tests.csproj", "{0F4623EF-6ECB-488A-AB8D-369A131C4044}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWTOR.Parser.Tests", "SWTOR.Parser.Tests\SWTOR.Parser.Tests.csproj", "{A8A3BA9C-CB80-45DD-8B97-8B5C0D0692BD}"
+EndProject
 Global
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = SWTOR.Parser.vsmdi
@@ -32,12 +32,6 @@ Global
 		{00D4D026-DA8C-4CB7-A402-6ECA0039DC30}.Default|Any CPU.ActiveCfg = Debug|Any CPU
 		{00D4D026-DA8C-4CB7-A402-6ECA0039DC30}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00D4D026-DA8C-4CB7-A402-6ECA0039DC30}.Release|Any CPU.Build.0 = Release|Any CPU
-		{204E1E03-BABB-4B2E-AC43-7B6D3C87E918}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{204E1E03-BABB-4B2E-AC43-7B6D3C87E918}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{204E1E03-BABB-4B2E-AC43-7B6D3C87E918}.Default|Any CPU.ActiveCfg = Debug|Any CPU
-		{204E1E03-BABB-4B2E-AC43-7B6D3C87E918}.Default|Any CPU.Build.0 = Debug|Any CPU
-		{204E1E03-BABB-4B2E-AC43-7B6D3C87E918}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{204E1E03-BABB-4B2E-AC43-7B6D3C87E918}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F217B7A9-EEF9-48AF-944E-15D915A8CDF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F217B7A9-EEF9-48AF-944E-15D915A8CDF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F217B7A9-EEF9-48AF-944E-15D915A8CDF4}.Default|Any CPU.ActiveCfg = Debug|Any CPU
@@ -50,6 +44,12 @@ Global
 		{0F4623EF-6ECB-488A-AB8D-369A131C4044}.Default|Any CPU.Build.0 = Debug|Any CPU
 		{0F4623EF-6ECB-488A-AB8D-369A131C4044}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0F4623EF-6ECB-488A-AB8D-369A131C4044}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A8A3BA9C-CB80-45DD-8B97-8B5C0D0692BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8A3BA9C-CB80-45DD-8B97-8B5C0D0692BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A8A3BA9C-CB80-45DD-8B97-8B5C0D0692BD}.Default|Any CPU.ActiveCfg = Debug|Any CPU
+		{A8A3BA9C-CB80-45DD-8B97-8B5C0D0692BD}.Default|Any CPU.Build.0 = Debug|Any CPU
+		{A8A3BA9C-CB80-45DD-8B97-8B5C0D0692BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A8A3BA9C-CB80-45DD-8B97-8B5C0D0692BD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/SWTOR.Parser.vsmdi b/src/SWTOR.Parser.vsmdi
index 5a3b4f2..c9337a3 100644
--- a/src/SWTOR.Parser.vsmdi
+++ b/src/SWTOR.Parser.vsmdi
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <TestLists xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
   <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
-    <RunConfiguration id="ade35769-d649-47e5-b80a-ba1f2051bf17" name="Local" storage="local.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <RunConfiguration id="7ada7d7e-59ee-4976-951f-a476fec12cb0" name="Trace and Test Impact" storage="traceandtestimpact.testsettings" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   </TestList>
 </TestLists>
\ No newline at end of file
diff --git a/src/SWTOR.Parser/Abstractions/ICombatMetrics.cs b/src/SWTOR.Parser/Abstractions/ICombatMetrics.cs
index e35a7b9..cd766b5 100644
--- a/src/SWTOR.Parser/Abstractions/ICombatMetrics.cs
+++ b/src/SWTOR.Parser/Abstractions/ICombatMetrics.cs
@@ -6,7 +6,9 @@ namespace SWTOR.Parser.Domain
 {
     public interface ICombatMetrics : ILogMetrics
     {
-        int Interval { get; set; }
+        DateTime StartTime { get; set; }
+        DateTime EndTime { get; set; }
+        TimeSpan Interval { get; }
         double AverageDamagePerSecond { get; set; }
         double AverageHealingPerSecond { get; set; }
         double AverageThreatPerSecond { get; set; }
diff --git a/src/SWTOR.Parser/CombatParser.cs b/src/SWTOR.Parser/CombatParser.cs
index 25208c8..473fe42 100644
--- a/src/SWTOR.Parser/CombatParser.cs
+++ b/src/SWTOR.Parser/CombatParser.cs
@@ -60,10 +60,11 @@ private void CombatAnalyzer(ICombatMetrics data, IEnumerable<LogEntry> log)
             if (log.Count() == 0) return;
 
             LogAnalyzer(data, log);
-            data.Interval = Convert.ToInt32((log.EndTime() - log.StartTime()).TotalSeconds);
-            data.AverageDamagePerSecond = (double)data.TotalDamage / data.Interval;
-            data.AverageHealingPerSecond = (double)data.TotalHealing / data.Interval;
-            data.AverageThreatPerSecond = (double)data.TotalThreat / data.Interval;
+            data.StartTime = log.StartTime();
+            data.EndTime = log.EndTime();
+            data.AverageDamagePerSecond = (double)data.TotalDamage / data.Interval.TotalSeconds;
+            data.AverageHealingPerSecond = (double)data.TotalHealing / data.Interval.TotalSeconds;
+            data.AverageThreatPerSecond = (double)data.TotalThreat / data.Interval.TotalSeconds;
         }
 
         private void LogAnalyzer(ILogMetrics data, IEnumerable<LogEntry> log)
diff --git a/src/SWTOR.Parser/Domain/CombatMetrics.cs b/src/SWTOR.Parser/Domain/CombatMetrics.cs
index 2e44605..0446750 100644
--- a/src/SWTOR.Parser/Domain/CombatMetrics.cs
+++ b/src/SWTOR.Parser/Domain/CombatMetrics.cs
@@ -21,7 +21,19 @@ public CombatMetrics()
         public int CountOfDeflect { get; set; }
         public List<AbilityMetrics> AbilityMetrics { get; set; }
 
-        public int Interval { get; set; }
+        public DateTime StartTime { get; set; }
+        public DateTime EndTime { get; set; }
+        public TimeSpan Interval 
+        {
+            get 
+            {
+                if (StartTime != null && EndTime != null)
+                    return EndTime - StartTime;
+
+                return TimeSpan.Zero;
+            }
+        }
+
         public double AverageDamagePerSecond { get; set; }
         public double AverageHealingPerSecond { get; set; }
         public double AverageThreatPerSecond { get; set; }