make the asserts spit out messages about their test names

5 files changed, 378 insertions, 378 deletions

diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 2a70711..2ab37c7 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -86,16 +86,16 @@ namespace OpenSim.Data.Tests
             db.CreateAsset(a3);
 
             AssetBase a1a = db.FetchAsset(uuid1);
-            Assert.That(a1.ID, Is.EqualTo(a1a.ID));
-            Assert.That(a1.Name, Is.EqualTo(a1a.Name));
+            Assert.That(a1.ID, Is.EqualTo(a1a.ID), "Assert.That(a1.ID, Is.EqualTo(a1a.ID))");
+            Assert.That(a1.Name, Is.EqualTo(a1a.Name), "Assert.That(a1.Name, Is.EqualTo(a1a.Name))");
 
             AssetBase a2a = db.FetchAsset(uuid2);
-            Assert.That(a2.ID, Is.EqualTo(a2a.ID));
-            Assert.That(a2.Name, Is.EqualTo(a2a.Name));
+            Assert.That(a2.ID, Is.EqualTo(a2a.ID), "Assert.That(a2.ID, Is.EqualTo(a2a.ID))");
+            Assert.That(a2.Name, Is.EqualTo(a2a.Name), "Assert.That(a2.Name, Is.EqualTo(a2a.Name))");
 
             AssetBase a3a = db.FetchAsset(uuid3);
-            Assert.That(a3.ID, Is.EqualTo(a3a.ID));
-            Assert.That(a3.Name, Is.EqualTo(a3a.Name));
+            Assert.That(a3.ID, Is.EqualTo(a3a.ID), "Assert.That(a3.ID, Is.EqualTo(a3a.ID))");
+            Assert.That(a3.Name, Is.EqualTo(a3a.Name), "Assert.That(a3.Name, Is.EqualTo(a3a.Name))");
         }
 
         [Test]
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs
index b108c68..2b5318a 100644
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ b/OpenSim/Data/Tests/BasicGridTest.cs
@@ -130,45 +130,45 @@ namespace OpenSim.Data.Tests
             RegionProfileData newreg = createRegion(region2, "|<Goth@m Ci1y>|");
             RegionProfileData retreg = db.GetProfileByUUID(region2);
 
-            Assert.That(retreg.RegionName, Is.EqualTo(newreg.RegionName));
-            Assert.That(retreg.Uuid, Is.EqualTo(region2));
-            Assert.That(retreg.RegionHandle, Is.EqualTo(newreg.RegionHandle));
-            Assert.That(retreg.RegionLocX, Is.EqualTo(newreg.RegionLocX));
-            Assert.That(retreg.RegionLocY, Is.EqualTo(newreg.RegionLocY));
-            Assert.That(retreg.RegionLocZ, Is.EqualTo(newreg.RegionLocZ));
-            Assert.That(retreg.RegionSendKey, Is.EqualTo(newreg.RegionSendKey));
-            Assert.That(retreg.RegionRecvKey, Is.EqualTo(newreg.RegionRecvKey));
-            Assert.That(retreg.RegionSecret, Is.EqualTo(newreg.RegionSecret));
-            Assert.That(retreg.RegionOnline, Is.EqualTo(newreg.RegionOnline));
-            Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID));
-            Assert.That(retreg.ServerIP, Is.EqualTo(newreg.ServerIP));
-            Assert.That(retreg.ServerPort, Is.EqualTo(newreg.ServerPort));
-            Assert.That(retreg.ServerURI, Is.EqualTo(newreg.ServerURI));
-            Assert.That(retreg.ServerHttpPort, Is.EqualTo(newreg.ServerHttpPort));
-            Assert.That(retreg.ServerRemotingPort, Is.EqualTo(newreg.ServerRemotingPort));
-            Assert.That(retreg.NorthOverrideHandle, Is.EqualTo(newreg.NorthOverrideHandle));
-            Assert.That(retreg.SouthOverrideHandle, Is.EqualTo(newreg.SouthOverrideHandle));
-            Assert.That(retreg.EastOverrideHandle, Is.EqualTo(newreg.EastOverrideHandle));
-            Assert.That(retreg.WestOverrideHandle, Is.EqualTo(newreg.WestOverrideHandle));
-            Assert.That(retreg.RegionDataURI, Is.EqualTo(newreg.RegionDataURI));
-            Assert.That(retreg.RegionAssetURI, Is.EqualTo(newreg.RegionAssetURI));
-            Assert.That(retreg.RegionAssetSendKey, Is.EqualTo(newreg.RegionAssetSendKey));
-            Assert.That(retreg.RegionAssetRecvKey, Is.EqualTo(newreg.RegionAssetRecvKey));
-            Assert.That(retreg.RegionUserURI, Is.EqualTo(newreg.RegionUserURI));
-            Assert.That(retreg.RegionUserSendKey, Is.EqualTo(newreg.RegionUserSendKey));
-            Assert.That(retreg.RegionUserRecvKey, Is.EqualTo(newreg.RegionUserRecvKey));
-            Assert.That(retreg.RegionMapTextureID, Is.EqualTo(newreg.RegionMapTextureID));
-            Assert.That(retreg.Owner_uuid, Is.EqualTo(newreg.Owner_uuid));
-            Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID));
+            Assert.That(retreg.RegionName, Is.EqualTo(newreg.RegionName), "Assert.That(retreg.RegionName, Is.EqualTo(newreg.RegionName))");
+            Assert.That(retreg.Uuid, Is.EqualTo(region2), "Assert.That(retreg.Uuid, Is.EqualTo(region2))");
+            Assert.That(retreg.RegionHandle, Is.EqualTo(newreg.RegionHandle), "Assert.That(retreg.RegionHandle, Is.EqualTo(newreg.RegionHandle))");
+            Assert.That(retreg.RegionLocX, Is.EqualTo(newreg.RegionLocX), "Assert.That(retreg.RegionLocX, Is.EqualTo(newreg.RegionLocX))");
+            Assert.That(retreg.RegionLocY, Is.EqualTo(newreg.RegionLocY), "Assert.That(retreg.RegionLocY, Is.EqualTo(newreg.RegionLocY))");
+            Assert.That(retreg.RegionLocZ, Is.EqualTo(newreg.RegionLocZ), "Assert.That(retreg.RegionLocZ, Is.EqualTo(newreg.RegionLocZ))");
+            Assert.That(retreg.RegionSendKey, Is.EqualTo(newreg.RegionSendKey), "Assert.That(retreg.RegionSendKey, Is.EqualTo(newreg.RegionSendKey))");
+            Assert.That(retreg.RegionRecvKey, Is.EqualTo(newreg.RegionRecvKey), "Assert.That(retreg.RegionRecvKey, Is.EqualTo(newreg.RegionRecvKey))");
+            Assert.That(retreg.RegionSecret, Is.EqualTo(newreg.RegionSecret), "Assert.That(retreg.RegionSecret, Is.EqualTo(newreg.RegionSecret))");
+            Assert.That(retreg.RegionOnline, Is.EqualTo(newreg.RegionOnline), "Assert.That(retreg.RegionOnline, Is.EqualTo(newreg.RegionOnline))");
+            Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID), "Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID))");
+            Assert.That(retreg.ServerIP, Is.EqualTo(newreg.ServerIP), "Assert.That(retreg.ServerIP, Is.EqualTo(newreg.ServerIP))");
+            Assert.That(retreg.ServerPort, Is.EqualTo(newreg.ServerPort), "Assert.That(retreg.ServerPort, Is.EqualTo(newreg.ServerPort))");
+            Assert.That(retreg.ServerURI, Is.EqualTo(newreg.ServerURI), "Assert.That(retreg.ServerURI, Is.EqualTo(newreg.ServerURI))");
+            Assert.That(retreg.ServerHttpPort, Is.EqualTo(newreg.ServerHttpPort), "Assert.That(retreg.ServerHttpPort, Is.EqualTo(newreg.ServerHttpPort))");
+            Assert.That(retreg.ServerRemotingPort, Is.EqualTo(newreg.ServerRemotingPort), "Assert.That(retreg.ServerRemotingPort, Is.EqualTo(newreg.ServerRemotingPort))");
+            Assert.That(retreg.NorthOverrideHandle, Is.EqualTo(newreg.NorthOverrideHandle), "Assert.That(retreg.NorthOverrideHandle, Is.EqualTo(newreg.NorthOverrideHandle))");
+            Assert.That(retreg.SouthOverrideHandle, Is.EqualTo(newreg.SouthOverrideHandle), "Assert.That(retreg.SouthOverrideHandle, Is.EqualTo(newreg.SouthOverrideHandle))");
+            Assert.That(retreg.EastOverrideHandle, Is.EqualTo(newreg.EastOverrideHandle), "Assert.That(retreg.EastOverrideHandle, Is.EqualTo(newreg.EastOverrideHandle))");
+            Assert.That(retreg.WestOverrideHandle, Is.EqualTo(newreg.WestOverrideHandle), "Assert.That(retreg.WestOverrideHandle, Is.EqualTo(newreg.WestOverrideHandle))");
+            Assert.That(retreg.RegionDataURI, Is.EqualTo(newreg.RegionDataURI), "Assert.That(retreg.RegionDataURI, Is.EqualTo(newreg.RegionDataURI))");
+            Assert.That(retreg.RegionAssetURI, Is.EqualTo(newreg.RegionAssetURI), "Assert.That(retreg.RegionAssetURI, Is.EqualTo(newreg.RegionAssetURI))");
+            Assert.That(retreg.RegionAssetSendKey, Is.EqualTo(newreg.RegionAssetSendKey), "Assert.That(retreg.RegionAssetSendKey, Is.EqualTo(newreg.RegionAssetSendKey))");
+            Assert.That(retreg.RegionAssetRecvKey, Is.EqualTo(newreg.RegionAssetRecvKey), "Assert.That(retreg.RegionAssetRecvKey, Is.EqualTo(newreg.RegionAssetRecvKey))");
+            Assert.That(retreg.RegionUserURI, Is.EqualTo(newreg.RegionUserURI), "Assert.That(retreg.RegionUserURI, Is.EqualTo(newreg.RegionUserURI))");
+            Assert.That(retreg.RegionUserSendKey, Is.EqualTo(newreg.RegionUserSendKey), "Assert.That(retreg.RegionUserSendKey, Is.EqualTo(newreg.RegionUserSendKey))");
+            Assert.That(retreg.RegionUserRecvKey, Is.EqualTo(newreg.RegionUserRecvKey), "Assert.That(retreg.RegionUserRecvKey, Is.EqualTo(newreg.RegionUserRecvKey))");
+            Assert.That(retreg.RegionMapTextureID, Is.EqualTo(newreg.RegionMapTextureID), "Assert.That(retreg.RegionMapTextureID, Is.EqualTo(newreg.RegionMapTextureID))");
+            Assert.That(retreg.Owner_uuid, Is.EqualTo(newreg.Owner_uuid), "Assert.That(retreg.Owner_uuid, Is.EqualTo(newreg.Owner_uuid))");
+            Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID), "Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID))");
 
             retreg = db.GetProfileByHandle(newreg.RegionHandle);
-            Assert.That(retreg.Uuid, Is.EqualTo(region2));
+            Assert.That(retreg.Uuid, Is.EqualTo(region2), "Assert.That(retreg.Uuid, Is.EqualTo(region2))");
 
             retreg = db.GetProfileByString(newreg.RegionName);
