Completed all tests (there is still some code that can be tested, but it will be very hard to do so and I am skipping it for now).

3 files changed, 151 insertions, 227 deletions

diff --git a/MundusTests/DataTests/SuperLayers/LandContextTests.cs b/MundusTests/DataTests/SuperLayers/LandContextTests.cs
index 4f4bccb..bf17ec4 100644
--- a/MundusTests/DataTests/SuperLayers/LandContextTests.cs
+++ b/MundusTests/DataTests/SuperLayers/LandContextTests.cs
@@ -2,7 +2,6 @@
 {
     using System.Linq;
     using Mundus.Data;
-    using Mundus.Data.SuperLayers;
     using Mundus.Data.SuperLayers.DBTables;
     using NUnit.Framework;
 
@@ -16,12 +15,10 @@
             var structure = new LSPlacedTile("structure_stock", 0, 2000, 1000);
             var ground = new LGPlacedTile("ground_stock", 3000, 4000);
 
-             
-
-             DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.LContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
-             DataBaseContexts.LContext.SaveChanges();
+            DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.LContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
+            DataBaseContexts.LContext.SaveChanges();
 
             Assert.AreEqual(mob.stock_id,  DataBaseContexts.LContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't add the mob correctly");
             Assert.AreEqual(structure.stock_id,  DataBaseContexts.LContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't add the structure correctly");
@@ -34,14 +31,12 @@
             var mob = new LMPlacedTile("mob_stock", 10, 1000, 1001);
             var structure = new LSPlacedTile("structure_stock", 4, 2000, 1001);
 
-             
-
-             DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.LContext.SaveChanges();
+            DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.LContext.SaveChanges();
 
-            Assert.IsTrue( DataBaseContexts.LContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 1), "Mob is considered dead (health <= 0), but it shouldnt be");
-            Assert.IsTrue( DataBaseContexts.LContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 1), "Structure is considered dead (health <= 0), but it shouldn't be");
+            Assert.IsTrue(DataBaseContexts.LContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 1), "Mob is considered dead (health <= 0), but it shouldnt be");
+            Assert.IsTrue(DataBaseContexts.LContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 1), "Structure is considered dead (health <= 0), but it shouldn't be");
         }
 
         [Test]
@@ -50,14 +45,12 @@
             var mob = new LMPlacedTile("mob_stock", 10, 1000, 1000);
             var structure = new LSPlacedTile("structure_stock", 4, 2000, 1000);
 
-             
-
-             DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.LContext.SaveChanges();
+            DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.LContext.SaveChanges();
 
-            Assert.IsFalse( DataBaseContexts.LContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 20), "Mob is considered alive (health > 0), but it shouldnt be");
-            Assert.IsFalse( DataBaseContexts.LContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 20), "Structure is considered alive (health > 0), but it shouldn't be");
+            Assert.IsFalse(DataBaseContexts.LContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 20), "Mob is considered alive (health > 0), but it shouldnt be");
+            Assert.IsFalse(DataBaseContexts.LContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 20), "Structure is considered alive (health > 0), but it shouldn't be");
         }
 
         [Test]
@@ -66,15 +59,15 @@
             var mob = new LMPlacedTile("mob_stock", 10, 1000, 1002);
             var structure = new LSPlacedTile("structure_stock", 4, 2000, 1002);
 
-             DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.LContext.SaveChanges();
+            DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.LContext.SaveChanges();
 
-             DataBaseContexts.LContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 3);
-             DataBaseContexts.LContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 1);
+            DataBaseContexts.LContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 3);
+            DataBaseContexts.LContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 1);
 
-            Assert.AreEqual(7,  DataBaseContexts.LContext.LMobLayer.First(x => x.YPos == mob.YPos && x.XPos == mob.XPos).Health, "Mobs recieve incorrect amount of damage");
-            Assert.AreEqual(3,  DataBaseContexts.LContext.LStructureLayer.First(x => x.YPos == structure.YPos && x.XPos == structure.XPos).Health, "Structures recieve incorrect amount of damage");
+            Assert.AreEqual(7, DataBaseContexts.LContext.LMobLayer.First(x => x.YPos == mob.YPos && x.XPos == mob.XPos).Health, "Mobs recieve incorrect amount of damage");
+            Assert.AreEqual(3, DataBaseContexts.LContext.LStructureLayer.First(x => x.YPos == structure.YPos && x.XPos == structure.XPos).Health, "Structures recieve incorrect amount of damage");
         }
 
         [Test]
