diff --git a/.nant/local.include b/.nant/local.include
index 86523766d9..839c79bfe0 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -38,8 +38,7 @@
           <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/>
           <include name="./bin/OpenSim.Framework.Servers.Tests.dll" />
           <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
-          <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
-          <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
+          <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
           <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" />
           <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
           <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
@@ -166,8 +165,7 @@
           <include name="./bin/OpenSim.Framework.Communications.Tests.dll"/>
           <include name="./bin/OpenSim.Framework.Servers.Tests.dll" />
           <include name="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
-          <include name="./bin/OpenSim.Region.ScriptEngine.Shared.Tests.dll" />
-          <include name="./bin/OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests.dll" />
+          <include name="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
           <include name="./bin/OpenSim.Region.CoreModules.Tests.dll" />
           <include name="./bin/OpenSim.Region.Framework.Tests.dll" />
           <include name="./bin/OpenSim.Data.SQLite.Tests.dll" />
diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
new file mode 100644
index 0000000000..17d26ef782
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using Nini.Config;
+using NUnit.Framework;
+using OpenSim.Tests.Common.Setup;
+using OpenSim.Tests.Common.Mock;
+using OpenSim.Region.Framework.Scenes;
+using OpenMetaverse;
+using OpenSim.Region.Framework.Interfaces;
+
+namespace OpenSim.Region.ScriptEngine.XEngine.Tests
+{
+    /// <summary>
+    /// Scene presence tests
+    /// </summary>
+    [TestFixture]
+    public class XEngineTest
+    {
+        public Scene scene;
+        
+        public static Random random;
+        public TestClient testclient;
+        TestCommunicationsManager cm;
+
+        [TestFixtureSetUp]
+        public void Init()
+        {
+            TestCommunicationsManager cm = new TestCommunicationsManager();
+            scene = SceneSetupHelpers.SetupScene("My Test", UUID.Random(), 1000, 1000, cm);
+            random = new Random();
+        }
+        
+        [Test]
+        public void T001_XStart()
+        {
+            IRegionModule xengine = new XEngine();
+            SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), xengine);
+            xengine.PostInitialise();
+        }
+    }
+}
\ No newline at end of file
diff --git a/bin/Prebuild.exe b/bin/Prebuild.exe
index 7b53d3519f..1316aade86 100755
Binary files a/bin/Prebuild.exe and b/bin/Prebuild.exe differ
diff --git a/prebuild.xml b/prebuild.xml
index 32001314a8..2cf29db8c7 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.7.xsd" version="1.7">
-  <Solution name="OpenSim" activeConfig="Debug" path="./" version="0.5.0-$Rev$">
+  <Solution name="OpenSim" activeConfig="Debug" path="./" version="0.5.0-$Rev: 8318 $">
     <Configuration name="Debug">
       <Options>
         <CompilerDefines>TRACE;DEBUG</CompilerDefines>
@@ -1848,7 +1848,9 @@
       <Reference name="log4net.dll"/>
 
       <Files>
-        <Match pattern="*.cs" recurse="true"/>
+        <Match pattern="*.cs" recurse="true">
+          <Exclude name="Tests" pattern="Tests" />
+        </Match>
       </Files>
     </Project>
 
@@ -2750,19 +2752,19 @@
       </Files>
     </Project>
 
-    <Project name="OpenSim.Region.ScriptEngine.Shared.Tests" path="OpenSim/Region/ScriptEngine/Shared/Tests" type="Library">
+    <Project name="OpenSim.Region.ScriptEngine.Tests" path="OpenSim/Region/ScriptEngine" type="Library">
       <Configuration name="Debug">
         <Options>
-          <OutputPath>../../../../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
       <Configuration name="Release">
         <Options>
-          <OutputPath>../../../../../bin/</OutputPath>
+          <OutputPath>../../../bin/</OutputPath>
         </Options>
       </Configuration>
 
-      <ReferencePath>../../../../../bin/</ReferencePath>
+      <ReferencePath>../../../bin/</ReferencePath>
       <Reference name="System" localCopy="false"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Region.Framework"/>
@@ -2773,30 +2775,21 @@
       <Reference name="nunit.framework.dll" />
       <Reference name="Nini.dll" />
       <Reference name="OpenMetaverseTypes.dll"/>
-      <Files>
-        <Match pattern="*.cs" recurse="false"/>
-      </Files>
-    </Project>
-
-    <Project name="OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests" path="OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../../../../bin/</ReferencePath>
-      <Reference name="System" localCopy="false"/>
       <Reference name="OpenSim.Region.ScriptEngine.Shared.CodeTools"/>
-      <Reference name="nunit.framework.dll" />
+      <Reference name="OpenSim.Region.ScriptEngine.Shared"/>
       <Reference name="Tools.dll" />
+
+      <!--
+           TODO: this is kind of lame, we basically build a duplicate
+           assembly but with tests added in, just so that we don't
+           need to hard code in a bunch of Test directories here.  If
+           pattern="Tests/*.cs" worked, we wouldn't need this.
+      -->
       <Files>
-        <Match pattern="*.cs" recurse="false"/>
+        <!-- SADLY the way this works means you need to keep adding these paths -->
+        <Match path="Shared/Tests" pattern="*.cs" recurse="true" />
+        <Match path="Shared/CodeTools/Tests" pattern="*.cs" recurse="true" />
+        <Match path="XEngine/Tests" pattern="*.cs" recurse="true" />
       </Files>
     </Project>