-            Assert.That(retreg.Uuid, Is.EqualTo(region2));
+            Assert.That(retreg.Uuid, Is.EqualTo(region2), "Assert.That(retreg.Uuid, Is.EqualTo(region2))");
 
             RegionProfileData[] retregs = db.GetProfilesInRange(newreg.RegionLocX,newreg.RegionLocY,newreg.RegionLocX,newreg.RegionLocY);
-            Assert.That(retregs[0].Uuid, Is.EqualTo(region2));
+            Assert.That(retregs[0].Uuid, Is.EqualTo(region2), "Assert.That(retregs[0].Uuid, Is.EqualTo(region2))");
         }
 
         [Test]
@@ -192,7 +192,7 @@ namespace OpenSim.Data.Tests
             db.UpdateProfile(retreg);
 
             retreg = db.GetProfileByUUID(region2);
-            Assert.That(retreg.RegionName, Is.EqualTo("Gotham City"));
+            Assert.That(retreg.RegionName, Is.EqualTo("Gotham City"), "Assert.That(retreg.RegionName, Is.EqualTo(\"Gotham City\"))");
         }
 
         [Test]
@@ -214,10 +214,10 @@ namespace OpenSim.Data.Tests
 
             List<RegionProfileData> listreg = db.GetRegionsByName("Gotham",10);
 
-            Assert.That(listreg.Count,Is.EqualTo(2));
-            Assert.That(listreg[0].Uuid,Is.Not.EqualTo(listreg[1].Uuid));
-            Assert.That(listreg[0].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2));
-            Assert.That(listreg[1].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2));
+            Assert.That(listreg.Count,Is.EqualTo(2), "Assert.That(listreg.Count,Is.EqualTo(2))");
+            Assert.That(listreg[0].Uuid,Is.Not.EqualTo(listreg[1].Uuid), "Assert.That(listreg[0].Uuid,Is.Not.EqualTo(listreg[1].Uuid))");
+            Assert.That(listreg[0].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2), "Assert.That(listreg[0].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2))");
+            Assert.That(listreg[1].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2), "Assert.That(listreg[1].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2))");
         }
 
         protected static string RandomName()
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs
index eed6cab..c614577 100644
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Data.Tests
             Assert.That(db.getInventoryFolder(zero), Is.Null);
             Assert.That(db.getInventoryItem(zero), Is.Null);
             Assert.That(db.getUserRootFolder(zero), Is.Null);
-            Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0));
+            Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
         }
 
         // 01x - folder tests
@@ -144,14 +144,14 @@ namespace OpenSim.Data.Tests
             // db.updateInventoryFolder(f1);
             // InventoryFolderBase f1a = db.getUserRootFolder(owner1);
             // Assert.That(uuid1, Is.EqualTo(f1a.ID))
-            // Assert.That(name1, Text.Matches(f1a.Name));
+            // Assert.That(name1, Text.Matches(f1a.Name), "Assert.That(name1, Text.Matches(f1a.Name))");
             // Assert.That(db.getUserRootFolder(owner1), Is.Null);
 
             // succeed with true
             db.addInventoryFolder(f1);
             InventoryFolderBase f1a = db.getUserRootFolder(owner1);
-            Assert.That(folder1, Is.EqualTo(f1a.ID));
-            Assert.That(name1, Text.Matches(f1a.Name));
+            Assert.That(folder1, Is.EqualTo(f1a.ID), "Assert.That(folder1, Is.EqualTo(f1a.ID))");
+            Assert.That(name1, Text.Matches(f1a.Name), "Assert.That(name1, Text.Matches(f1a.Name))");
         }
 
         // we now have the following tree
@@ -165,22 +165,22 @@ namespace OpenSim.Data.Tests
             InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3);
             db.addInventoryFolder(f2);
 
-            Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1));
-            Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(2));
-            Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0));
-            Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(0));
-            Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0));
+            Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1), "Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1))");
+            Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(2), "Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(2))");
+            Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0), "Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0))");
+            Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(0), "Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(0))");
+            Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0), "Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0))");
 
         }
 
         [Test]
         public void T013_FolderHierarchy()
         {
-            Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0));
-            Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2));
-            Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0));
-            Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(0));
-            Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0));
+            Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
+            Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))");
+            Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0))");
+            Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(0))");
+            Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0))");
         }
 
 
@@ -191,31 +191,31 @@ namespace OpenSim.Data.Tests
             f2.ParentID = folder3;
             db.moveInventoryFolder(f2);
 
-            Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1));
-            Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(1));
-            Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0));
-            Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(1));
-            Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0));
+            Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1), "Assert.That(db.getInventoryFolders(zero).Count, Is.EqualTo(1))");
+            Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(1), "Assert.That(db.getInventoryFolders(folder1).Count, Is.EqualTo(1))");
+            Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0), "Assert.That(db.getInventoryFolders(folder2).Count, Is.EqualTo(0))");
+            Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(1), "Assert.That(db.getInventoryFolders(folder3).Count, Is.EqualTo(1))");
+            Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0), "Assert.That(db.getInventoryFolders(UUID.Random()).Count, Is.EqualTo(0))");
         }
 
         [Test]
         public void T015_FolderHierarchy()
         {
-            Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0));
-            Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2));
-            Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0));
-            Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(1));
-            Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0));
+            Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
+            Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))");
+            Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0))");
+            Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(1), "Assert.That(db.getFolderHierarchy(folder3).Count, Is.EqualTo(1))");
+            Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(UUID.Random()).Count, Is.EqualTo(0))");
         }
 
         // Item tests
         [Test]
         public void T100_NoItems()
         {
-            Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0));
-            Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0));
-            Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0));
-            Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(0));
+            Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
+            Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0))");
+            Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0))");
+            Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(0))");
         }
 
         // TODO: Feeding a bad inventory item down the data path will
@@ -227,7 +227,7 @@ namespace OpenSim.Data.Tests
             db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1));
             db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2));
             db.addInventoryItem(NewItem(item3, folder3, owner1, iname3, asset3));
-            Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(3));
+            Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(3), "Assert.That(db.getInventoryInFolder(folder3).Count, Is.EqualTo(3))");
         }
 
         [Test]
@@ -236,15 +236,15 @@ namespace OpenSim.Data.Tests
             InventoryItemBase i1 = db.getInventoryItem(item1);
             InventoryItemBase i2 = db.getInventoryItem(item2);
             InventoryItemBase i3 = db.getInventoryItem(item3);
-            Assert.That(i1.Name, Is.EqualTo(iname1));
-            Assert.That(i2.Name, Is.EqualTo(iname2));
-            Assert.That(i3.Name, Is.EqualTo(iname3));
-            Assert.That(i1.Owner, Is.EqualTo(owner1));
-            Assert.That(i2.Owner, Is.EqualTo(owner1));
-            Assert.That(i3.Owner, Is.EqualTo(owner1));
-            Assert.That(i1.AssetID, Is.EqualTo(asset1));
-            Assert.That(i2.AssetID, Is.EqualTo(asset2));
-            Assert.That(i3.AssetID, Is.EqualTo(asset3));
+            Assert.That(i1.Name, Is.EqualTo(iname1), "Assert.That(i1.Name, Is.EqualTo(iname1))");
+            Assert.That(i2.Name, Is.EqualTo(iname2), "Assert.That(i2.Name, Is.EqualTo(iname2))");
+            Assert.That(i3.Name, Is.EqualTo(iname3), "Assert.That(i3.Name, Is.EqualTo(iname3))");
+            Assert.That(i1.Owner, Is.EqualTo(owner1), "Assert.That(i1.Owner, Is.EqualTo(owner1))");
+            Assert.That(i2.Owner, Is.EqualTo(owner1), "Assert.That(i2.Owner, Is.EqualTo(owner1))");
+            Assert.That(i3.Owner, Is.EqualTo(owner1), "Assert.That(i3.Owner, Is.EqualTo(owner1))");
+            Assert.That(i1.AssetID, Is.EqualTo(asset1), "Assert.That(i1.AssetID, Is.EqualTo(asset1))");
+            Assert.That(i2.AssetID, Is.EqualTo(asset2), "Assert.That(i2.AssetID, Is.EqualTo(asset2))");
+            Assert.That(i3.AssetID, Is.EqualTo(asset3), "Assert.That(i3.AssetID, Is.EqualTo(asset3))");
         }
 
         [Test]
@@ -260,9 +260,9 @@ namespace OpenSim.Data.Tests
             db.updateInventoryItem(i1);
 
             i1 = db.getInventoryItem(item1);
-            Assert.That(i1.Name, Is.EqualTo(niname1));
-            Assert.That(i1.Description, Is.EqualTo(niname1));
-            Assert.That(i1.Owner, Is.EqualTo(owner2));
+            Assert.That(i1.Name, Is.EqualTo(niname1), "Assert.That(i1.Name, Is.EqualTo(niname1))");
+            Assert.That(i1.Description, Is.EqualTo(niname1), "Assert.That(i1.Description, Is.EqualTo(niname1))");
+            Assert.That(i1.Owner, Is.EqualTo(owner2), "Assert.That(i1.Owner, Is.EqualTo(owner2))");
         }
 
         private InventoryItemBase NewItem(UUID id, UUID parent, UUID owner, string name, UUID asset)
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 0e87c8c..36ab42b 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -120,9 +120,9 @@ namespace OpenSim.Data.Tests
             List<SceneObjectGroup> objs3 = db.LoadObjects(region3);
             List<LandData> land = db.LoadLandObjects(region1);
 
-            Assert.That(objs.Count, Is.EqualTo(0));
-            Assert.That(objs3.Count, Is.EqualTo(0));
-            Assert.That(land.Count, Is.EqualTo(0));
+            Assert.That(objs.Count, Is.EqualTo(0), "Assert.That(objs.Count, Is.EqualTo(0))");
+            Assert.That(objs3.Count, Is.EqualTo(0), "Assert.That(objs3.Count, Is.EqualTo(0))");
+            Assert.That(land.Count, Is.EqualTo(0), "Assert.That(land.Count, Is.EqualTo(0))");
         }
         
         // SOG round trips
@@ -159,7 +159,7 @@ namespace OpenSim.Data.Tests
             // This tests the ADO.NET driver
             List<SceneObjectGroup> objs = db.LoadObjects(region1);
             
-            Assert.That(objs.Count, Is.EqualTo(2));
+            Assert.That(objs.Count, Is.EqualTo(2), "Assert.That(objs.Count, Is.EqualTo(2))");
         }
         
         [Test]
@@ -169,8 +169,8 @@ namespace OpenSim.Data.Tests
             foreach (SceneObjectGroup sog in objs)
             {
                 SceneObjectPart p = sog.RootPart;
-                Assert.That("", Is.Not.EqualTo(p.Name));
-                Assert.That(p.Name, Is.EqualTo(p.Description));
+                Assert.That("", Is.Not.EqualTo(p.Name), "Assert.That(\"\", Is.Not.EqualTo(p.Name))");
+                Assert.That(p.Name, Is.EqualTo(p.Description), "Assert.That(p.Name, Is.EqualTo(p.Description))");
             }
         }
         
@@ -191,20 +191,20 @@ namespace OpenSim.Data.Tests
             sog.AddPart(p3);
             
             SceneObjectPart[] parts = sog.GetParts();
-            Assert.That(parts.Length,Is.EqualTo(4));
+            Assert.That(parts.Length,Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))");
             
             db.StoreObject(sog, newregion);
             List<SceneObjectGroup> sogs = db.LoadObjects(newregion);