@@ -84,16 +77,14 @@
             var structure = new LSPlacedTile("structure_stock", 0, 2000, 1000);
             var ground = new LGPlacedTile("ground_stock", 3000, 4000);
 
-             
+            DataBaseContexts.LContext.LMobLayer.Add(mob);
+            DataBaseContexts.LContext.LStructureLayer.Add(structure);
+            DataBaseContexts.LContext.LGroundLayer.Add(ground);
+            DataBaseContexts.LContext.SaveChanges();
 
-             DataBaseContexts.LContext.LMobLayer.Add(mob);
-             DataBaseContexts.LContext.LStructureLayer.Add(structure);
-             DataBaseContexts.LContext.LGroundLayer.Add(ground);
-             DataBaseContexts.LContext.SaveChanges();
-
-            Assert.AreEqual(mob.stock_id,  DataBaseContexts.LContext.GetMobLayerStock(mob.YPos, mob.XPos), "Doesn't get the correct mob layer stock");
-            Assert.AreEqual(structure.stock_id,  DataBaseContexts.LContext.GetStructureLayerStock(structure.YPos,structure.XPos), "Doesn't get the correct structure layer stock");
-            Assert.AreEqual(ground.stock_id,  DataBaseContexts.LContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Doesn't get the correct ground layer stock");
+            Assert.AreEqual(mob.stock_id, DataBaseContexts.LContext.GetMobLayerStock(mob.YPos, mob.XPos), "Doesn't get the correct mob layer stock");
+            Assert.AreEqual(structure.stock_id, DataBaseContexts.LContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Doesn't get the correct structure layer stock");
+            Assert.AreEqual(ground.stock_id, DataBaseContexts.LContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Doesn't get the correct ground layer stock");
         }
 
         [Test]
@@ -103,24 +94,21 @@
             var structure = new LSPlacedTile("structure_stock", 0, 2000, 1000);
             var ground = new LGPlacedTile("ground_stock", 3000, 4000);
 
-             
-
-             DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.LContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
-             DataBaseContexts.LContext.SaveChanges();
+            DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.LContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
+            DataBaseContexts.LContext.SaveChanges();
 
-             DataBaseContexts.LContext.RemoveMobFromPosition(mob.YPos, mob.XPos);
-             DataBaseContexts.LContext.RemoveStructureFromPosition(structure.YPos, structure.XPos);
-             DataBaseContexts.LContext.RemoveGroundFromPosition(ground.YPos, ground.XPos);
-             DataBaseContexts.LContext.SaveChanges();
+            DataBaseContexts.LContext.RemoveMobFromPosition(mob.YPos, mob.XPos);
+            DataBaseContexts.LContext.RemoveStructureFromPosition(structure.YPos, structure.XPos);
+            DataBaseContexts.LContext.RemoveGroundFromPosition(ground.YPos, ground.XPos);
+            DataBaseContexts.LContext.SaveChanges();
 
             Assert.AreEqual(null,  DataBaseContexts.LContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't remove the mob correctly");
             Assert.AreEqual(null,  DataBaseContexts.LContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't remove the structure correctly");
             Assert.AreEqual(null,  DataBaseContexts.LContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't remove the ground correctly");
         }
 
-
         [Test]
         public static void SetsCorrectValues() 
         {
@@ -131,31 +119,19 @@
             var ground = new LGPlacedTile("ground_stock", 3000, 4000);
             var newGround = new LGPlacedTile("new_ground_stock", 3000, 4000);
 
-             
-
-             DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.LContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
-             DataBaseContexts.LContext.SaveChanges();
+            DataBaseContexts.LContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.LContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.LContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
+            DataBaseContexts.LContext.SaveChanges();
 
-             DataBaseContexts.LContext.SetMobAtPosition(newMob.stock_id, newMob.Health, newMob.YPos, newMob.XPos);
-             DataBaseContexts.LContext.SetStructureAtPosition(newStructure.stock_id, newStructure.Health, newStructure.YPos, newStructure.XPos);
-             DataBaseContexts.LContext.SetGroundAtPosition(newGround.stock_id, newGround.YPos, newGround.XPos);
-             DataBaseContexts.LContext.SaveChanges();
+            DataBaseContexts.LContext.SetMobAtPosition(newMob.stock_id, newMob.Health, newMob.YPos, newMob.XPos);
+            DataBaseContexts.LContext.SetStructureAtPosition(newStructure.stock_id, newStructure.Health, newStructure.YPos, newStructure.XPos);
+            DataBaseContexts.LContext.SetGroundAtPosition(newGround.stock_id, newGround.YPos, newGround.XPos);
+            DataBaseContexts.LContext.SaveChanges();
 
             Assert.AreEqual(newMob.stock_id,  DataBaseContexts.LContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't set the mob correctly");
             Assert.AreEqual(newStructure.stock_id,  DataBaseContexts.LContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't set the structure correctly");
             Assert.AreEqual(newGround.stock_id,  DataBaseContexts.LContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't set the ground correctly");
         }
-
-        //[Test]
-        //public static void TruncatesTablesOnInitialization() 
-        //{
-             
-
-        //    Assert.AreEqual(0,  DataBaseContexts.LContext.LMobLayer.Count(), "LMobLayer table isn't properly truncated upon LandContext initialization");
-        //    Assert.AreEqual(0,  DataBaseContexts.LContext.LStructureLayer.Count(), "LStructureLayer table isn't properly truncated upon LandContext initialization");
-        //    Assert.AreEqual(0,  DataBaseContexts.LContext.LGroundLayer.Count(), "LGroungLayer table isn't properly truncated upon LandContext initialization");
-        //}
     }
 }
diff --git a/MundusTests/DataTests/SuperLayers/SkyContextTests.cs b/MundusTests/DataTests/SuperLayers/SkyContextTests.cs
index ad8771c..61c3509 100644
--- a/MundusTests/DataTests/SuperLayers/SkyContextTests.cs
+++ b/MundusTests/DataTests/SuperLayers/SkyContextTests.cs
@@ -2,7 +2,6 @@
 {
     using System.Linq;
     using Mundus.Data;
-    using Mundus.Data.SuperLayers;
     using Mundus.Data.SuperLayers.DBTables;
     using NUnit.Framework;
 
@@ -16,16 +15,14 @@
             var structure = new SSPlacedTile("structure_stock", 0, 2000, 1000);
             var ground = new SGPlacedTile("ground_stock", 3000, 4000);
 
-             
+            DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.SContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
+            DataBaseContexts.SContext.SaveChanges();
 
-              DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-              DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-              DataBaseContexts.SContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
-              DataBaseContexts.SContext.SaveChanges();
-
-            Assert.AreEqual(mob.stock_id,   DataBaseContexts.SContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't add the mob correctly");
-            Assert.AreEqual(structure.stock_id,   DataBaseContexts.SContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't add the structure correctly");
-            Assert.AreEqual(ground.stock_id,   DataBaseContexts.SContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't add the ground correctly");
+            Assert.AreEqual(mob.stock_id, DataBaseContexts.SContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't add the mob correctly");
+            Assert.AreEqual(structure.stock_id, DataBaseContexts.SContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't add the structure correctly");
+            Assert.AreEqual(ground.stock_id, DataBaseContexts.SContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't add the ground correctly");
         }
 
         [Test]
@@ -34,14 +31,12 @@
             var mob = new SMPlacedTile("mob_stock", 10, 1000, 1001);
             var structure = new SSPlacedTile("structure_stock", 4, 2000, 1001);
 
-             
-
-              DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-              DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-              DataBaseContexts.SContext.SaveChanges();
+            DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.SContext.SaveChanges();
 
-            Assert.IsTrue(  DataBaseContexts.SContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 3), "Mob is considered dead (health <= 0), but it shouldnt be");
-            Assert.IsTrue(  DataBaseContexts.SContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 2), "Structure is considered dead (health <= 0), but it shouldn't be");
+            Assert.IsTrue(DataBaseContexts.SContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 3), "Mob is considered dead (health <= 0), but it shouldnt be");
+            Assert.IsTrue(DataBaseContexts.SContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 2), "Structure is considered dead (health <= 0), but it shouldn't be");
         }
 
         [Test]
@@ -50,14 +45,12 @@
             var mob = new SMPlacedTile("mob_stock", 10, 1000, 1000);
             var structure = new SSPlacedTile("structure_stock", 4, 2000, 1000);
 
-             
-
-              DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-              DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-              DataBaseContexts.SContext.SaveChanges();
+            DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.SContext.SaveChanges();
 
-            Assert.IsFalse(  DataBaseContexts.SContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 20), "Mob is considered alive (health > 0), but it shouldnt be");
-            Assert.IsFalse(  DataBaseContexts.SContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 20), "Structure is considered alive (health > 0), but it shouldn't be");
+            Assert.IsFalse(DataBaseContexts.SContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 20), "Mob is considered alive (health > 0), but it shouldnt be");
+            Assert.IsFalse(DataBaseContexts.SContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 20), "Structure is considered alive (health > 0), but it shouldn't be");
         }
 
         [Test]
@@ -66,17 +59,15 @@
             var mob = new SMPlacedTile("mob_stock", 10, 1000, 1002);
             var structure = new SSPlacedTile("structure_stock", 4, 2000, 1002);
 
-             
+            DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.SContext.SaveChanges();
 
-              DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-              DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-              DataBaseContexts.SContext.SaveChanges();
+            DataBaseContexts.SContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 3);
+            DataBaseContexts.SContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 1);
 
