diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index b650b795f0..2ed384f884 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -213,7 +213,6 @@ namespace OpenSim.Region.Framework.Scenes
                     PhysicsScene.OnJointDeactivated += jointDeactivated;
                     PhysicsScene.OnJointErrorMessage += jointErrorMessage;
                 }
-
             }
         }
 
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 12cce9d8a4..0be98a2d15 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -46,6 +46,19 @@ namespace OpenSim.Tests.Common.Mock
                    dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion)
         {
         }
+        
+        /// <summary>
+        /// Temporarily override session authentication for tests (namely teleport).
+        /// </summary>
+        /// 
+        /// TODO: This needs to be mocked out properly.
+        /// 
+        /// <param name="agent"></param>
+        /// <returns></returns>
+        public override bool AuthenticateUser(AgentCircuitData agent)
+        {
+            return true;
+        }        
             
         public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
         {