-            Assert.That(sogs.Count,Is.EqualTo(1));
+            Assert.That(sogs.Count,Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))");
             SceneObjectGroup newsog = sogs[0];
                         
             SceneObjectPart[] newparts = newsog.GetParts();
-            Assert.That(newparts.Length,Is.EqualTo(4));
+            Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
             
-            Assert.That(newsog.HasChildPrim(tmp0));
-            Assert.That(newsog.HasChildPrim(tmp1));
-            Assert.That(newsog.HasChildPrim(tmp2));
-            Assert.That(newsog.HasChildPrim(tmp3));
+            Assert.That(newsog.HasChildPrim(tmp0), "Assert.That(newsog.HasChildPrim(tmp0))");
+            Assert.That(newsog.HasChildPrim(tmp1), "Assert.That(newsog.HasChildPrim(tmp1))");
+            Assert.That(newsog.HasChildPrim(tmp2), "Assert.That(newsog.HasChildPrim(tmp2))");
+            Assert.That(newsog.HasChildPrim(tmp3), "Assert.That(newsog.HasChildPrim(tmp3))");
         }
         
         [Test]
@@ -294,37 +294,37 @@ namespace OpenSim.Data.Tests
             sop.UpdateFlag = updatef;
 
             //Tests if local part accepted the parameters:
-            Assert.That(regionh,Is.EqualTo(sop.RegionHandle));
-            Assert.That(localid,Is.EqualTo(sop.LocalId));
-            Assert.That(groupos,Is.EqualTo(sop.GroupPosition));
-            Assert.That(name,Is.EqualTo(sop.Name));
-            Assert.That(rotoff,Is.EqualTo(sop.RotationOffset));
-            Assert.That(uuid,Is.EqualTo(sop.UUID));
-            Assert.That(creator,Is.EqualTo(sop.CreatorID));
+            Assert.That(regionh,Is.EqualTo(sop.RegionHandle), "Assert.That(regionh,Is.EqualTo(sop.RegionHandle))");
+            Assert.That(localid,Is.EqualTo(sop.LocalId), "Assert.That(localid,Is.EqualTo(sop.LocalId))");
+            Assert.That(groupos,Is.EqualTo(sop.GroupPosition), "Assert.That(groupos,Is.EqualTo(sop.GroupPosition))");
+            Assert.That(name,Is.EqualTo(sop.Name), "Assert.That(name,Is.EqualTo(sop.Name))");
+            Assert.That(rotoff,Is.EqualTo(sop.RotationOffset), "Assert.That(rotoff,Is.EqualTo(sop.RotationOffset))");
+            Assert.That(uuid,Is.EqualTo(sop.UUID), "Assert.That(uuid,Is.EqualTo(sop.UUID))");
+            Assert.That(creator,Is.EqualTo(sop.CreatorID), "Assert.That(creator,Is.EqualTo(sop.CreatorID))");
             // Modified in-class
-            // Assert.That(iserial,Is.EqualTo(sop.InventorySerial));
-            Assert.That(dic,Is.EqualTo(sop.TaskInventory));
-            Assert.That(objf,Is.EqualTo(sop.ObjectFlags));
-            Assert.That(name,Is.EqualTo(sop.Name));
-            Assert.That(material,Is.EqualTo(sop.Material));
-            Assert.That(pin,Is.EqualTo(sop.ScriptAccessPin));
-            Assert.That(textani,Is.EqualTo(sop.TextureAnimation));
-            Assert.That(partsys,Is.EqualTo(sop.ParticleSystem));
-            Assert.That(expires,Is.EqualTo(sop.Expires));
-            Assert.That(rezzed,Is.EqualTo(sop.Rezzed));
-            Assert.That(offset,Is.EqualTo(sop.OffsetPosition));
-            Assert.That(velocity,Is.EqualTo(sop.Velocity));                       
-            Assert.That(angvelo,Is.EqualTo(sop.AngularVelocity));
-            Assert.That(accel,Is.EqualTo(sop.Acceleration));
-            Assert.That(description,Is.EqualTo(sop.Description));
-            Assert.That(color,Is.EqualTo(sop.Color));
-            Assert.That(text,Is.EqualTo(sop.Text));
-            Assert.That(sitname,Is.EqualTo(sop.SitName));
-            Assert.That(touchname,Is.EqualTo(sop.TouchName));
-            Assert.That(linknum,Is.EqualTo(sop.LinkNum));
-            Assert.That(clickaction,Is.EqualTo(sop.ClickAction));
-            Assert.That(scale,Is.EqualTo(sop.Scale));
-            Assert.That(updatef,Is.EqualTo(sop.UpdateFlag));
+            // Assert.That(iserial,Is.EqualTo(sop.InventorySerial), "Assert.That(iserial,Is.EqualTo(sop.InventorySerial))");
+            Assert.That(dic,Is.EqualTo(sop.TaskInventory), "Assert.That(dic,Is.EqualTo(sop.TaskInventory))");
+            Assert.That(objf,Is.EqualTo(sop.ObjectFlags), "Assert.That(objf,Is.EqualTo(sop.ObjectFlags))");
+            Assert.That(name,Is.EqualTo(sop.Name), "Assert.That(name,Is.EqualTo(sop.Name))");
+            Assert.That(material,Is.EqualTo(sop.Material), "Assert.That(material,Is.EqualTo(sop.Material))");
+            Assert.That(pin,Is.EqualTo(sop.ScriptAccessPin), "Assert.That(pin,Is.EqualTo(sop.ScriptAccessPin))");
+            Assert.That(textani,Is.EqualTo(sop.TextureAnimation), "Assert.That(textani,Is.EqualTo(sop.TextureAnimation))");
+            Assert.That(partsys,Is.EqualTo(sop.ParticleSystem), "Assert.That(partsys,Is.EqualTo(sop.ParticleSystem))");
+            Assert.That(expires,Is.EqualTo(sop.Expires), "Assert.That(expires,Is.EqualTo(sop.Expires))");
+            Assert.That(rezzed,Is.EqualTo(sop.Rezzed), "Assert.That(rezzed,Is.EqualTo(sop.Rezzed))");
+            Assert.That(offset,Is.EqualTo(sop.OffsetPosition), "Assert.That(offset,Is.EqualTo(sop.OffsetPosition))");
+            Assert.That(velocity,Is.EqualTo(sop.Velocity), "Assert.That(velocity,Is.EqualTo(sop.Velocity))");                       
+            Assert.That(angvelo,Is.EqualTo(sop.AngularVelocity), "Assert.That(angvelo,Is.EqualTo(sop.AngularVelocity))");
+            Assert.That(accel,Is.EqualTo(sop.Acceleration), "Assert.That(accel,Is.EqualTo(sop.Acceleration))");
+            Assert.That(description,Is.EqualTo(sop.Description), "Assert.That(description,Is.EqualTo(sop.Description))");
+            Assert.That(color,Is.EqualTo(sop.Color), "Assert.That(color,Is.EqualTo(sop.Color))");
+            Assert.That(text,Is.EqualTo(sop.Text), "Assert.That(text,Is.EqualTo(sop.Text))");
+            Assert.That(sitname,Is.EqualTo(sop.SitName), "Assert.That(sitname,Is.EqualTo(sop.SitName))");
+            Assert.That(touchname,Is.EqualTo(sop.TouchName), "Assert.That(touchname,Is.EqualTo(sop.TouchName))");
+            Assert.That(linknum,Is.EqualTo(sop.LinkNum), "Assert.That(linknum,Is.EqualTo(sop.LinkNum))");
+            Assert.That(clickaction,Is.EqualTo(sop.ClickAction), "Assert.That(clickaction,Is.EqualTo(sop.ClickAction))");
+            Assert.That(scale,Is.EqualTo(sop.Scale), "Assert.That(scale,Is.EqualTo(sop.Scale))");
+            Assert.That(updatef,Is.EqualTo(sop.UpdateFlag), "Assert.That(updatef,Is.EqualTo(sop.UpdateFlag))");
             
             // This is necessary or object will not be inserted in DB            
             sop.ObjectFlags = 0;
@@ -336,52 +336,52 @@ namespace OpenSim.Data.Tests
             // Inserts group in DB
             db.StoreObject(sog,region3);
             List<SceneObjectGroup> sogs = db.LoadObjects(region3);
-            Assert.That(sogs.Count, Is.EqualTo(1));
+            Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
             // Makes sure there are no double insertions:
             db.StoreObject(sog,region3);
             sogs = db.LoadObjects(region3);
-            Assert.That(sogs.Count, Is.EqualTo(1));            
+            Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");            
                 
 
             // Tests if the parameters were inserted correctly
             SceneObjectPart p = sogs[0].RootPart;               