-              DataBaseContexts.SContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 3);
-              DataBaseContexts.SContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 1);
-
-            Assert.AreEqual(7,   DataBaseContexts.SContext.SMobLayer.First(x => x.YPos == mob.YPos && x.XPos == mob.XPos).Health, "Mobs recieve incorrect amount of damage");
-            Assert.AreEqual(3,   DataBaseContexts.SContext.SStructureLayer.First(x => x.YPos == structure.YPos && x.XPos == structure.XPos).Health, "Structures recieve incorrect amount of damage");
+            Assert.AreEqual(7, DataBaseContexts.SContext.SMobLayer.First(x => x.YPos == mob.YPos && x.XPos == mob.XPos).Health, "Mobs recieve incorrect amount of damage");
+            Assert.AreEqual(3, DataBaseContexts.SContext.SStructureLayer.First(x => x.YPos == structure.YPos && x.XPos == structure.XPos).Health, "Structures recieve incorrect amount of damage");
         }
 
         [Test]
@@ -86,16 +77,14 @@
             var structure = new SSPlacedTile("structure_stock", 0, 2000, 1000);
             var ground = new SGPlacedTile("ground_stock", 3000, 4000);
 
-             
-
-              DataBaseContexts.SContext.SMobLayer.Add(mob);
-              DataBaseContexts.SContext.SStructureLayer.Add(structure);
-              DataBaseContexts.SContext.SGroundLayer.Add(ground);
-              DataBaseContexts.SContext.SaveChanges();
+            DataBaseContexts.SContext.SMobLayer.Add(mob);
+            DataBaseContexts.SContext.SStructureLayer.Add(structure);
+            DataBaseContexts.SContext.SGroundLayer.Add(ground);
+            DataBaseContexts.SContext.SaveChanges();
 
