diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index 8c1f5b34ff..0921b2eba9 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -272,6 +272,7 @@ namespace OpenSim.Data.Tests
             Vector3 groupos = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
             Vector3 offset = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
             Quaternion rotoff = new Quaternion(random.Next(1),random.Next(1),random.Next(1),random.Next(1));
+            rotoff.Normalize();
             Vector3 velocity = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
             Vector3 angvelo = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
             Vector3 accel = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
@@ -447,7 +448,8 @@ namespace OpenSim.Data.Tests
             DateTime rezzed = new DateTime(2005, 07, 15);
             Vector3 groupos = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
             Vector3 offset = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
-            Quaternion rotoff = new Quaternion(random.Next(100000),random.Next(100000),random.Next(100000),random.Next(100000));
+            Quaternion rotoff = new Quaternion(random.Next(100),random.Next(100),random.Next(100),random.Next(100));
+            rotoff.Normalize();
             Vector3 velocity = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
             Vector3 angvelo = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
             Vector3 accel = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
@@ -501,7 +503,10 @@ namespace OpenSim.Data.Tests
             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(rotoff.X, Is.EqualTo(p.RotationOffset.X).Within(0.001), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
+            Assert.That(rotoff.Y, Is.EqualTo(p.RotationOffset.Y).Within(0.001), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
+            Assert.That(rotoff.Z, Is.EqualTo(p.RotationOffset.Z).Within(0.001), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
+            Assert.That(rotoff.W, Is.EqualTo(p.RotationOffset.W).Within(0.001), "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))");
@@ -540,7 +545,8 @@ namespace OpenSim.Data.Tests
                 SceneObjectPart sop = NewSOP(("Test SOP " + i.ToString()),tmp);
                 Vector3 groupos = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
                 Vector3 offset = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
-                Quaternion rotoff = new Quaternion(random.Next(100000),random.Next(100000),random.Next(100000),random.Next(100000));
+                Quaternion rotoff = new Quaternion(random.Next(1000),random.Next(1000),random.Next(1000),random.Next(1000));
+                rotoff.Normalize();
                 Vector3 velocity = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
                 Vector3 angvelo = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
                 Vector3 accel = new Vector3(random.Next(100000),random.Next(100000),random.Next(100000));
@@ -564,7 +570,10 @@ namespace OpenSim.Data.Tests
             {
                 SceneObjectPart cursop = mydic[parts[i].UUID];
                 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.RotationOffset.X, Is.EqualTo(parts[i].RotationOffset.X).Within(0.001), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
+                Assert.That(cursop.RotationOffset.Y, Is.EqualTo(parts[i].RotationOffset.Y).Within(0.001), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
+                Assert.That(cursop.RotationOffset.Z, Is.EqualTo(parts[i].RotationOffset.Z).Within(0.001), "Assert.That(rotoff,Is.EqualTo(p.RotationOffset))");
+                Assert.That(cursop.RotationOffset.W, Is.EqualTo(parts[i].RotationOffset.W).Within(0.001), "Assert.That(rotoff,Is.EqualTo(p.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))");