-            Assert.That(regionh,Is.EqualTo(p.RegionHandle));
-            //Assert.That(localid,Is.EqualTo(p.LocalId));
-            Assert.That(groupos,Is.EqualTo(p.GroupPosition));
-            Assert.That(name,Is.EqualTo(p.Name));
-            Assert.That(rotoff,Is.EqualTo(p.RotationOffset));
-            Assert.That(uuid,Is.EqualTo(p.UUID));
-            Assert.That(creator,Is.EqualTo(p.CreatorID));
-            //Assert.That(iserial,Is.EqualTo(p.InventorySerial));
-            Assert.That(dic,Is.EqualTo(p.TaskInventory));
-            //Assert.That(objf,Is.EqualTo(p.ObjectFlags));
-            Assert.That(name,Is.EqualTo(p.Name));
-            Assert.That(material,Is.EqualTo(p.Material));
-            Assert.That(pin,Is.EqualTo(p.ScriptAccessPin));
-            Assert.That(textani,Is.EqualTo(p.TextureAnimation));
-            Assert.That(partsys,Is.EqualTo(p.ParticleSystem));
-            //Assert.That(expires,Is.EqualTo(p.Expires));
-            //Assert.That(rezzed,Is.EqualTo(p.Rezzed));
-            Assert.That(offset,Is.EqualTo(p.OffsetPosition));
-            Assert.That(velocity,Is.EqualTo(p.Velocity));
-            Assert.That(angvelo,Is.EqualTo(p.AngularVelocity));
-            Assert.That(accel,Is.EqualTo(p.Acceleration));
-            Assert.That(description,Is.EqualTo(p.Description));
-            Assert.That(color,Is.EqualTo(p.Color));
-            Assert.That(text,Is.EqualTo(p.Text));
-            Assert.That(sitname,Is.EqualTo(p.SitName));
-            Assert.That(touchname,Is.EqualTo(p.TouchName));
-            //Assert.That(linknum,Is.EqualTo(p.LinkNum));
-            Assert.That(clickaction,Is.EqualTo(p.ClickAction));
-            Assert.That(scale,Is.EqualTo(p.Scale));
-
-            //Assert.That(updatef,Is.EqualTo(p.UpdateFlag));
-
-            Assert.That(pbshap.PathBegin, Is.EqualTo(p.Shape.PathBegin));
-            Assert.That(pbshap.PathEnd, Is.EqualTo(p.Shape.PathEnd));
-            Assert.That(pbshap.ProfileBegin, Is.EqualTo(p.Shape.ProfileBegin));
-            Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd));
-            Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow));
+            Assert.That(regionh,Is.EqualTo(p.RegionHandle), "Assert.That(regionh,Is.EqualTo(p.RegionHandle))");
+            //Assert.That(localid,Is.EqualTo(p.LocalId), "Assert.That(localid,Is.EqualTo(p.LocalId))");
+            Assert.That(groupos,Is.EqualTo(p.GroupPosition), "Assert.That(groupos,Is.EqualTo(p.GroupPosition))");
+            Assert.That(name,Is.EqualTo(p.Name), "Assert.That(name,Is.EqualTo(p.Name))");
+            Assert.That(rotoff,Is.EqualTo(p.RotationOffset), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
+            Assert.That(uuid,Is.EqualTo(p.UUID), "Assert.That(uuid,Is.EqualTo(p.UUID))");
+            Assert.That(creator,Is.EqualTo(p.CreatorID), "Assert.That(creator,Is.EqualTo(p.CreatorID))");
+            //Assert.That(iserial,Is.EqualTo(p.InventorySerial), "Assert.That(iserial,Is.EqualTo(p.InventorySerial))");
+            Assert.That(dic,Is.EqualTo(p.TaskInventory), "Assert.That(dic,Is.EqualTo(p.TaskInventory))");
+            //Assert.That(objf,Is.EqualTo(p.ObjectFlags), "Assert.That(objf,Is.EqualTo(p.ObjectFlags))");
+            Assert.That(name,Is.EqualTo(p.Name), "Assert.That(name,Is.EqualTo(p.Name))");
+            Assert.That(material,Is.EqualTo(p.Material), "Assert.That(material,Is.EqualTo(p.Material))");
+            Assert.That(pin,Is.EqualTo(p.ScriptAccessPin), "Assert.That(pin,Is.EqualTo(p.ScriptAccessPin))");
+            Assert.That(textani,Is.EqualTo(p.TextureAnimation), "Assert.That(textani,Is.EqualTo(p.TextureAnimation))");
+            Assert.That(partsys,Is.EqualTo(p.ParticleSystem), "Assert.That(partsys,Is.EqualTo(p.ParticleSystem))");
+            //Assert.That(expires,Is.EqualTo(p.Expires), "Assert.That(expires,Is.EqualTo(p.Expires))");
+            //Assert.That(rezzed,Is.EqualTo(p.Rezzed), "Assert.That(rezzed,Is.EqualTo(p.Rezzed))");
+            Assert.That(offset,Is.EqualTo(p.OffsetPosition), "Assert.That(offset,Is.EqualTo(p.OffsetPosition))");
+            Assert.That(velocity,Is.EqualTo(p.Velocity), "Assert.That(velocity,Is.EqualTo(p.Velocity))");
+            Assert.That(angvelo,Is.EqualTo(p.AngularVelocity), "Assert.That(angvelo,Is.EqualTo(p.AngularVelocity))");
+            Assert.That(accel,Is.EqualTo(p.Acceleration), "Assert.That(accel,Is.EqualTo(p.Acceleration))");
+            Assert.That(description,Is.EqualTo(p.Description), "Assert.That(description,Is.EqualTo(p.Description))");
+            Assert.That(color,Is.EqualTo(p.Color), "Assert.That(color,Is.EqualTo(p.Color))");
+            Assert.That(text,Is.EqualTo(p.Text), "Assert.That(text,Is.EqualTo(p.Text))");
+            Assert.That(sitname,Is.EqualTo(p.SitName), "Assert.That(sitname,Is.EqualTo(p.SitName))");
+            Assert.That(touchname,Is.EqualTo(p.TouchName), "Assert.That(touchname,Is.EqualTo(p.TouchName))");
+            //Assert.That(linknum,Is.EqualTo(p.LinkNum), "Assert.That(linknum,Is.EqualTo(p.LinkNum))");
+            Assert.That(clickaction,Is.EqualTo(p.ClickAction), "Assert.That(clickaction,Is.EqualTo(p.ClickAction))");
+            Assert.That(scale,Is.EqualTo(p.Scale), "Assert.That(scale,Is.EqualTo(p.Scale))");
+
+            //Assert.That(updatef,Is.EqualTo(p.UpdateFlag), "Assert.That(updatef,Is.EqualTo(p.UpdateFlag))");
+
+            Assert.That(pbshap.PathBegin, Is.EqualTo(p.Shape.PathBegin), "Assert.That(pbshap.PathBegin, Is.EqualTo(p.Shape.PathBegin))");
+            Assert.That(pbshap.PathEnd, Is.EqualTo(p.Shape.PathEnd), "Assert.That(pbshap.PathEnd, Is.EqualTo(p.Shape.PathEnd))");
+            Assert.That(pbshap.ProfileBegin, Is.EqualTo(p.Shape.ProfileBegin), "Assert.That(pbshap.ProfileBegin, Is.EqualTo(p.Shape.ProfileBegin))");
+            Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd), "Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd))");
+            Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow), "Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow))");
         }
         
         [Test]
@@ -393,7 +393,7 @@ namespace OpenSim.Data.Tests
             db.StoreObject(sog, region1);
 
             sog = FindSOG("object1", region1);
-            Assert.That(text1, Is.EqualTo(sog.RootPart.Text));
+            Assert.That(text1, Is.EqualTo(sog.RootPart.Text), "Assert.That(text1, Is.EqualTo(sog.RootPart.Text))");
 
             // Creates random values
             UUID creator = new UUID();
@@ -460,33 +460,33 @@ namespace OpenSim.Data.Tests
             
             db.StoreObject(sog2, region3);
             List<SceneObjectGroup> sogs = db.LoadObjects(region3);
-            Assert.That(sogs.Count, Is.EqualTo(1));
+            Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
             
             SceneObjectGroup retsog = FindSOG("West  Adam", region3);
             Assert.That(retsog,Is.Not.Null);
             SceneObjectPart p = retsog.RootPart;
-            Assert.That(regionh,Is.EqualTo(p.RegionHandle));
-            Assert.That(groupos,Is.EqualTo(p.GroupPosition));
-            Assert.That(name,Is.EqualTo(p.Name));
-            Assert.That(rotoff,Is.EqualTo(p.RotationOffset));
-            Assert.That(creator,Is.EqualTo(p.CreatorID));
-            Assert.That(dic,Is.EqualTo(p.TaskInventory));
-            Assert.That(name,Is.EqualTo(p.Name));
-            Assert.That(material,Is.EqualTo(p.Material));
-            Assert.That(pin,Is.EqualTo(p.ScriptAccessPin));
-            Assert.That(textani,Is.EqualTo(p.TextureAnimation));
-            Assert.That(partsys,Is.EqualTo(p.ParticleSystem));
-            Assert.That(offset,Is.EqualTo(p.OffsetPosition));
-            Assert.That(velocity,Is.EqualTo(p.Velocity));
-            Assert.That(angvelo,Is.EqualTo(p.AngularVelocity));
-            Assert.That(accel,Is.EqualTo(p.Acceleration));
-            Assert.That(description,Is.EqualTo(p.Description));
-            Assert.That(color,Is.EqualTo(p.Color));
-            Assert.That(text,Is.EqualTo(p.Text));
-            Assert.That(sitname,Is.EqualTo(p.SitName));
-            Assert.That(touchname,Is.EqualTo(p.TouchName));
-            Assert.That(clickaction,Is.EqualTo(p.ClickAction));
-            Assert.That(scale,Is.EqualTo(p.Scale));
+            Assert.That(regionh,Is.EqualTo(p.RegionHandle), "Assert.That(regionh,Is.EqualTo(p.RegionHandle))");
+            Assert.That(groupos,Is.EqualTo(p.GroupPosition), "Assert.That(groupos,Is.EqualTo(p.GroupPosition))");
+            Assert.That(name,Is.EqualTo(p.Name), "Assert.That(name,Is.EqualTo(p.Name))");
+            Assert.That(rotoff,Is.EqualTo(p.RotationOffset), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
+            Assert.That(creator,Is.EqualTo(p.CreatorID), "Assert.That(creator,Is.EqualTo(p.CreatorID))");
+            Assert.That(dic,Is.EqualTo(p.TaskInventory), "Assert.That(dic,Is.EqualTo(p.TaskInventory))");
+            Assert.That(name,Is.EqualTo(p.Name), "Assert.That(name,Is.EqualTo(p.Name))");
+            Assert.That(material,Is.EqualTo(p.Material), "Assert.That(material,Is.EqualTo(p.Material))");
+            Assert.That(pin,Is.EqualTo(p.ScriptAccessPin), "Assert.That(pin,Is.EqualTo(p.ScriptAccessPin))");
+            Assert.That(textani,Is.EqualTo(p.TextureAnimation), "Assert.That(textani,Is.EqualTo(p.TextureAnimation))");
+            Assert.That(partsys,Is.EqualTo(p.ParticleSystem), "Assert.That(partsys,Is.EqualTo(p.ParticleSystem))");
+            Assert.That(offset,Is.EqualTo(p.OffsetPosition), "Assert.That(offset,Is.EqualTo(p.OffsetPosition))");
+            Assert.That(velocity,Is.EqualTo(p.Velocity), "Assert.That(velocity,Is.EqualTo(p.Velocity))");
+            Assert.That(angvelo,Is.EqualTo(p.AngularVelocity), "Assert.That(angvelo,Is.EqualTo(p.AngularVelocity))");
+            Assert.That(accel,Is.EqualTo(p.Acceleration), "Assert.That(accel,Is.EqualTo(p.Acceleration))");
+            Assert.That(description,Is.EqualTo(p.Description), "Assert.That(description,Is.EqualTo(p.Description))");
+            Assert.That(color,Is.EqualTo(p.Color), "Assert.That(color,Is.EqualTo(p.Color))");
+            Assert.That(text,Is.EqualTo(p.Text), "Assert.That(text,Is.EqualTo(p.Text))");
+            Assert.That(sitname,Is.EqualTo(p.SitName), "Assert.That(sitname,Is.EqualTo(p.SitName))");
+            Assert.That(touchname,Is.EqualTo(p.TouchName), "Assert.That(touchname,Is.EqualTo(p.TouchName))");
+            Assert.That(clickaction,Is.EqualTo(p.ClickAction), "Assert.That(clickaction,Is.EqualTo(p.ClickAction))");
+            Assert.That(scale,Is.EqualTo(p.Scale), "Assert.That(scale,Is.EqualTo(p.Scale))");
         }
         
         [Test]