-            Assert.AreEqual(mob.stock_id,   DataBaseContexts.SContext.GetMobLayerStock(mob.YPos, mob.XPos), "Doesn't get the correct mob layer stock");
-            Assert.AreEqual(structure.stock_id,   DataBaseContexts.SContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Doesn't get the correct structure layer stock");
-            Assert.AreEqual(ground.stock_id,   DataBaseContexts.SContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Doesn't get the correct ground layer stock");
+            Assert.AreEqual(mob.stock_id, DataBaseContexts.SContext.GetMobLayerStock(mob.YPos, mob.XPos), "Doesn't get the correct mob layer stock");
+            Assert.AreEqual(structure.stock_id, DataBaseContexts.SContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Doesn't get the correct structure layer stock");
+            Assert.AreEqual(ground.stock_id, DataBaseContexts.SContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Doesn't get the correct ground layer stock");
         }
 
         [Test]
@@ -105,24 +94,21 @@
             var structure = new SSPlacedTile("structure_stock", 0, 2000, 1000);
             var ground = new SGPlacedTile("ground_stock", 3000, 4000);
 
-             
+            DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.SContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
+            DataBaseContexts.SContext.SaveChanges();
 
-              DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-              DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-              DataBaseContexts.SContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
-              DataBaseContexts.SContext.SaveChanges();
+            DataBaseContexts.SContext.RemoveMobFromPosition(mob.YPos, mob.XPos);
+            DataBaseContexts.SContext.RemoveStructureFromPosition(structure.YPos, structure.XPos);
+            DataBaseContexts.SContext.RemoveGroundFromPosition(ground.YPos, ground.XPos);
+            DataBaseContexts.SContext.SaveChanges();
 
-              DataBaseContexts.SContext.RemoveMobFromPosition(mob.YPos, mob.XPos);
-              DataBaseContexts.SContext.RemoveStructureFromPosition(structure.YPos, structure.XPos);
-              DataBaseContexts.SContext.RemoveGroundFromPosition(ground.YPos, ground.XPos);
-              DataBaseContexts.SContext.SaveChanges();
-
-            Assert.AreEqual(null,   DataBaseContexts.SContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't remove the mob correctly");
-            Assert.AreEqual(null,   DataBaseContexts.SContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't remove the structure correctly");
-            Assert.AreEqual(null,   DataBaseContexts.SContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't remove the ground correctly");
+            Assert.AreEqual(null, DataBaseContexts.SContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't remove the mob correctly");
+            Assert.AreEqual(null, DataBaseContexts.SContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't remove the structure correctly");
+            Assert.AreEqual(null, DataBaseContexts.SContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't remove the ground correctly");
         }
 
-
         [Test]
         public static void SetsCorrectValues() 
         {
@@ -133,31 +119,19 @@
             var ground = new SGPlacedTile("ground_stock", 3000, 4000);
             var newGround = new SGPlacedTile("new_ground_stock", 3000, 4000);
 
-             
-
-              DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-              DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-              DataBaseContexts.SContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
-              DataBaseContexts.SContext.SaveChanges();
+            DataBaseContexts.SContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.SContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.SContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
+            DataBaseContexts.SContext.SaveChanges();
 
-              DataBaseContexts.SContext.SetMobAtPosition(newMob.stock_id, newMob.Health, newMob.YPos, newMob.XPos);
-              DataBaseContexts.SContext.SetStructureAtPosition(newStructure.stock_id, newStructure.Health, newStructure.YPos, newStructure.XPos);
-              DataBaseContexts.SContext.SetGroundAtPosition(newGround.stock_id, newGround.YPos, newGround.XPos);
-              DataBaseContexts.SContext.SaveChanges();
+            DataBaseContexts.SContext.SetMobAtPosition(newMob.stock_id, newMob.Health, newMob.YPos, newMob.XPos);
+            DataBaseContexts.SContext.SetStructureAtPosition(newStructure.stock_id, newStructure.Health, newStructure.YPos, newStructure.XPos);
+            DataBaseContexts.SContext.SetGroundAtPosition(newGround.stock_id, newGround.YPos, newGround.XPos);
+            DataBaseContexts.SContext.SaveChanges();
 
-            Assert.AreEqual(newMob.stock_id,   DataBaseContexts.SContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't set the mob correctly");
-            Assert.AreEqual(newStructure.stock_id,   DataBaseContexts.SContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't set the structure correctly");
-            Assert.AreEqual(newGround.stock_id,   DataBaseContexts.SContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't set the ground correctly");
+            Assert.AreEqual(newMob.stock_id, DataBaseContexts.SContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't set the mob correctly");
+            Assert.AreEqual(newStructure.stock_id, DataBaseContexts.SContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't set the structure correctly");
+            Assert.AreEqual(newGround.stock_id, DataBaseContexts.SContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't set the ground correctly");
         }
-
-        //[Test]
-        //public static void TruncatesTablesOnInitialization() 
-        //{
-             
-
-        //    Assert.AreEqual(0,   DataBaseContexts.SContext.SMobLayer.Count(), "SMobLayer table isn't properly truncated upon SkyContext initialization");
-        //    Assert.AreEqual(0,   DataBaseContexts.SContext.SStructureLayer.Count(), "SStructureLayer table isn't properly truncated upon SkyContext initialization");
-        //    Assert.AreEqual(0,   DataBaseContexts.SContext.SGroundLayer.Count(), "LGroungLayer table isn't properly truncated upon SkyContext initialization");
-        //}
     }
 }
diff --git a/MundusTests/DataTests/SuperLayers/UndergroundContextTests.cs b/MundusTests/DataTests/SuperLayers/UndergroundContextTests.cs
index 0cf938f..ad3c0c6 100644
--- a/MundusTests/DataTests/SuperLayers/UndergroundContextTests.cs
+++ b/MundusTests/DataTests/SuperLayers/UndergroundContextTests.cs
@@ -2,7 +2,6 @@
 {
     using System.Linq;
     using Mundus.Data;
-    using Mundus.Data.SuperLayers;
     using Mundus.Data.SuperLayers.DBTables;
     using NUnit.Framework;
 
@@ -14,18 +13,16 @@
         {
             var mob = new UMPlacedTile("mob_stock", 0, 1000, 1000);
             var structure = new USPlacedTile("structure_stock", 0, 2000, 1000);
-            var ground = new UGPlacedTile("ground_stock", 3000, 4000);
-
-             
+            var ground = new UGPlacedTile("ground_stock", 3000, 4000);             
 
-             DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.UContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
-             DataBaseContexts.UContext.SaveChanges();
+            DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.UContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
+            DataBaseContexts.UContext.SaveChanges();
 
-            Assert.AreEqual(mob.stock_id,  DataBaseContexts.UContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't add the mob correctly");
-            Assert.AreEqual(structure.stock_id,  DataBaseContexts.UContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't add the structure correctly");
-            Assert.AreEqual(ground.stock_id,  DataBaseContexts.UContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't add the ground correctly");
+            Assert.AreEqual(mob.stock_id, DataBaseContexts.UContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't add the mob correctly");
+            Assert.AreEqual(structure.stock_id, DataBaseContexts.UContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't add the structure correctly");
+            Assert.AreEqual(ground.stock_id, DataBaseContexts.UContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't add the ground correctly");
         }
 
         [Test]
@@ -34,14 +31,12 @@
             var mob = new UMPlacedTile("mob_stock", 10, 1000, 1001);
             var structure = new USPlacedTile("structure_stock", 4, 2000, 1001);
 
-             
-
-             DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.UContext.SaveChanges();
+            DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.UContext.SaveChanges();
 
-            Assert.IsTrue( DataBaseContexts.UContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 3), "Mob is considered dead (health <= 0), but it shouldnt be");
-            Assert.IsTrue( DataBaseContexts.UContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 2), "Structure is considered dead (health <= 0), but it shouldn't be");
+            Assert.IsTrue(DataBaseContexts.UContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 3), "Mob is considered dead (health <= 0), but it shouldnt be");
+            Assert.IsTrue(DataBaseContexts.UContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 2), "Structure is considered dead (health <= 0), but it shouldn't be");
         }
 
         [Test]
@@ -50,14 +45,12 @@
             var mob = new UMPlacedTile("mob_stock", 10, 1000, 1000);
             var structure = new USPlacedTile("structure_stock", 4, 2000, 1000);
 
-             
+            DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.UContext.SaveChanges();
 
-             DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.UContext.SaveChanges();
-
-            Assert.IsFalse( DataBaseContexts.UContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 20), "Mob is considered alive (health > 0), but it shouldnt be");
-            Assert.IsFalse( DataBaseContexts.UContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 20), "Structure is considered alive (health > 0), but it shouldn't be");
+            Assert.IsFalse(DataBaseContexts.UContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 20), "Mob is considered alive (health > 0), but it shouldnt be");
+            Assert.IsFalse(DataBaseContexts.UContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 20), "Structure is considered alive (health > 0), but it shouldn't be");
         }
 
         [Test]
@@ -66,17 +59,15 @@
             var mob = new UMPlacedTile("mob_stock", 10, 1000, 1002);
             var structure = new USPlacedTile("structure_stock", 4, 2000, 1002);
 
-             
-
-             DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.UContext.SaveChanges();
+            DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.UContext.SaveChanges();
 
-             DataBaseContexts.UContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 3);
-             DataBaseContexts.UContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 1);
+            DataBaseContexts.UContext.TakeDamageMobAtPosition(mob.YPos, mob.XPos, 3);
+            DataBaseContexts.UContext.TakeDamageStructureAtPosition(structure.YPos, structure.XPos, 1);
 
-            Assert.AreEqual(7,  DataBaseContexts.UContext.UMobLayer.First(x => x.YPos == mob.YPos && x.XPos == mob.XPos).Health, "Mobs recieve incorrect amount of damage");
-            Assert.AreEqual(3,  DataBaseContexts.UContext.UStructureLayer.First(x => x.YPos == structure.YPos && x.XPos == structure.XPos).Health, "Structures recieve incorrect amount of damage");
+            Assert.AreEqual(7, DataBaseContexts.UContext.UMobLayer.First(x => x.YPos == mob.YPos && x.XPos == mob.XPos).Health, "Mobs recieve incorrect amount of damage");
+            Assert.AreEqual(3, DataBaseContexts.UContext.UStructureLayer.First(x => x.YPos == structure.YPos && x.XPos == structure.XPos).Health, "Structures recieve incorrect amount of damage");
         }
 
         [Test]
@@ -86,16 +77,14 @@
             var structure = new USPlacedTile("structure_stock", 0, 2000, 1000);
             var ground = new UGPlacedTile("ground_stock", 3000, 4000);
 
-             
-
-             DataBaseContexts.UContext.UMobLayer.Add(mob);
-             DataBaseContexts.UContext.UStructureLayer.Add(structure);
-             DataBaseContexts.UContext.UGroundLayer.Add(ground);
-             DataBaseContexts.UContext.SaveChanges();
+            DataBaseContexts.UContext.UMobLayer.Add(mob);
+            DataBaseContexts.UContext.UStructureLayer.Add(structure);
+            DataBaseContexts.UContext.UGroundLayer.Add(ground);
+            DataBaseContexts.UContext.SaveChanges();
 
-            Assert.AreEqual(mob.stock_id,  DataBaseContexts.UContext.GetMobLayerStock(mob.YPos, mob.XPos), "Doesn't get the correct mob layer stock");
-            Assert.AreEqual(structure.stock_id,  DataBaseContexts.UContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Doesn't get the correct structure layer stock");
-            Assert.AreEqual(ground.stock_id,  DataBaseContexts.UContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Doesn't get the correct ground layer stock");
+            Assert.AreEqual(mob.stock_id, DataBaseContexts.UContext.GetMobLayerStock(mob.YPos, mob.XPos), "Doesn't get the correct mob layer stock");
+            Assert.AreEqual(structure.stock_id, DataBaseContexts.UContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Doesn't get the correct structure layer stock");
+            Assert.AreEqual(ground.stock_id, DataBaseContexts.UContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Doesn't get the correct ground layer stock");
         }
 
         [Test]
@@ -105,24 +94,21 @@
             var structure = new USPlacedTile("structure_stock", 0, 2000, 1000);
             var ground = new UGPlacedTile("ground_stock", 3000, 4000);
 
-             
+            DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.UContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
+            DataBaseContexts.UContext.SaveChanges();
 
-             DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.UContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
-             DataBaseContexts.UContext.SaveChanges();
+            DataBaseContexts.UContext.RemoveMobFromPosition(mob.YPos, mob.XPos);
+            DataBaseContexts.UContext.RemoveStructureFromPosition(structure.YPos, structure.XPos);
+            DataBaseContexts.UContext.RemoveGroundFromPosition(ground.YPos, ground.XPos);
+            DataBaseContexts.UContext.SaveChanges();
 
-             DataBaseContexts.UContext.RemoveMobFromPosition(mob.YPos, mob.XPos);
-             DataBaseContexts.UContext.RemoveStructureFromPosition(structure.YPos, structure.XPos);
-             DataBaseContexts.UContext.RemoveGroundFromPosition(ground.YPos, ground.XPos);
-             DataBaseContexts.UContext.SaveChanges();
-
-            Assert.AreEqual(null,  DataBaseContexts.UContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't remove the mob correctly");
-            Assert.AreEqual(null,  DataBaseContexts.UContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't remove the structure correctly");
-            Assert.AreEqual(null,  DataBaseContexts.UContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't remove the ground correctly");
+            Assert.AreEqual(null, DataBaseContexts.UContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't remove the mob correctly");
+            Assert.AreEqual(null, DataBaseContexts.UContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't remove the structure correctly");
+            Assert.AreEqual(null, DataBaseContexts.UContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't remove the ground correctly");
         }
 
-
         [Test]
         public static void SetsCorrectValues() 
         {
@@ -133,31 +119,19 @@
             var ground = new UGPlacedTile("ground_stock", 3000, 4000);
             var newGround = new UGPlacedTile("new_ground_stock", 3000, 4000);
 
-             
-
-             DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
-             DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
-             DataBaseContexts.UContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
-             DataBaseContexts.UContext.SaveChanges();
+            DataBaseContexts.UContext.AddMobAtPosition(mob.stock_id, mob.Health, mob.YPos, mob.XPos);
+            DataBaseContexts.UContext.AddStructureAtPosition(structure.stock_id, structure.Health, structure.YPos, structure.XPos);
+            DataBaseContexts.UContext.AddGroundAtPosition(ground.stock_id, ground.YPos, ground.XPos);
+            DataBaseContexts.UContext.SaveChanges();
 
-             DataBaseContexts.UContext.SetMobAtPosition(newMob.stock_id, newMob.Health, newMob.YPos, newMob.XPos);
-             DataBaseContexts.UContext.SetStructureAtPosition(newStructure.stock_id, newStructure.Health, newStructure.YPos, newStructure.XPos);
-             DataBaseContexts.UContext.SetGroundAtPosition(newGround.stock_id, newGround.YPos, newGround.XPos);
-             DataBaseContexts.UContext.SaveChanges();
+            DataBaseContexts.UContext.SetMobAtPosition(newMob.stock_id, newMob.Health, newMob.YPos, newMob.XPos);
+            DataBaseContexts.UContext.SetStructureAtPosition(newStructure.stock_id, newStructure.Health, newStructure.YPos, newStructure.XPos);
+            DataBaseContexts.UContext.SetGroundAtPosition(newGround.stock_id, newGround.YPos, newGround.XPos);
+            DataBaseContexts.UContext.SaveChanges();
 
-            Assert.AreEqual(newMob.stock_id,  DataBaseContexts.UContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't set the mob correctly");
-            Assert.AreEqual(newStructure.stock_id,  DataBaseContexts.UContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't set the structure correctly");
-            Assert.AreEqual(newGround.stock_id,  DataBaseContexts.UContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't set the ground correctly");
+            Assert.AreEqual(newMob.stock_id, DataBaseContexts.UContext.GetMobLayerStock(mob.YPos, mob.XPos), "Didn't set the mob correctly");
+            Assert.AreEqual(newStructure.stock_id, DataBaseContexts.UContext.GetStructureLayerStock(structure.YPos, structure.XPos), "Didn't set the structure correctly");
+            Assert.AreEqual(newGround.stock_id, DataBaseContexts.UContext.GetGroundLayerStock(ground.YPos, ground.XPos), "Didn't set the ground correctly");
         }
-
-        //[Test]
-        //public static void TruncatesTablesOnInitialization() 
-        //{
-             
-
-        //    Assert.AreEqual(0,  DataBaseContexts.UContext.UMobLayer.Count(), "UMobLayer table isn't properly truncated upon UndergroundContext initialization");
-        //    Assert.AreEqual(0,  DataBaseContexts.UContext.UStructureLayer.Count(), "UStructureLayer table isn't properly truncated upon UndergroundContext initialization");
-        //    Assert.AreEqual(0,  DataBaseContexts.UContext.UGroundLayer.Count(), "LGroungLayer table isn't properly truncated upon UndergroundContext initialization");
-        //}
     }
 }