@@ -524,12 +524,12 @@ namespace OpenSim.Data.Tests
             for (int i=0;i<30;i++)
             {
                 SceneObjectPart cursop = mydic[parts[i].UUID];
-                Assert.That(cursop.GroupPosition,Is.EqualTo(parts[i].GroupPosition));
-                Assert.That(cursop.RotationOffset,Is.EqualTo(parts[i].RotationOffset));
-                Assert.That(cursop.OffsetPosition,Is.EqualTo(parts[i].OffsetPosition));
-                Assert.That(cursop.Velocity,Is.EqualTo(parts[i].Velocity));
-                Assert.That(cursop.AngularVelocity,Is.EqualTo(parts[i].AngularVelocity));
-                Assert.That(cursop.Acceleration,Is.EqualTo(parts[i].Acceleration));
+                Assert.That(cursop.GroupPosition,Is.EqualTo(parts[i].GroupPosition), "Assert.That(cursop.GroupPosition,Is.EqualTo(parts[i].GroupPosition))");
+                Assert.That(cursop.RotationOffset,Is.EqualTo(parts[i].RotationOffset), "Assert.That(cursop.RotationOffset,Is.EqualTo(parts[i].RotationOffset))");
+                Assert.That(cursop.OffsetPosition,Is.EqualTo(parts[i].OffsetPosition), "Assert.That(cursop.OffsetPosition,Is.EqualTo(parts[i].OffsetPosition))");
+                Assert.That(cursop.Velocity,Is.EqualTo(parts[i].Velocity), "Assert.That(cursop.Velocity,Is.EqualTo(parts[i].Velocity))");
+                Assert.That(cursop.AngularVelocity,Is.EqualTo(parts[i].AngularVelocity), "Assert.That(cursop.AngularVelocity,Is.EqualTo(parts[i].AngularVelocity))");
+                Assert.That(cursop.Acceleration,Is.EqualTo(parts[i].Acceleration), "Assert.That(cursop.Acceleration,Is.EqualTo(parts[i].Acceleration))");
             }
         }
         
@@ -549,7 +549,7 @@ namespace OpenSim.Data.Tests
 
             Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, i, zero), Is.True);
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
-            Assert.That(t.Name, Is.EqualTo(itemname1));
+            Assert.That(t.Name, Is.EqualTo(itemname1), "Assert.That(t.Name, Is.EqualTo(itemname1))");
             
             // TODO: seriously??? this is the way we need to loop to get this?
 
@@ -568,7 +568,7 @@ namespace OpenSim.Data.Tests
             SceneObjectGroup sog = FindSOG("object1", region1);
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
 
-            Assert.That(t.Name, Is.EqualTo(itemname1));
+            Assert.That(t.Name, Is.EqualTo(itemname1), "Assert.That(t.Name, Is.EqualTo(itemname1))");
         }
         
         [Test]
@@ -580,7 +580,7 @@ namespace OpenSim.Data.Tests
             t.Name = "My New Name";
             sog.UpdateInventoryItem(t);
 
-            Assert.That(t.Name, Is.EqualTo("My New Name"));
+            Assert.That(t.Name, Is.EqualTo("My New Name"), "Assert.That(t.Name, Is.EqualTo(\"My New Name\"))");
 
         }
 
@@ -641,28 +641,28 @@ namespace OpenSim.Data.Tests
             Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, i, zero), Is.True);
             TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, id);
             
-            Assert.That(t.Name, Is.EqualTo(name));
-            Assert.That(t.AssetID,Is.EqualTo(assetid));
-            Assert.That(t.BasePermissions,Is.EqualTo(baseperm));
-            Assert.That(t.CreationDate,Is.EqualTo(creationd));
-            Assert.That(t.CreatorID,Is.EqualTo(creator));
-            Assert.That(t.Description,Is.EqualTo(name));
-            Assert.That(t.EveryonePermissions,Is.EqualTo(eoperm));
-            Assert.That(t.Flags,Is.EqualTo(flags));
-            Assert.That(t.GroupID,Is.EqualTo(sog.RootPart.GroupID));
+            Assert.That(t.Name, Is.EqualTo(name), "Assert.That(t.Name, Is.EqualTo(name))");
+            Assert.That(t.AssetID,Is.EqualTo(assetid), "Assert.That(t.AssetID,Is.EqualTo(assetid))");
+            Assert.That(t.BasePermissions,Is.EqualTo(baseperm), "Assert.That(t.BasePermissions,Is.EqualTo(baseperm))");
+            Assert.That(t.CreationDate,Is.EqualTo(creationd), "Assert.That(t.CreationDate,Is.EqualTo(creationd))");
+            Assert.That(t.CreatorID,Is.EqualTo(creator), "Assert.That(t.CreatorID,Is.EqualTo(creator))");
+            Assert.That(t.Description,Is.EqualTo(name), "Assert.That(t.Description,Is.EqualTo(name))");
+            Assert.That(t.EveryonePermissions,Is.EqualTo(eoperm), "Assert.That(t.EveryonePermissions,Is.EqualTo(eoperm))");
+            Assert.That(t.Flags,Is.EqualTo(flags), "Assert.That(t.Flags,Is.EqualTo(flags))");
+            Assert.That(t.GroupID,Is.EqualTo(sog.RootPart.GroupID), "Assert.That(t.GroupID,Is.EqualTo(sog.RootPart.GroupID))");
             // Where is this group permissions??
-            // Assert.That(t.GroupPermissions,Is.EqualTo());
-            Assert.That(t.Type,Is.EqualTo(assettype));
-            Assert.That(t.InvType, Is.EqualTo(invtype));
-            Assert.That(t.ItemID, Is.EqualTo(id));
-            Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID));
-            Assert.That(t.NextPermissions, Is.EqualTo(nextperm));
+            // Assert.That(t.GroupPermissions,Is.EqualTo(), "Assert.That(t.GroupPermissions,Is.EqualTo())");
+            Assert.That(t.Type,Is.EqualTo(assettype), "Assert.That(t.Type,Is.EqualTo(assettype))");
+            Assert.That(t.InvType, Is.EqualTo(invtype), "Assert.That(t.InvType, Is.EqualTo(invtype))");
+            Assert.That(t.ItemID, Is.EqualTo(id), "Assert.That(t.ItemID, Is.EqualTo(id))");
+            Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID), "Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID))");
+            Assert.That(t.NextPermissions, Is.EqualTo(nextperm), "Assert.That(t.NextPermissions, Is.EqualTo(nextperm))");
             // Ownership changes when you drop an object into an object
             // owned by someone else
-            Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID));
-            Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8));
-            Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID));
-            Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID));
+            Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID), "Assert.That(t.OwnerID,Is.EqualTo(sog.RootPart.OwnerID))");
+            Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8), "Assert.That(t.CurrentPermissions, Is.EqualTo(curperm | 8))");
+            Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID), "Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID))");
+            Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID), "Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID))");
         }
         
         [Test]
@@ -687,11 +687,11 @@ namespace OpenSim.Data.Tests
             Assert.That(sog.AddInventoryItem(null, sog.RootPart.LocalId, ib4, zero), Is.True);
             
             TaskInventoryItem t1 = sog.GetInventoryItem(sog.RootPart.LocalId, i1);
-            Assert.That(t1.Name, Is.EqualTo(ib1.Name));
+            Assert.That(t1.Name, Is.EqualTo(ib1.Name), "Assert.That(t1.Name, Is.EqualTo(ib1.Name))");
             TaskInventoryItem t2 = sog.GetInventoryItem(sog.RootPart.LocalId, i2);
-            Assert.That(t2.Name, Is.EqualTo(ib2.Name));
+            Assert.That(t2.Name, Is.EqualTo(ib2.Name), "Assert.That(t2.Name, Is.EqualTo(ib2.Name))");
             TaskInventoryItem t3 = sog.GetInventoryItem(sog.RootPart.LocalId, i3);
-            Assert.That(t3.Name, Is.EqualTo(ib3.Name));
+            Assert.That(t3.Name, Is.EqualTo(ib3.Name), "Assert.That(t3.Name, Is.EqualTo(ib3.Name))");
             TaskInventoryItem t4 = sog.GetInventoryItem(sog.RootPart.LocalId, i4);
             Assert.That(t4, Is.Null);
         }
@@ -709,10 +709,10 @@ namespace OpenSim.Data.Tests
         public void T100_DefaultRegionInfo()
         {
             RegionSettings r1 = db.LoadRegionSettings(region1);
-            Assert.That(r1.RegionUUID, Is.EqualTo(region1));
+            Assert.That(r1.RegionUUID, Is.EqualTo(region1), "Assert.That(r1.RegionUUID, Is.EqualTo(region1))");
 
             RegionSettings r2 = db.LoadRegionSettings(region2);
-            Assert.That(r2.RegionUUID, Is.EqualTo(region2));
+            Assert.That(r2.RegionUUID, Is.EqualTo(region2), "Assert.That(r2.RegionUUID, Is.EqualTo(region2))");
         }
 
         [Test]
@@ -781,7 +781,7 @@ namespace OpenSim.Data.Tests
             db.StoreRegionSettings(r1);
             
             RegionSettings r1a = db.LoadRegionSettings(region1);
-            Assert.That(r1a.RegionUUID, Is.EqualTo(region1));
+            Assert.That(r1a.RegionUUID, Is.EqualTo(region1), "Assert.That(r1a.RegionUUID, Is.EqualTo(region1))");
             Assert.That(r1a.BlockTerraform,Is.True);
             Assert.That(r1a.BlockFly,Is.True);
             Assert.That(r1a.AllowDamage,Is.True);
@@ -789,34 +789,34 @@ namespace OpenSim.Data.Tests
             Assert.That(r1a.AllowLandResell,Is.False);
             Assert.That(r1a.AllowLandJoinDivide,Is.False);
             Assert.That(r1a.BlockShowInSearch,Is.True);
-            Assert.That(r1a.AgentLimit,Is.EqualTo(agentlimit));
-            Assert.That(r1a.ObjectBonus,Is.EqualTo(objectbonus));
-            Assert.That(r1a.Maturity,Is.EqualTo(maturity));
+            Assert.That(r1a.AgentLimit,Is.EqualTo(agentlimit), "Assert.That(r1a.AgentLimit,Is.EqualTo(agentlimit))");
+            Assert.That(r1a.ObjectBonus,Is.EqualTo(objectbonus), "Assert.That(r1a.ObjectBonus,Is.EqualTo(objectbonus))");
+            Assert.That(r1a.Maturity,Is.EqualTo(maturity), "Assert.That(r1a.Maturity,Is.EqualTo(maturity))");
             Assert.That(r1a.DisableScripts,Is.True);
             Assert.That(r1a.DisableCollisions,Is.True);
             Assert.That(r1a.DisablePhysics,Is.True);
-            Assert.That(r1a.TerrainTexture1,Is.EqualTo(tertex1));
-            Assert.That(r1a.TerrainTexture2,Is.EqualTo(tertex2));
-            Assert.That(r1a.TerrainTexture3,Is.EqualTo(tertex3));
-            Assert.That(r1a.TerrainTexture4,Is.EqualTo(tertex4));
-            Assert.That(r1a.Elevation1NW,Is.EqualTo(elev1nw));
-            Assert.That(r1a.Elevation2NW,Is.EqualTo(elev2nw));
-            Assert.That(r1a.Elevation1NE,Is.EqualTo(elev1ne));
-            Assert.That(r1a.Elevation2NE,Is.EqualTo(elev2ne));
-            Assert.That(r1a.Elevation1SE,Is.EqualTo(elev1se));
-            Assert.That(r1a.Elevation2SE,Is.EqualTo(elev2se));
-            Assert.That(r1a.Elevation1SW,Is.EqualTo(elev1sw));
-            Assert.That(r1a.Elevation2SW,Is.EqualTo(elev2sw));
-            Assert.That(r1a.WaterHeight,Is.EqualTo(waterh));
-            Assert.That(r1a.TerrainRaiseLimit,Is.EqualTo(terrainraise));
-            Assert.That(r1a.TerrainLowerLimit,Is.EqualTo(terrainlower));
+            Assert.That(r1a.TerrainTexture1,Is.EqualTo(tertex1), "Assert.That(r1a.TerrainTexture1,Is.EqualTo(tertex1))");
+            Assert.That(r1a.TerrainTexture2,Is.EqualTo(tertex2), "Assert.That(r1a.TerrainTexture2,Is.EqualTo(tertex2))");
+            Assert.That(r1a.TerrainTexture3,Is.EqualTo(tertex3), "Assert.That(r1a.TerrainTexture3,Is.EqualTo(tertex3))");
+            Assert.That(r1a.TerrainTexture4,Is.EqualTo(tertex4), "Assert.That(r1a.TerrainTexture4,Is.EqualTo(tertex4))");
+            Assert.That(r1a.Elevation1NW,Is.EqualTo(elev1nw), "Assert.That(r1a.Elevation1NW,Is.EqualTo(elev1nw))");
+            Assert.That(r1a.Elevation2NW,Is.EqualTo(elev2nw), "Assert.That(r1a.Elevation2NW,Is.EqualTo(elev2nw))");
+            Assert.That(r1a.Elevation1NE,Is.EqualTo(elev1ne), "Assert.That(r1a.Elevation1NE,Is.EqualTo(elev1ne))");
+            Assert.That(r1a.Elevation2NE,Is.EqualTo(elev2ne), "Assert.That(r1a.Elevation2NE,Is.EqualTo(elev2ne))");
+            Assert.That(r1a.Elevation1SE,Is.EqualTo(elev1se), "Assert.That(r1a.Elevation1SE,Is.EqualTo(elev1se))");
+            Assert.That(r1a.Elevation2SE,Is.EqualTo(elev2se), "Assert.That(r1a.Elevation2SE,Is.EqualTo(elev2se))");
+            Assert.That(r1a.Elevation1SW,Is.EqualTo(elev1sw), "Assert.That(r1a.Elevation1SW,Is.EqualTo(elev1sw))");
+            Assert.That(r1a.Elevation2SW,Is.EqualTo(elev2sw), "Assert.That(r1a.Elevation2SW,Is.EqualTo(elev2sw))");
+            Assert.That(r1a.WaterHeight,Is.EqualTo(waterh), "Assert.That(r1a.WaterHeight,Is.EqualTo(waterh))");
+            Assert.That(r1a.TerrainRaiseLimit,Is.EqualTo(terrainraise), "Assert.That(r1a.TerrainRaiseLimit,Is.EqualTo(terrainraise))");
+            Assert.That(r1a.TerrainLowerLimit,Is.EqualTo(terrainlower), "Assert.That(r1a.TerrainLowerLimit,Is.EqualTo(terrainlower))");
             Assert.That(r1a.UseEstateSun,Is.False);
             Assert.That(r1a.Sandbox,Is.True);
-            Assert.That(r1a.SunVector,Is.EqualTo(sunvector));
-            //Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid));
+            Assert.That(r1a.SunVector,Is.EqualTo(sunvector), "Assert.That(r1a.SunVector,Is.EqualTo(sunvector))");
+            //Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid), "Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid))");
             Assert.That(r1a.FixedSun,Is.True);
-            Assert.That(r1a.SunPosition, Is.EqualTo(sunpos));
-            Assert.That(r1a.Covenant, Is.EqualTo(cov));
+            Assert.That(r1a.SunPosition, Is.EqualTo(sunpos), "Assert.That(r1a.SunPosition, Is.EqualTo(sunpos))");
+            Assert.That(r1a.Covenant, Is.EqualTo(cov), "Assert.That(r1a.Covenant, Is.EqualTo(cov))");
             
         }
 
@@ -866,10 +866,10 @@ namespace OpenSim.Data.Tests
         [Test]
         public void T400_EmptyLand()
         {
-            Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0));
-            Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0));
-            Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0));
-            Assert.That(db.LoadLandObjects(UUID.Random()).Count, Is.EqualTo(0));
+            Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0))");
+            Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0))");
+            Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0))");
+            Assert.That(db.LoadLandObjects(UUID.Random()).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(UUID.Random()).Count, Is.EqualTo(0))");
         }
 
         // TODO: we should have real land tests, but Land is so
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index 82ff08b..2a5e567 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -139,9 +139,9 @@ namespace OpenSim.Data.Tests
             UserProfileData u1a = db.GetUserByUUID(user1);
             UserProfileData u2a = db.GetUserByUUID(user2);
             UserProfileData u3a = db.GetUserByUUID(user3);
-            Assert.That(user1,Is.EqualTo(u1a.ID));
-            Assert.That(user2,Is.EqualTo(u2a.ID));
-            Assert.That(user3,Is.EqualTo(u3a.ID));
+            Assert.That(user1,Is.EqualTo(u1a.ID), "Assert.That(user1,Is.EqualTo(u1a.ID))");
+            Assert.That(user2,Is.EqualTo(u2a.ID), "Assert.That(user2,Is.EqualTo(u2a.ID))");
+            Assert.That(user3,Is.EqualTo(u3a.ID), "Assert.That(user3,Is.EqualTo(u3a.ID))");
 
             // and one email test
             Assert.That(u3.Email, Is.Null);
@@ -153,30 +153,30 @@ namespace OpenSim.Data.Tests
             UserProfileData u1 = db.GetUserByName(fname1,lname1);
             UserProfileData u2 = db.GetUserByName(fname2,lname2);
             UserProfileData u3 = db.GetUserByName(fname3,lname3);
-            Assert.That(user1,Is.EqualTo(u1.ID));
-            Assert.That(user2,Is.EqualTo(u2.ID));
-            Assert.That(user3,Is.EqualTo(u3.ID));
+            Assert.That(user1,Is.EqualTo(u1.ID), "Assert.That(user1,Is.EqualTo(u1.ID))");
+            Assert.That(user2,Is.EqualTo(u2.ID), "Assert.That(user2,Is.EqualTo(u2.ID))");
+            Assert.That(user3,Is.EqualTo(u3.ID), "Assert.That(user3,Is.EqualTo(u3.ID))");
         }
 
         [Test]
         public void T012_UpdateUserProfile()
         {
             UserProfileData u1 = db.GetUserByUUID(user1);
-            Assert.That(fname1,Is.EqualTo(u1.FirstName));
+            Assert.That(fname1,Is.EqualTo(u1.FirstName), "Assert.That(fname1,Is.EqualTo(u1.FirstName))");
             u1.FirstName = "Ugly";
             
             db.UpdateUserProfile(u1);
-            Assert.That("Ugly",Is.EqualTo(u1.FirstName));                   
+            Assert.That("Ugly",Is.EqualTo(u1.FirstName), "Assert.That(\"Ugly\",Is.EqualTo(u1.FirstName))");                   
         }
 
         [Test]
         public void T013_StoreUserWebKey()
         {
             UserProfileData u1 = db.GetUserByUUID(user1);
-            Assert.That(u1.WebLoginKey,Is.EqualTo(zero));
+            Assert.That(u1.WebLoginKey,Is.EqualTo(zero), "Assert.That(u1.WebLoginKey,Is.EqualTo(zero))");
             db.StoreWebLoginKey(user1, webkey);
             u1 = db.GetUserByUUID(user1);
-            Assert.That(u1.WebLoginKey,Is.EqualTo(webkey));
+            Assert.That(u1.WebLoginKey,Is.EqualTo(webkey), "Assert.That(u1.WebLoginKey,Is.EqualTo(webkey))");
         }
         
         [Test]
@@ -258,36 +258,36 @@ namespace OpenSim.Data.Tests
             db.AddNewUserProfile(u);
             UserProfileData u1a = db.GetUserByUUID(id);
             Assert.That(u1a,Is.Not.Null);
-            Assert.That(id,Is.EqualTo(u1a.ID));
-            Assert.That(homeregion,Is.EqualTo(u1a.HomeRegionID));
-            Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey));
-            Assert.That(fname,Is.EqualTo(u1a.FirstName));
-            Assert.That(lname,Is.EqualTo(u1a.SurName));
-            Assert.That(email,Is.EqualTo(u1a.Email));
-            Assert.That(passhash,Is.EqualTo(u1a.PasswordHash));
-            Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt));
-            Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX));
-            Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY));
-            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion));
-            Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation));
-            Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt));
-            Assert.That(created,Is.EqualTo(u1a.Created));
-            Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin));
+            Assert.That(id,Is.EqualTo(u1a.ID), "Assert.That(id,Is.EqualTo(u1a.ID))");
+            Assert.That(homeregion,Is.EqualTo(u1a.HomeRegionID), "Assert.That(homeregion,Is.EqualTo(u1a.HomeRegionID))");
+            Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey), "Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey))");
+            Assert.That(fname,Is.EqualTo(u1a.FirstName), "Assert.That(fname,Is.EqualTo(u1a.FirstName))");
+            Assert.That(lname,Is.EqualTo(u1a.SurName), "Assert.That(lname,Is.EqualTo(u1a.SurName))");
+            Assert.That(email,Is.EqualTo(u1a.Email), "Assert.That(email,Is.EqualTo(u1a.Email))");
+            Assert.That(passhash,Is.EqualTo(u1a.PasswordHash), "Assert.That(passhash,Is.EqualTo(u1a.PasswordHash))");
+            Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt), "Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt))");
+            Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX), "Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX))");
+            Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY), "Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY))");
+            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
+            Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation), "Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation))");
+            Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt), "Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt))");
+            Assert.That(created,Is.EqualTo(u1a.Created), "Assert.That(created,Is.EqualTo(u1a.Created))");
+            Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin), "Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin))");
             // RootInventoryFolderID is not tested because it is saved in SQLite,
             // but not in MySQL
-            Assert.That(userinvuri,Is.EqualTo(u1a.UserInventoryURI));
-            Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI));
-            Assert.That(candomask,Is.EqualTo(u1a.CanDoMask));
-            Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask));
-            Assert.That(abouttext,Is.EqualTo(u1a.AboutText));
-            Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText));
-            Assert.That(image,Is.EqualTo(u1a.Image));
-            Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage));
+            Assert.That(userinvuri,Is.EqualTo(u1a.UserInventoryURI), "Assert.That(userinvuri,Is.EqualTo(u1a.UserInventoryURI))");
+            Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI), "Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI))");
+            Assert.That(candomask,Is.EqualTo(u1a.CanDoMask), "Assert.That(candomask,Is.EqualTo(u1a.CanDoMask))");
+            Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask), "Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask))");
+            Assert.That(abouttext,Is.EqualTo(u1a.AboutText), "Assert.That(abouttext,Is.EqualTo(u1a.AboutText))");
+            Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText), "Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText))");
+            Assert.That(image,Is.EqualTo(u1a.Image), "Assert.That(image,Is.EqualTo(u1a.Image))");
+            Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage), "Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage))");
             Assert.That(u1a.CurrentAgent,Is.Null);
-            Assert.That(userflags,Is.EqualTo(u1a.UserFlags));
-            Assert.That(godlevel,Is.EqualTo(u1a.GodLevel));
-            Assert.That(customtype,Is.EqualTo(u1a.CustomType));
-            Assert.That(partner,Is.EqualTo(u1a.Partner));
+            Assert.That(userflags,Is.EqualTo(u1a.UserFlags), "Assert.That(userflags,Is.EqualTo(u1a.UserFlags))");
+            Assert.That(godlevel,Is.EqualTo(u1a.GodLevel), "Assert.That(godlevel,Is.EqualTo(u1a.GodLevel))");
+            Assert.That(customtype,Is.EqualTo(u1a.CustomType), "Assert.That(customtype,Is.EqualTo(u1a.CustomType))");
+            Assert.That(partner,Is.EqualTo(u1a.Partner), "Assert.That(partner,Is.EqualTo(u1a.Partner))");
         }
 
         [Test]
@@ -357,36 +357,36 @@ namespace OpenSim.Data.Tests
             db.UpdateUserProfile(u);
             UserProfileData u1a = db.GetUserByUUID(id);
             Assert.That(u1a,Is.Not.Null);
-            Assert.That(id,Is.EqualTo(u1a.ID));
-            Assert.That(homeregionid,Is.EqualTo(u1a.HomeRegionID));
-            Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey));
-            Assert.That(fname,Is.EqualTo(u1a.FirstName));
-            Assert.That(lname,Is.EqualTo(u1a.SurName));
-            Assert.That(email,Is.EqualTo(u1a.Email));
-            Assert.That(passhash,Is.EqualTo(u1a.PasswordHash));
-            Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt));
-            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion));            
-            Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX));
-            Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY));
-            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion));
-            Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation));
-            Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt));
-            Assert.That(created,Is.EqualTo(u1a.Created));
-            Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin));
+            Assert.That(id,Is.EqualTo(u1a.ID), "Assert.That(id,Is.EqualTo(u1a.ID))");
+            Assert.That(homeregionid,Is.EqualTo(u1a.HomeRegionID), "Assert.That(homeregionid,Is.EqualTo(u1a.HomeRegionID))");
+            Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey), "Assert.That(webloginkey,Is.EqualTo(u1a.WebLoginKey))");
+            Assert.That(fname,Is.EqualTo(u1a.FirstName), "Assert.That(fname,Is.EqualTo(u1a.FirstName))");
+            Assert.That(lname,Is.EqualTo(u1a.SurName), "Assert.That(lname,Is.EqualTo(u1a.SurName))");
+            Assert.That(email,Is.EqualTo(u1a.Email), "Assert.That(email,Is.EqualTo(u1a.Email))");
+            Assert.That(passhash,Is.EqualTo(u1a.PasswordHash), "Assert.That(passhash,Is.EqualTo(u1a.PasswordHash))");
+            Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt), "Assert.That(passsalt,Is.EqualTo(u1a.PasswordSalt))");
+            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");            
+            Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX), "Assert.That(homeregx,Is.EqualTo(u1a.HomeRegionX))");
+            Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY), "Assert.That(homeregy,Is.EqualTo(u1a.HomeRegionY))");
+            Assert.That(homereg,Is.EqualTo(u1a.HomeRegion), "Assert.That(homereg,Is.EqualTo(u1a.HomeRegion))");
+            Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation), "Assert.That(homeloc,Is.EqualTo(u1a.HomeLocation))");
+            Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt), "Assert.That(homelookat,Is.EqualTo(u1a.HomeLookAt))");
+            Assert.That(created,Is.EqualTo(u1a.Created), "Assert.That(created,Is.EqualTo(u1a.Created))");
+            Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin), "Assert.That(lastlogin,Is.EqualTo(u1a.LastLogin))");
             // RootInventoryFolderID is not tested because it is saved in SQLite,
             // but not in MySQL
-            Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI));
-            Assert.That(candomask,Is.EqualTo(u1a.CanDoMask));
-            Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask));
-            Assert.That(abouttext,Is.EqualTo(u1a.AboutText));
-            Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText));
-            Assert.That(image,Is.EqualTo(u1a.Image));
-            Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage));
+            Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI), "Assert.That(userasseturi,Is.EqualTo(u1a.UserAssetURI))");
+            Assert.That(candomask,Is.EqualTo(u1a.CanDoMask), "Assert.That(candomask,Is.EqualTo(u1a.CanDoMask))");
+            Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask), "Assert.That(wantdomask,Is.EqualTo(u1a.WantDoMask))");
+            Assert.That(abouttext,Is.EqualTo(u1a.AboutText), "Assert.That(abouttext,Is.EqualTo(u1a.AboutText))");
+            Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText), "Assert.That(flabouttext,Is.EqualTo(u1a.FirstLifeAboutText))");
+            Assert.That(image,Is.EqualTo(u1a.Image), "Assert.That(image,Is.EqualTo(u1a.Image))");
+            Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage), "Assert.That(firstimage,Is.EqualTo(u1a.FirstLifeImage))");
             Assert.That(u1a.CurrentAgent,Is.Null);
-            Assert.That(userflags,Is.EqualTo(u1a.UserFlags));
-            Assert.That(godlevel,Is.EqualTo(u1a.GodLevel));
-            Assert.That(customtype,Is.EqualTo(u1a.CustomType));
-            Assert.That(partner,Is.EqualTo(u1a.Partner));
+            Assert.That(userflags,Is.EqualTo(u1a.UserFlags), "Assert.That(userflags,Is.EqualTo(u1a.UserFlags))");
+            Assert.That(godlevel,Is.EqualTo(u1a.GodLevel), "Assert.That(godlevel,Is.EqualTo(u1a.GodLevel))");
+            Assert.That(customtype,Is.EqualTo(u1a.CustomType), "Assert.That(customtype,Is.EqualTo(u1a.CustomType))");
+            Assert.That(partner,Is.EqualTo(u1a.Partner), "Assert.That(partner,Is.EqualTo(u1a.Partner))");
         }
         
         [Test]
@@ -401,12 +401,12 @@ namespace OpenSim.Data.Tests
             UserAgentData a1a = db.GetAgentByUUID(user1);
             UserAgentData a2a = db.GetAgentByUUID(user2);
             UserAgentData a3a = db.GetAgentByUUID(user3);
-            Assert.That(agent1,Is.EqualTo(a1a.SessionID));
-            Assert.That(user1,Is.EqualTo(a1a.ProfileID));
-            Assert.That(agent2,Is.EqualTo(a2a.SessionID));
-            Assert.That(user2,Is.EqualTo(a2a.ProfileID));
-            Assert.That(agent3,Is.EqualTo(a3a.SessionID));
-            Assert.That(user3,Is.EqualTo(a3a.ProfileID));
+            Assert.That(agent1,Is.EqualTo(a1a.SessionID), "Assert.That(agent1,Is.EqualTo(a1a.SessionID))");
+            Assert.That(user1,Is.EqualTo(a1a.ProfileID), "Assert.That(user1,Is.EqualTo(a1a.ProfileID))");
+            Assert.That(agent2,Is.EqualTo(a2a.SessionID), "Assert.That(agent2,Is.EqualTo(a2a.SessionID))");
+            Assert.That(user2,Is.EqualTo(a2a.ProfileID), "Assert.That(user2,Is.EqualTo(a2a.ProfileID))");
+            Assert.That(agent3,Is.EqualTo(a3a.SessionID), "Assert.That(agent3,Is.EqualTo(a3a.SessionID))");
+            Assert.That(user3,Is.EqualTo(a3a.ProfileID), "Assert.That(user3,Is.EqualTo(a3a.ProfileID))");
         }
         
         [Test]
@@ -415,8 +415,8 @@ namespace OpenSim.Data.Tests
             String name3 = fname3 + " " + lname3;
             UserAgentData a2 = db.GetAgentByName(fname2,lname2);
             UserAgentData a3 = db.GetAgentByName(name3);
-            Assert.That(user2,Is.EqualTo(a2.ProfileID));
-            Assert.That(user3,Is.EqualTo(a3.ProfileID));                    
+            Assert.That(user2,Is.EqualTo(a2.ProfileID), "Assert.That(user2,Is.EqualTo(a2.ProfileID))");
+            Assert.That(user3,Is.EqualTo(a3.ProfileID), "Assert.That(user3,Is.EqualTo(a3.ProfileID))");                    
         }
         
         [Test]
@@ -466,18 +466,18 @@ namespace OpenSim.Data.Tests
             db.AddNewUserAgent(a);
 
             UserAgentData a1 = db.GetAgentByUUID(user4);
-            Assert.That(user,Is.EqualTo(a1.ProfileID));
-            Assert.That(agent,Is.EqualTo(a1.SessionID));
-            Assert.That(secureagent,Is.EqualTo(a1.SecureSessionID));
-            Assert.That(agentip,Is.EqualTo(a1.AgentIP));
-            Assert.That(agentport,Is.EqualTo(a1.AgentPort));
-            Assert.That(agentonline,Is.EqualTo(a1.AgentOnline));
-            Assert.That(logintime,Is.EqualTo(a1.LoginTime));
-            Assert.That(logouttime,Is.EqualTo(a1.LogoutTime));
-            Assert.That(regionid,Is.EqualTo(a1.Region));
-            Assert.That(regionhandle,Is.EqualTo(a1.Handle));
-            Assert.That(currentpos,Is.EqualTo(a1.Position));
-            Assert.That(currentlookat,Is.EqualTo(a1.LookAt));
+            Assert.That(user,Is.EqualTo(a1.ProfileID), "Assert.That(user,Is.EqualTo(a1.ProfileID))");
+            Assert.That(agent,Is.EqualTo(a1.SessionID), "Assert.That(agent,Is.EqualTo(a1.SessionID))");
+            Assert.That(secureagent,Is.EqualTo(a1.SecureSessionID), "Assert.That(secureagent,Is.EqualTo(a1.SecureSessionID))");
+            Assert.That(agentip,Is.EqualTo(a1.AgentIP), "Assert.That(agentip,Is.EqualTo(a1.AgentIP))");
+            Assert.That(agentport,Is.EqualTo(a1.AgentPort), "Assert.That(agentport,Is.EqualTo(a1.AgentPort))");
+            Assert.That(agentonline,Is.EqualTo(a1.AgentOnline), "Assert.That(agentonline,Is.EqualTo(a1.AgentOnline))");
+            Assert.That(logintime,Is.EqualTo(a1.LoginTime), "Assert.That(logintime,Is.EqualTo(a1.LoginTime))");
+            Assert.That(logouttime,Is.EqualTo(a1.LogoutTime), "Assert.That(logouttime,Is.EqualTo(a1.LogoutTime))");
+            Assert.That(regionid,Is.EqualTo(a1.Region), "Assert.That(regionid,Is.EqualTo(a1.Region))");
+            Assert.That(regionhandle,Is.EqualTo(a1.Handle), "Assert.That(regionhandle,Is.EqualTo(a1.Handle))");
+            Assert.That(currentpos,Is.EqualTo(a1.Position), "Assert.That(currentpos,Is.EqualTo(a1.Position))");
+            Assert.That(currentlookat,Is.EqualTo(a1.LookAt), "Assert.That(currentlookat,Is.EqualTo(a1.LookAt))");
         }
 
         [Test]
@@ -491,19 +491,19 @@ namespace OpenSim.Data.Tests
             db.AddNewUserFriend(user1,user3, 2);
             db.AddNewUserFriend(user1,user2, 4); 
             List<FriendListItem> fl1 = db.GetUserFriendList(user1);
-            Assert.That(fl1.Count,Is.EqualTo(2));                   
+            Assert.That(fl1.Count,Is.EqualTo(2), "Assert.That(fl1.Count,Is.EqualTo(2))");                   
             perms.Add(user2,1);
             perms.Add(user3,2);
             for (int i = 0; i < fl1.Count; i++)
             {   
-                Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner));
+                Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner), "Assert.That(user1,Is.EqualTo(fl1[i].FriendListOwner))");
                 friends.Add(fl1[i].Friend,1);
                 temp = perms[fl1[i].Friend];
-                Assert.That(temp,Is.EqualTo(fl1[i].FriendPerms));
+                Assert.That(temp,Is.EqualTo(fl1[i].FriendPerms), "Assert.That(temp,Is.EqualTo(fl1[i].FriendPerms))");
             }
             tempu1 = friends[user2];
             tempu2 = friends[user3];
-            Assert.That(1,Is.EqualTo(tempu1) & Is.EqualTo(tempu2));
+            Assert.That(1,Is.EqualTo(tempu1) & Is.EqualTo(tempu2), "Assert.That(1,Is.EqualTo(tempu1) & Is.EqualTo(tempu2))");
         }
         
         [Test]
@@ -513,15 +513,15 @@ namespace OpenSim.Data.Tests
             List<FriendListItem> fl1 = db.GetUserFriendList(user1);
             List<FriendListItem> fl2 = db.GetUserFriendList(user2);
 
-            Assert.That(fl1.Count,Is.EqualTo(2));
-            Assert.That(fl1[0].Friend,Is.EqualTo(user2) | Is.EqualTo(user3));
-            Assert.That(fl2[0].Friend,Is.EqualTo(user1));
+            Assert.That(fl1.Count,Is.EqualTo(2), "Assert.That(fl1.Count,Is.EqualTo(2))");
+            Assert.That(fl1[0].Friend,Is.EqualTo(user2) | Is.EqualTo(user3), "Assert.That(fl1[0].Friend,Is.EqualTo(user2) | Is.EqualTo(user3))");
+            Assert.That(fl2[0].Friend,Is.EqualTo(user1), "Assert.That(fl2[0].Friend,Is.EqualTo(user1))");
             db.RemoveUserFriend(user2, user1);
             
             fl1 = db.GetUserFriendList(user1);
             fl2 = db.GetUserFriendList(user2);
-            Assert.That(fl1.Count,Is.EqualTo(1));
-            Assert.That(fl1[0].Friend, Is.EqualTo(user3));
+            Assert.That(fl1.Count,Is.EqualTo(1), "Assert.That(fl1.Count,Is.EqualTo(1))");
+            Assert.That(fl1[0].Friend, Is.EqualTo(user3), "Assert.That(fl1[0].Friend, Is.EqualTo(user3))");
             Assert.That(fl2, Is.Empty);
         }
         
@@ -530,11 +530,11 @@ namespace OpenSim.Data.Tests
         // user1 has 1 friend, user3, who has permission 2 in T030.
         {
             List<FriendListItem> fl1 = db.GetUserFriendList(user1);
-            Assert.That(fl1[0].FriendPerms,Is.EqualTo(2));
+            Assert.That(fl1[0].FriendPerms,Is.EqualTo(2), "Assert.That(fl1[0].FriendPerms,Is.EqualTo(2))");
             db.UpdateUserFriendPerms(user1, user3, 4);
             
             fl1 = db.GetUserFriendList(user1);
-            Assert.That(fl1[0].FriendPerms,Is.EqualTo(4));                  
+            Assert.That(fl1[0].FriendPerms,Is.EqualTo(4), "Assert.That(fl1[0].FriendPerms,Is.EqualTo(4))");                  
         }
         
         [Test]
@@ -544,7 +544,7 @@ namespace OpenSim.Data.Tests
             appear.Owner = user1;
             db.UpdateUserAppearance(user1, appear);
             AvatarAppearance user1app = db.GetUserAppearance(user1);
-            Assert.That(user1,Is.EqualTo(user1app.Owner));
+            Assert.That(user1,Is.EqualTo(user1app.Owner), "Assert.That(user1,Is.EqualTo(user1app.Owner))");
         }
         
         [Test]
@@ -619,37 +619,37 @@ namespace OpenSim.Data.Tests
             db.UpdateUserAppearance(owner, appear);
             AvatarAppearance app = db.GetUserAppearance(owner);
 
-            Assert.That(owner,Is.EqualTo(app.Owner));
-            Assert.That(serial,Is.EqualTo(app.Serial));
-            Assert.That(visualp,Is.EqualTo(app.VisualParams));
-            Assert.That(bodyitem,Is.EqualTo(app.BodyItem));
-            Assert.That(bodyasset,Is.EqualTo(app.BodyAsset));
-            Assert.That(skinitem,Is.EqualTo(app.SkinItem));
-            Assert.That(skinasset,Is.EqualTo(app.SkinAsset));
-            Assert.That(hairitem,Is.EqualTo(app.HairItem));
-            Assert.That(hairasset,Is.EqualTo(app.HairAsset));
-            Assert.That(eyesitem,Is.EqualTo(app.EyesItem));
-            Assert.That(eyesasset,Is.EqualTo(app.EyesAsset));
-            Assert.That(shirtitem,Is.EqualTo(app.ShirtItem));
-            Assert.That(shirtasset,Is.EqualTo(app.ShirtAsset));
-            Assert.That(pantsitem,Is.EqualTo(app.PantsItem));
-            Assert.That(pantsasset,Is.EqualTo(app.PantsAsset));
-            Assert.That(shoesitem,Is.EqualTo(app.ShoesItem));
-            Assert.That(shoesasset,Is.EqualTo(app.ShoesAsset));
-            Assert.That(socksitem,Is.EqualTo(app.SocksItem));
-            Assert.That(socksasset,Is.EqualTo(app.SocksAsset));
-            Assert.That(jacketitem,Is.EqualTo(app.JacketItem));
-            Assert.That(jacketasset,Is.EqualTo(app.JacketAsset));
-            Assert.That(glovesitem,Is.EqualTo(app.GlovesItem));
-            Assert.That(glovesasset,Is.EqualTo(app.GlovesAsset));
-            Assert.That(ushirtitem,Is.EqualTo(app.UnderShirtItem));
-            Assert.That(ushirtasset,Is.EqualTo(app.UnderShirtAsset));
-            Assert.That(upantsitem,Is.EqualTo(app.UnderPantsItem));
-            Assert.That(upantsasset,Is.EqualTo(app.UnderPantsAsset));
-            Assert.That(skirtitem,Is.EqualTo(app.SkirtItem));
-            Assert.That(skirtasset,Is.EqualTo(app.SkirtAsset));
-            Assert.That(texture.ToString(),Is.EqualTo(app.Texture.ToString()));
-            Assert.That(avatarheight,Is.EqualTo(app.AvatarHeight));
+            Assert.That(owner,Is.EqualTo(app.Owner), "Assert.That(owner,Is.EqualTo(app.Owner))");
+            Assert.That(serial,Is.EqualTo(app.Serial), "Assert.That(serial,Is.EqualTo(app.Serial))");
+            Assert.That(visualp,Is.EqualTo(app.VisualParams), "Assert.That(visualp,Is.EqualTo(app.VisualParams))");
+            Assert.That(bodyitem,Is.EqualTo(app.BodyItem), "Assert.That(bodyitem,Is.EqualTo(app.BodyItem))");
+            Assert.That(bodyasset,Is.EqualTo(app.BodyAsset), "Assert.That(bodyasset,Is.EqualTo(app.BodyAsset))");
+            Assert.That(skinitem,Is.EqualTo(app.SkinItem), "Assert.That(skinitem,Is.EqualTo(app.SkinItem))");
+            Assert.That(skinasset,Is.EqualTo(app.SkinAsset), "Assert.That(skinasset,Is.EqualTo(app.SkinAsset))");
+            Assert.That(hairitem,Is.EqualTo(app.HairItem), "Assert.That(hairitem,Is.EqualTo(app.HairItem))");
+            Assert.That(hairasset,Is.EqualTo(app.HairAsset), "Assert.That(hairasset,Is.EqualTo(app.HairAsset))");
+            Assert.That(eyesitem,Is.EqualTo(app.EyesItem), "Assert.That(eyesitem,Is.EqualTo(app.EyesItem))");
+            Assert.That(eyesasset,Is.EqualTo(app.EyesAsset), "Assert.That(eyesasset,Is.EqualTo(app.EyesAsset))");
+            Assert.That(shirtitem,Is.EqualTo(app.ShirtItem), "Assert.That(shirtitem,Is.EqualTo(app.ShirtItem))");
+            Assert.That(shirtasset,Is.EqualTo(app.ShirtAsset), "Assert.That(shirtasset,Is.EqualTo(app.ShirtAsset))");
+            Assert.That(pantsitem,Is.EqualTo(app.PantsItem), "Assert.That(pantsitem,Is.EqualTo(app.PantsItem))");
+            Assert.That(pantsasset,Is.EqualTo(app.PantsAsset), "Assert.That(pantsasset,Is.EqualTo(app.PantsAsset))");
+            Assert.That(shoesitem,Is.EqualTo(app.ShoesItem), "Assert.That(shoesitem,Is.EqualTo(app.ShoesItem))");
+            Assert.That(shoesasset,Is.EqualTo(app.ShoesAsset), "Assert.That(shoesasset,Is.EqualTo(app.ShoesAsset))");
+            Assert.That(socksitem,Is.EqualTo(app.SocksItem), "Assert.That(socksitem,Is.EqualTo(app.SocksItem))");
+            Assert.That(socksasset,Is.EqualTo(app.SocksAsset), "Assert.That(socksasset,Is.EqualTo(app.SocksAsset))");
+            Assert.That(jacketitem,Is.EqualTo(app.JacketItem), "Assert.That(jacketitem,Is.EqualTo(app.JacketItem))");
+            Assert.That(jacketasset,Is.EqualTo(app.JacketAsset), "Assert.That(jacketasset,Is.EqualTo(app.JacketAsset))");
+            Assert.That(glovesitem,Is.EqualTo(app.GlovesItem), "Assert.That(glovesitem,Is.EqualTo(app.GlovesItem))");
+            Assert.That(glovesasset,Is.EqualTo(app.GlovesAsset), "Assert.That(glovesasset,Is.EqualTo(app.GlovesAsset))");
+            Assert.That(ushirtitem,Is.EqualTo(app.UnderShirtItem), "Assert.That(ushirtitem,Is.EqualTo(app.UnderShirtItem))");
+            Assert.That(ushirtasset,Is.EqualTo(app.UnderShirtAsset), "Assert.That(ushirtasset,Is.EqualTo(app.UnderShirtAsset))");
+            Assert.That(upantsitem,Is.EqualTo(app.UnderPantsItem), "Assert.That(upantsitem,Is.EqualTo(app.UnderPantsItem))");
+            Assert.That(upantsasset,Is.EqualTo(app.UnderPantsAsset), "Assert.That(upantsasset,Is.EqualTo(app.UnderPantsAsset))");
+            Assert.That(skirtitem,Is.EqualTo(app.SkirtItem), "Assert.That(skirtitem,Is.EqualTo(app.SkirtItem))");
+            Assert.That(skirtasset,Is.EqualTo(app.SkirtAsset), "Assert.That(skirtasset,Is.EqualTo(app.SkirtAsset))");
+            Assert.That(texture.ToString(),Is.EqualTo(app.Texture.ToString()), "Assert.That(texture.ToString(),Is.EqualTo(app.Texture.ToString()))");
+            Assert.That(avatarheight,Is.EqualTo(app.AvatarHeight), "Assert.That(avatarheight,Is.EqualTo(app.AvatarHeight))");
         }
 
         public UserProfileData NewUser(UUID id,string fname,string lname)